Unverified Commit bf44721f authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3162479 by tedbow, Kristen Pol: Incorrect... 

Issue #3162479 by tedbow, Kristen Pol: Incorrect Drupal\Composer\VendorHardening namespace is used instead of  Drupal\Composer\Plugin\VendorHardening

(cherry picked from commit 82097e2e)
parent 2c1c4e60

composer/Plugin/ProjectMessage/MessagePlugin.php

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class MessagePlugin implements PluginInterface, EventSubscriberInterface { 
  /**

   * Configuration.

   *

   * @var \Drupal\Composer\VendorHardening\Config

   * @var \Drupal\Composer\Plugin\VendorHardening\Config

   */

  protected $config;

composer/Plugin/VendorHardening/VendorHardeningPlugin.php

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class VendorHardeningPlugin implements PluginInterface, EventSubscriberInterface 
  /**

   * Configuration.

   *

   * @var \Drupal\Composer\VendorHardening\Config

   * @var \Drupal\Composer\Plugin\VendorHardening\Config

   */

  protected $config;

core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php

+2 −5
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
use Composer\IO\IOInterface;

use Composer\Package\PackageInterface;

use Composer\Package\RootPackageInterface;

use Drupal\Composer\VendorHardening\Config;

use Drupal\Composer\Plugin\VendorHardening\Config;

use Drupal\Composer\Plugin\VendorHardening\VendorHardeningPlugin;

use org\bovigo\vfs\vfsStream;

use PHPUnit\Framework\TestCase;



/**

 * @coversDefaultClass Drupal\Composer\Plugin\VendorHardening\VendorHardeningPlugin

 * @coversDefaultClass \Drupal\Composer\Plugin\VendorHardening\VendorHardeningPlugin

 * @group VendorHardening

 */

class VendorHardeningPluginTest extends TestCase {
@@ -36,7 +36,6 @@ public function setUp() { 
  public function testCleanPackage() {



    $config = $this->getMockBuilder(Config::class)

      ->setMethods(['getPathsForPackage'])

      ->disableOriginalConstructor()

      ->getMock();

    $config->expects($this->once())
@@ -85,7 +84,6 @@ public function testCleanPathsForPackage() { 
   */

  public function testCleanAllPackages() {

    $config = $this->getMockBuilder(Config::class)

      ->setMethods(['getAllCleanupPaths'])

      ->disableOriginalConstructor()

      ->getMock();

    $config->expects($this->once())
@@ -93,7 +91,6 @@ public function testCleanAllPackages() { 
      ->willReturn(['drupal/package' => ['tests']]);



    $package = $this->getMockBuilder(PackageInterface::class)

      ->setMethods(['getName'])

      ->getMockForAbstractClass();

    $package->expects($this->any())

      ->method('getName')