Merge 6064ba6 into f6dcab6

EdisonLabs · Jul 24, 2018 · a7e51f9 · a7e51f9
2 parents f6dcab6 + 6064ba6
commit a7e51f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -26,9 +26,9 @@ class Plugin implements PluginInterface, EventSubscriberInterface, Capable
     /**
      * {@inheritdoc}
      */
-    public function activate(Composer $composer, IOInterface $io, array $configParameters = array())
+    public function activate(Composer $composer, IOInterface $io)
     {
-        $this->pluginHandler = new PluginHandler($composer, $io, $configParameters);
+        $this->pluginHandler = new PluginHandler($composer, $io);
     }
 
     /**

diff --git a/tests/src/Unit/PluginTest.php b/tests/src/Unit/PluginTest.php
@@ -4,6 +4,7 @@
 
 use EdisonLabs\MergeYaml\Plugin;
 use Composer\Composer;
+use Composer\Config;
 use Composer\Script\ScriptEvents;
 use PHPUnit\Framework\TestCase;
 
@@ -44,7 +45,14 @@ protected function setUp()
             'output-dir' => '/tmp/merge-yaml',
         ];
 
-        $this->packageMock = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock();
+        $this->packageMock = $this->getMockBuilder('Composer\Package\RootPackage')
+            ->disableOriginalConstructor()
+            ->setMethods(['getExtra', 'setExtra'])
+            ->getMock();
+        $this->packageMock->expects($this->once())
+            ->method('getExtra')
+            ->will($this->returnValue(['merge-yaml' => $this->defaultConfig]));
+
         $this->eventMock = $this->getMockBuilder('Composer\Script\Event')
             ->disableOriginalConstructor()
             ->getMock();
@@ -79,12 +87,13 @@ public function testPlugin()
         $this->assertEquals(['postCmd', -1], $events[ScriptEvents::POST_UPDATE_CMD]);
 
         $io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
+
         $composer = new Composer();
         $composer->setPackage($this->packageMock);
-        $plugin->activate($composer, $io, $this->defaultConfig);
+        $plugin->activate($composer, $io);
         $this->assertInstanceOf('\EdisonLabs\MergeYaml\PluginHandler', $plugin->getPluginHandler());
 
-        $plugin->postCmd($this->eventMock, $this->defaultConfig);
+        $plugin->postCmd($this->eventMock);
         $this->assertFileExists('/tmp/merge-yaml/test.merge.yml');
     }
 }