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

Fix for Preforce utility does not check if p4 command exists

pull/2329/head
Fabian Grutschus 2013-10-14 14:53:57 +02:00
parent cd209e3180
commit 5ae5963acd
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Util/Perforce.php
View File

@ -368,9 +368,9 @@ class Perforce
public static function checkServerExists($url, ProcessExecutor $processExecutor)
{
$result = '';
$processExecutor->execute('p4 -p ' . $url . ' info -s', $result);
$exitCode = $processExecutor->execute('p4 -p ' . $url . ' info -s', $result);
return false === strpos($result, 'error');
return false === strpos($result, 'error') && 127 != $exitCode;
}
public function getComposerInformation($identifier)

21
tests/Composer/Test/Util/PerforceTest.php
View File

@ -631,6 +631,27 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
$result = $this->perforce->checkServerExists('perforce.does.not.exist:port', $processExecutor);
$this->assertTrue($result);
}
/**
* Test if "p4" command is missing.
*
* @covers \Composer\Util\Perforce::checkServerExists
*
* @return void
*/
public function testCheckServerExistsWithMissingPerforceClient()
{
$processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
$expectedCommand = 'p4 -p perforce.does.exist:port info -s';
$processExecutor->expects($this->at(0))
->method('execute')
//->with($this->equalTo($expectedCommand), $this->equalTo(null))
->will($this->returnValue(127));
$result = $this->perforce->checkServerExists('perforce.does.exist:port', $processExecutor);
$this->assertFalse($result);
}
public static function getComposerJson()
{