From 0fbb4cbd16bf1856b0d7f4a7ee81c6736b8aa97e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 11 Oct 2013 20:21:34 -0300 Subject: [PATCH] CS fixes and renaming a few methods, refs #2184 --- .../Downloader/PerforceDownloader.php | 8 +- .../Repository/Vcs/PerforceDriver.php | 4 +- src/Composer/Util/Perforce.php | 24 +- .../Downloader/PerforceDownloaderTest.php | 3 +- .../Repository/Vcs/PerforceDriverTest.php | 24 +- tests/Composer/Test/Util/PerforceTest.php | 349 +++++++++--------- 6 files changed, 205 insertions(+), 207 deletions(-) diff --git a/src/Composer/Downloader/PerforceDownloader.php b/src/Composer/Downloader/PerforceDownloader.php index be6e2ddb1..3aa8d0a43 100644 --- a/src/Composer/Downloader/PerforceDownloader.php +++ b/src/Composer/Downloader/PerforceDownloader.php @@ -44,15 +44,16 @@ class PerforceDownloader extends VcsDownloader private function initPerforce($package, $path, $ref) { - if ($this->perforceInjected) { + if ($this->perforce) { return; } + $repository = $package->getRepository(); $repoConfig = null; if ($repository instanceof VcsRepository) { $repoConfig = $this->getRepoConfig($repository); } - $this->perforce = Perforce::createPerforce($repoConfig, $package->getSourceUrl(), $path); + $this->perforce = Perforce::create($repoConfig, $package->getSourceUrl(), $path); } private function getRepoConfig(VcsRepository $repository) @@ -88,9 +89,8 @@ class PerforceDownloader extends VcsDownloader return $commitLogs; } - public function injectPerforce($perforce) + public function setPerforce($perforce) { $this->perforce = $perforce; - $this->perforceInjected = true; } } diff --git a/src/Composer/Repository/Vcs/PerforceDriver.php b/src/Composer/Repository/Vcs/PerforceDriver.php index 3c953793c..a6d52bfb6 100644 --- a/src/Composer/Repository/Vcs/PerforceDriver.php +++ b/src/Composer/Repository/Vcs/PerforceDriver.php @@ -55,7 +55,7 @@ class PerforceDriver extends VcsDriver } $repoDir = $this->config->get('cache-vcs-dir') . '/' . $this->depot; - $this->perforce = Perforce::createPerforce($repoConfig, $this->getUrl(), $repoDir, $this->process); + $this->perforce = Perforce::create($repoConfig, $this->getUrl(), $repoDir, $this->process); } /** @@ -182,7 +182,7 @@ class PerforceDriver extends VcsDriver return $this->branch; } - public function injectPerforce(Perforce $perforce) + public function setPerforce(Perforce $perforce) { $this->perforce = $perforce; } diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index 8a1ce4739..5237e3420 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -34,18 +34,6 @@ class Perforce protected $uniquePerforceClientName; protected $windowsFlag; - public static function createPerforce($repoConfig, $port, $path, ProcessExecutor $process = null) - { - if (!isset($process)) { - $process = new ProcessExecutor; - } - $isWindows = defined('PHP_WINDOWS_VERSION_BUILD'); - - $perforce = new Perforce($repoConfig, $port, $path, $process, $isWindows); - - return $perforce; - } - public function __construct($repoConfig, $port, $path, ProcessExecutor $process, $isWindows) { $this->windowsFlag = $isWindows; @@ -57,6 +45,18 @@ class Perforce $this->initialize($repoConfig); } + public static function create($repoConfig, $port, $path, ProcessExecutor $process = null) + { + if (!isset($process)) { + $process = new ProcessExecutor; + } + $isWindows = defined('PHP_WINDOWS_VERSION_BUILD'); + + $perforce = new Perforce($repoConfig, $port, $path, $process, $isWindows); + + return $perforce; + } + public function initialize($repoConfig) { $this->uniquePerforceClientName = $this->generateUniquePerforceClientName(); diff --git a/tests/Composer/Test/Downloader/PerforceDownloaderTest.php b/tests/Composer/Test/Downloader/PerforceDownloaderTest.php index 85093bf59..b632d55d7 100644 --- a/tests/Composer/Test/Downloader/PerforceDownloaderTest.php +++ b/tests/Composer/Test/Downloader/PerforceDownloaderTest.php @@ -21,7 +21,6 @@ use Composer\Repository\VcsRepository; */ class PerforceDownloaderTest extends \PHPUnit_Framework_TestCase { - private $io; private $config; private $testPath; @@ -93,7 +92,7 @@ class PerforceDownloaderTest extends \PHPUnit_Framework_TestCase $perforce->expects($this->at(4)) ->method('syncCodeBase') ->with($this->equalTo($label)); - $downloader->injectPerforce($perforce); + $downloader->setPerforce($perforce); $package = $this->getMock('Composer\Package\PackageInterface'); $package->expects($this->at(0)) ->method('getSourceReference') diff --git a/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php b/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php index 0c2ba757e..277550e64 100644 --- a/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php @@ -70,7 +70,7 @@ class PerforceDriverTest extends \PHPUnit_Framework_TestCase 'TEST' ); $perforce = $this->getMock('Composer\Util\Perforce', null, $arguments); - $driver->injectPerforce($perforce); + $driver->setPerforce($perforce); $driver->initialize(); $this->assertEquals('TEST_PERFORCE_URL', $driver->getUrl()); $this->assertEquals('TEST_DEPOT_CONFIG', $driver->getDepot()); @@ -88,17 +88,17 @@ class PerforceDriverTest extends \PHPUnit_Framework_TestCase $driver = new PerforceDriver($repoConfig, $this->io, $this->config, $this->process, $this->remoteFileSystem); $perforce = $this->getMockBuilder('Composer\Util\Perforce')->disableOriginalConstructor()->getMock(); $perforce->expects($this->at(0)) - ->method('p4Login') - ->with($this->io); + ->method('p4Login') + ->with($this->io); $perforce->expects($this->at(1)) - ->method('checkStream') - ->with($this->equalTo('TEST_DEPOT_CONFIG')); + ->method('checkStream') + ->with($this->equalTo('TEST_DEPOT_CONFIG')); $perforce->expects($this->at(2)) - ->method('writeP4ClientSpec'); + ->method('writeP4ClientSpec'); $perforce->expects($this->at(3)) - ->method('connectClient'); + ->method('connectClient'); - $driver->injectPerforce($perforce); + $driver->setPerforce($perforce); $driver->initialize(); } @@ -122,10 +122,10 @@ class PerforceDriverTest extends \PHPUnit_Framework_TestCase ); $perforce = $this->getMock('Composer\Util\Perforce', array('getComposerInformation'), $arguments); $perforce->expects($this->at(0)) - ->method('getComposerInformation') - ->with($this->equalTo('//TEST_DEPOT_CONFIG/TEST_IDENTIFIER')) - ->will($this->returnValue('Some json stuff')); - $driver->injectPerforce($perforce); + ->method('getComposerInformation') + ->with($this->equalTo('//TEST_DEPOT_CONFIG/TEST_IDENTIFIER')) + ->will($this->returnValue('Some json stuff')); + $driver->setPerforce($perforce); $driver->initialize(); $identifier = 'TEST_IDENTIFIER'; $result = $driver->hasComposerFile($identifier); diff --git a/tests/Composer/Test/Util/PerforceTest.php b/tests/Composer/Test/Util/PerforceTest.php index 2f17be07d..5c76df98e 100644 --- a/tests/Composer/Test/Util/PerforceTest.php +++ b/tests/Composer/Test/Util/PerforceTest.php @@ -20,7 +20,6 @@ use Composer\Util\ProcessExecutor; */ class PerforceTest extends \PHPUnit_Framework_TestCase { - protected $perforce; protected $processExecutor; @@ -116,17 +115,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedCommand = 'p4 set'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'P4USER=TEST_P4VARIABLE_USER' . PHP_EOL ; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'P4USER=TEST_P4VARIABLE_USER' . PHP_EOL ; - return true; - } - ) - ); + return true; + } + ) + ); $this->perforce->queryP4user($io); $this->assertEquals('TEST_P4VARIABLE_USER', $this->perforce->getUser()); @@ -140,17 +139,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedCommand = 'echo $P4USER'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'TEST_P4VARIABLE_USER' . PHP_EOL; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'TEST_P4VARIABLE_USER' . PHP_EOL; - return true; - } - ) - ); + return true; + } + ) + ); $this->perforce->queryP4user($io); $this->assertEquals('TEST_P4VARIABLE_USER', $this->perforce->getUser()); @@ -163,9 +162,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedQuestion = 'Enter P4 User:'; $io->expects($this->at(0)) - ->method('ask') - ->with($this->equalTo($expectedQuestion)) - ->will($this->returnValue('TEST_QUERY_USER')); + ->method('ask') + ->with($this->equalTo($expectedQuestion)) + ->will($this->returnValue('TEST_QUERY_USER')); $this->perforce->queryP4user($io); $this->assertEquals('TEST_QUERY_USER', $this->perforce->getUser()); @@ -179,14 +178,14 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedQuestion = 'Enter P4 User:'; $io->expects($this->at(0)) - ->method('ask') - ->with($this->equalTo($expectedQuestion)) - ->will($this->returnValue('TEST_QUERY_USER')); + ->method('ask') + ->with($this->equalTo($expectedQuestion)) + ->will($this->returnValue('TEST_QUERY_USER')); $expectedCommand = 'p4 set P4USER=TEST_QUERY_USER'; $this->processExecutor->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will($this->returnValue(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will($this->returnValue(0)); $this->perforce->queryP4user($io); } @@ -199,14 +198,14 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedQuestion = 'Enter P4 User:'; $io->expects($this->at(0)) - ->method('ask') - ->with($this->equalTo($expectedQuestion)) - ->will($this->returnValue('TEST_QUERY_USER')); + ->method('ask') + ->with($this->equalTo($expectedQuestion)) + ->will($this->returnValue('TEST_QUERY_USER')); $expectedCommand = 'export P4USER=TEST_QUERY_USER'; $this->processExecutor->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will($this->returnValue(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will($this->returnValue(0)); $this->perforce->queryP4user($io); } @@ -232,17 +231,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $expectedCommand = 'p4 set'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'P4PASSWD=TEST_P4VARIABLE_PASSWORD' . PHP_EOL; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'P4PASSWD=TEST_P4VARIABLE_PASSWORD' . PHP_EOL; - return true; - } - ) - ); + return true; + } + ) + ); $password = $this->perforce->queryP4Password($io); $this->assertEquals('TEST_P4VARIABLE_PASSWORD', $password); @@ -256,17 +255,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedCommand = 'echo $P4PASSWD'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'TEST_P4VARIABLE_PASSWORD' . PHP_EOL; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'TEST_P4VARIABLE_PASSWORD' . PHP_EOL; - return true; - } - ) - ); + return true; + } + ) + ); $password = $this->perforce->queryP4Password($io); $this->assertEquals('TEST_P4VARIABLE_PASSWORD', $password); @@ -277,9 +276,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $io = $this->getMock('Composer\IO\IOInterface'); $expectedQuestion = 'Enter password for Perforce user user: '; $io->expects($this->at(0)) - ->method('askAndHideAnswer') - ->with($this->equalTo($expectedQuestion)) - ->will($this->returnValue('TEST_QUERY_PASSWORD')); + ->method('askAndHideAnswer') + ->with($this->equalTo($expectedQuestion)) + ->will($this->returnValue('TEST_QUERY_PASSWORD')); $password = $this->perforce->queryP4Password($io); $this->assertEquals('TEST_QUERY_PASSWORD', $password); @@ -330,9 +329,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase { $expectedCommand = 'p4 -u user -p port login -s'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand), $this->equalTo(null)) - ->will($this->returnValue(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand), $this->equalTo(null)) + ->will($this->returnValue(0)); $this->perforce->isLoggedIn(); } @@ -341,9 +340,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase { $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port client -i < path/composer_perforce_TEST_depot.p4.spec'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand), $this->equalTo(null)) - ->will($this->returnValue(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand), $this->equalTo(null)) + ->will($this->returnValue(0)); $this->perforce->connectClient(); } @@ -354,17 +353,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port streams //depot/...'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'Stream //depot/branch mainline none \'branch\'' . PHP_EOL; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'Stream //depot/branch mainline none \'branch\'' . PHP_EOL; - return true; - } - ) - ); + return true; + } + ) + ); $branches = $this->perforce->getBranches(); $this->assertEquals('//depot/branch', $branches['master']); @@ -380,17 +379,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase { $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port labels'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'Label 0.0.1 2013/07/31 \'First Label!\'' . PHP_EOL . 'Label 0.0.2 2013/08/01 \'Second Label!\'' . PHP_EOL; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'Label 0.0.1 2013/07/31 \'First Label!\'' . PHP_EOL . 'Label 0.0.2 2013/08/01 \'Second Label!\'' . PHP_EOL; - return true; - } - ) - ); + return true; + } + ) + ); $tags = $this->perforce->getTags(); $this->assertEquals('//depot@0.0.1', $tags['0.0.1']); @@ -403,17 +402,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port labels'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'Label 0.0.1 2013/07/31 \'First Label!\'' . PHP_EOL . 'Label 0.0.2 2013/08/01 \'Second Label!\'' . PHP_EOL; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'Label 0.0.1 2013/07/31 \'First Label!\'' . PHP_EOL . 'Label 0.0.2 2013/08/01 \'Second Label!\'' . PHP_EOL; - return true; - } - ) - ); + return true; + } + ) + ); $tags = $this->perforce->getTags(); $this->assertEquals('//depot/branch@0.0.1', $tags['0.0.1']); @@ -430,15 +429,15 @@ class PerforceTest extends \PHPUnit_Framework_TestCase public function testCheckStreamWithStream() { $this->processExecutor->expects($this->any())->method('execute') - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = 'Depot depot 2013/06/25 stream /p4/1/depots/depot/... \'Created by Me\''; + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = 'Depot depot 2013/06/25 stream /p4/1/depots/depot/... \'Created by Me\''; - return true; - } - ) - ); + return true; + } + ) + ); $result = $this->perforce->checkStream('depot'); $this->assertTrue($result); $this->assertTrue($this->perforce->isStream()); @@ -448,17 +447,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase { $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port print //depot/composer.json'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = PerforceTest::getComposerJson(); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = PerforceTest::getComposerJson(); - return true; - } - ) - ); + return true; + } + ) + ); $result = $this->perforce->getComposerInformation('//depot'); $expected = array( @@ -474,31 +473,31 @@ class PerforceTest extends \PHPUnit_Framework_TestCase { $expectedCommand = 'p4 -u user -p port files //depot/composer.json@0.0.1'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = '//depot/composer.json#1 - branch change 10001 (text)'; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = '//depot/composer.json#1 - branch change 10001 (text)'; - return true; - } - ) - ); + return true; + } + ) + ); $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port print //depot/composer.json@10001'; $this->processExecutor->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = PerforceTest::getComposerJson(); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = PerforceTest::getComposerJson(); - return true; - } - ) - ); + return true; + } + ) + ); $result = $this->perforce->getComposerInformation('//depot@0.0.1'); @@ -517,17 +516,17 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port print //depot/branch/composer.json'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = PerforceTest::getComposerJson(); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = PerforceTest::getComposerJson(); - return true; - } - ) - ); + return true; + } + ) + ); $result = $this->perforce->getComposerInformation('//depot/branch'); @@ -545,31 +544,31 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $this->setPerforceToStream(); $expectedCommand = 'p4 -u user -p port files //depot/branch/composer.json@0.0.1'; $this->processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = '//depot/composer.json#1 - branch change 10001 (text)'; + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = '//depot/composer.json#1 - branch change 10001 (text)'; - return true; - } - ) - ); + return true; + } + ) + ); $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port print //depot/branch/composer.json@10001'; $this->processExecutor->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will( - $this->returnCallback( - function ($command, &$output) { - $output = PerforceTest::getComposerJson(); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will( + $this->returnCallback( + function ($command, &$output) { + $output = PerforceTest::getComposerJson(); - return true; - } - ) - ); + return true; + } + ) + ); $result = $this->perforce->getComposerInformation('//depot/branch@0.0.1'); @@ -586,9 +585,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase { $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port sync -f @label'; $this->processExecutor->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($expectedCommand), $this->equalTo(null)) - ->will($this->returnValue(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand), $this->equalTo(null)) + ->will($this->returnValue(0)); $this->perforce->syncCodeBase('label'); } @@ -598,9 +597,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $this->setPerforceToStream(); $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port sync -f @label'; $this->processExecutor->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($expectedCommand)) - ->will($this->returnValue(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand)) + ->will($this->returnValue(0)); $this->perforce->syncCodeBase('label'); } @@ -611,9 +610,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $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(0)); + ->method('execute') + ->with($this->equalTo($expectedCommand), $this->equalTo(null)) + ->will($this->returnValue(0)); $result = $this->perforce->checkServerExists('perforce.does.exist:port', $processExecutor); $this->assertTrue($result); @@ -625,9 +624,9 @@ class PerforceTest extends \PHPUnit_Framework_TestCase $expectedCommand = 'p4 -p perforce.does.not.exist:port info -s'; $processExecutor->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($expectedCommand), $this->equalTo(null)) - ->will($this->returnValue('Perforce client error:')); + ->method('execute') + ->with($this->equalTo($expectedCommand), $this->equalTo(null)) + ->will($this->returnValue('Perforce client error:')); $result = $this->perforce->checkServerExists('perforce.does.not.exist:port', $processExecutor); $this->assertTrue($result);