Browse Source

added php script handler info as well

Rob Bast 9 years ago
parent
commit
fd34c5883a

+ 2 - 0
src/Composer/EventDispatcher/EventDispatcher.php

@@ -197,6 +197,8 @@ class EventDispatcher
     {
         $event = $this->checkListenerExpectedEvent(array($className, $methodName), $event);
 
+        $this->io->writeError(sprintf('> %s::%s', $className, $methodName));
+
         return $className::$methodName($event);
     }
 

+ 18 - 7
tests/Composer/Test/EventDispatcher/EventDispatcherTest.php

@@ -32,7 +32,11 @@ class EventDispatcherTest extends TestCase
             'Composer\Test\EventDispatcher\EventDispatcherTest::call'
         ), $io);
 
-        $io->expects($this->once())
+        $io->expects($this->at(0))
+            ->method('writeError')
+            ->with('> Composer\Test\EventDispatcher\EventDispatcherTest::call');
+
+        $io->expects($this->at(1))
             ->method('writeError')
             ->with('<error>Script Composer\Test\EventDispatcher\EventDispatcherTest::call handling the post-install-cmd event terminated with an exception</error>');
 
@@ -94,12 +98,11 @@ class EventDispatcherTest extends TestCase
         $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher')
             ->setConstructorArgs(array(
                 $this->getMock('Composer\Composer'),
-                $this->getMock('Composer\IO\IOInterface'),
+                $io = $this->getMock('Composer\IO\IOInterface'),
                 $process,
             ))
             ->setMethods(array(
                 'getListeners',
-                'executeEventPhpScript',
             ))
             ->getMock();
 
@@ -112,14 +115,22 @@ class EventDispatcherTest extends TestCase
             'Composer\\Test\\EventDispatcher\\EventDispatcherTest::someMethod',
             'echo -n bar',
         );
+
         $dispatcher->expects($this->atLeastOnce())
             ->method('getListeners')
             ->will($this->returnValue($listeners));
 
-        $dispatcher->expects($this->once())
-            ->method('executeEventPhpScript')
-            ->with('Composer\Test\EventDispatcher\EventDispatcherTest', 'someMethod')
-            ->will($this->returnValue(true));
+        $io->expects($this->at(0))
+            ->method('writeError')
+            ->with($this->equalTo('> echo -n foo'));
+
+        $io->expects($this->at(1))
+            ->method('writeError')
+            ->with($this->equalTo('> Composer\Test\EventDispatcher\EventDispatcherTest::someMethod'));
+
+        $io->expects($this->at(2))
+            ->method('writeError')
+            ->with($this->equalTo('> echo -n bar'));
 
         $dispatcher->dispatchScript(ScriptEvents::POST_INSTALL_CMD, false);
     }