public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix tests and regression in @ref script handling

pull/5636/merge
Jordi Boggiano 2016-12-11 16:37:46 +01:00
parent 58b94b66e5
commit 98c5f825e0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -469,7 +469,7 @@ class EventDispatcher
*/
protected function isComposerScript($callable)
{
return '@composer ' === substr($callable, 0, 10);
return '@' === substr($callable, 0, 1) && '@php ' !== substr($callable, 0, 5);
}
/**

4
tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php
View File

@ -122,8 +122,8 @@ class PerforceDriverTest extends TestCase
public function testInitializeLogsInAndConnectsClient()
{
$this->perforce->expects($this->at(0))->method('p4Login')->with($this->identicalTo($this->io));
$this->perforce->expects($this->at(1))->method('checkStream')->with($this->equalTo(self::TEST_DEPOT));
$this->perforce->expects($this->at(0))->method('p4Login');
$this->perforce->expects($this->at(1))->method('checkStream');
$this->perforce->expects($this->at(2))->method('writeP4ClientSpec');
$this->perforce->expects($this->at(3))->method('connectClient');
$this->driver->initialize();