Merge pull request #136 from aik099/use-php56-class-feature

Use `::class` in test suite

src/SVNBuddy/Updater/UpdateManager.php

@@ -77,9 +77,9 @@ public function __construct(
 	 */
 	public function setUpdateChannel($update_channel)
 	{
-		$stability_constant = 'ConsoleHelpers\\SVNBuddy\\Updater\\Stability::' . strtoupper($update_channel);
+		$valid_channels = array(Stability::STABLE, Stability::SNAPSHOT, Stability::PREVIEW);
 
-		if ( !defined($stability_constant) ) {
+		if ( !in_array($update_channel, $valid_channels) ) {
 			throw new \InvalidArgumentException('Update channel "' . $update_channel . '" not found.');
 		}
 

tests/SVNBuddy/Config/ArrayConfigSettingTest.php

@@ -12,6 +12,7 @@
 
 
 use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting;
+use ConsoleHelpers\SVNBuddy\Config\ArrayConfigSetting;
 
 class ArrayConfigSettingTest extends AbstractConfigSettingTest
 {
@@ -23,7 +24,7 @@ class ArrayConfigSettingTest extends AbstractConfigSettingTest
 	protected function setupTest()
 	{
 		if ( !isset($this->className) ) {
-			$this->className = 'ConsoleHelpers\\SVNBuddy\\Config\\ArrayConfigSetting';
+			$this->className = ArrayConfigSetting::class;
 		}
 
 		if ( !isset($this->defaultValue) ) {

tests/SVNBuddy/Config/ChoiceConfigSettingTest.php

@@ -12,6 +12,7 @@
 
 
 use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting;
+use ConsoleHelpers\SVNBuddy\Config\ChoiceConfigSetting;
 
 class ChoiceConfigSettingTest extends AbstractConfigSettingTest
 {
@@ -23,7 +24,7 @@ class ChoiceConfigSettingTest extends AbstractConfigSettingTest
 	protected function setupTest()
 	{
 		if ( !isset($this->className) ) {
-			$this->className = 'ConsoleHelpers\\SVNBuddy\\Config\\ChoiceConfigSetting';
+			$this->className = ChoiceConfigSetting::class;
 		}
 
 		if ( !isset($this->defaultValue) ) {

tests/SVNBuddy/Config/IntegerConfigSettingTest.php

@@ -13,6 +13,7 @@
 
 use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
+use ConsoleHelpers\SVNBuddy\Config\IntegerConfigSetting;
 
 class IntegerConfigSettingTest extends AbstractConfigSettingTest
 {
@@ -26,7 +27,7 @@ class IntegerConfigSettingTest extends AbstractConfigSettingTest
 	protected function setupTest()
 	{
 		if ( !isset($this->className) ) {
-			$this->className = 'ConsoleHelpers\\SVNBuddy\\Config\\IntegerConfigSetting';
+			$this->className = IntegerConfigSetting::class;
 		}
 
 		if ( !isset($this->defaultValue) ) {

tests/SVNBuddy/Config/PathsConfigSettingTest.php

@@ -13,6 +13,7 @@
 
 use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
+use ConsoleHelpers\SVNBuddy\Config\PathsConfigSetting;
 
 class PathsConfigSettingTest extends ArrayConfigSettingTest
 {
@@ -32,7 +33,7 @@ class PathsConfigSettingTest extends ArrayConfigSettingTest
 	 */
 	protected function setupTest()
 	{
-		$this->className = 'ConsoleHelpers\\SVNBuddy\\Config\\PathsConfigSetting';
+		$this->className = PathsConfigSetting::class;
 		$this->defaultValue = array('default');
 
 		parent::setupTest();

tests/SVNBuddy/Config/RegExpsConfigSettingTest.php

@@ -13,6 +13,7 @@
 
 use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
+use ConsoleHelpers\SVNBuddy\Config\RegExpsConfigSetting;
 
 class RegExpsConfigSettingTest extends ArrayConfigSettingTest
 {
@@ -25,7 +26,7 @@ class RegExpsConfigSettingTest extends ArrayConfigSettingTest
 	 */
 	protected function setupTest()
 	{
-		$this->className = 'ConsoleHelpers\\SVNBuddy\\Config\\RegExpsConfigSetting';
+		$this->className = RegExpsConfigSetting::class;
 		$this->defaultValue = array('default');
 
 		parent::setupTest();

tests/SVNBuddy/Config/StringConfigSettingTest.php

@@ -12,6 +12,7 @@
 
 
 use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting;
+use ConsoleHelpers\SVNBuddy\Config\StringConfigSetting;
 
 class StringConfigSettingTest extends AbstractConfigSettingTest
 {
@@ -23,7 +24,7 @@ class StringConfigSettingTest extends AbstractConfigSettingTest
 	protected function setupTest()
 	{
 		if ( !isset($this->className) ) {
-			$this->className = 'ConsoleHelpers\\SVNBuddy\\Config\\StringConfigSetting';
+			$this->className = StringConfigSetting::class;
 		}
 
 		if ( !isset($this->defaultValue) ) {

tests/SVNBuddy/ContainerTest.php

@@ -13,6 +13,28 @@
 
 use ConsoleHelpers\SVNBuddy\Container;
 use Tests\ConsoleHelpers\ConsoleKit\ContainerTest as BaseContainerTest;
+use ConsoleHelpers\SVNBuddy\Process\ProcessFactory;
+use ConsoleHelpers\SVNBuddy\MergeSourceDetector\MergeSourceDetectorAggregator;
+use ConsoleHelpers\SVNBuddy\Repository\Connector\UrlResolver;
+use ConsoleHelpers\SVNBuddy\Cache\CacheManager;
+use ConsoleHelpers\SVNBuddy\Database\StatementProfiler;
+use ConsoleHelpers\DatabaseMigration\MigrationManager;
+use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\RevisionLogFactory;
+use ConsoleHelpers\SVNBuddy\Repository\Parser\LogMessageParserFactory;
+use ConsoleHelpers\SVNBuddy\Repository\Parser\RevisionListParser;
+use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\RevisionPrinter;
+use ConsoleHelpers\SVNBuddy\Repository\Connector\CommandFactory;
+use ConsoleHelpers\SVNBuddy\Repository\Connector\Connector;
+use ConsoleHelpers\SVNBuddy\Repository\CommitMessage\CommitMessageBuilder;
+use ConsoleHelpers\SVNBuddy\Repository\WorkingCopyResolver;
+use ConsoleHelpers\SVNBuddy\Repository\WorkingCopyConflictTracker;
+use ConsoleHelpers\SVNBuddy\Repository\CommitMessage\MergeTemplateFactory;
+use ConsoleHelpers\SVNBuddy\Config\CommandConfig;
+use ConsoleHelpers\SVNBuddy\Helper\DateHelper;
+use ConsoleHelpers\SVNBuddy\Helper\SizeHelper;
+use ConsoleHelpers\SVNBuddy\Helper\OutputHelper;
+use ConsoleHelpers\SVNBuddy\InteractiveEditor;
+use ConsoleHelpers\SVNBuddy\Updater\Updater;
 
 class ContainerTest extends BaseContainerTest
 {
@@ -34,34 +56,34 @@ public function instanceDataProvider()
 				'config_defaults',
 			),
 			'working_directory_sub_folder' => array('.svn-buddy', 'working_directory_sub_folder'),
-			'process_factory' => array('ConsoleHelpers\\SVNBuddy\\Process\\ProcessFactory', 'process_factory'),
-			'merge_source_detector' => array('ConsoleHelpers\\SVNBuddy\\MergeSourceDetector\\MergeSourceDetectorAggregator', 'merge_source_detector'),
-			'repository_url_resolver' => array('ConsoleHelpers\SVNBuddy\Repository\Connector\UrlResolver', 'repository_url_resolver'),
-			'cache_manager' => array('ConsoleHelpers\\SVNBuddy\\Cache\\CacheManager', 'cache_manager'),
-			'statement_profiler' => array('ConsoleHelpers\SVNBuddy\Database\StatementProfiler', 'statement_profiler'),
-			'migration_manager' => array('ConsoleHelpers\DatabaseMigration\MigrationManager', 'migration_manager'),
-			'revision_log_factory' => array('ConsoleHelpers\\SVNBuddy\\Repository\\RevisionLog\\RevisionLogFactory', 'revision_log_factory'),
-			'log_message_parser_factory' => array('ConsoleHelpers\SVNBuddy\Repository\Parser\LogMessageParserFactory', 'log_message_parser_factory'),
-			'revision_list_parser' => array('ConsoleHelpers\\SVNBuddy\\Repository\\Parser\\RevisionListParser', 'revision_list_parser'),
-			'revision_printer' => array('ConsoleHelpers\SVNBuddy\Repository\RevisionLog\RevisionPrinter', 'revision_printer'),
-			'command_factory' => array('ConsoleHelpers\\SVNBuddy\\Repository\\Connector\\CommandFactory', 'command_factory'),
-			'repository_connector' => array('ConsoleHelpers\\SVNBuddy\\Repository\\Connector\\Connector', 'repository_connector'),
-			'commit_message_builder' => array('ConsoleHelpers\\SVNBuddy\\Repository\\CommitMessage\\CommitMessageBuilder', 'commit_message_builder'),
-			'working_copy_resolver' => array('ConsoleHelpers\\SVNBuddy\\Repository\\WorkingCopyResolver', 'working_copy_resolver'),
-			'working_copy_conflict_tracker' => array('ConsoleHelpers\\SVNBuddy\\Repository\\WorkingCopyConflictTracker', 'working_copy_conflict_tracker'),
-			'merge_template_factory' => array('ConsoleHelpers\SVNBuddy\Repository\CommitMessage\MergeTemplateFactory', 'merge_template_factory'),
-			'command_config' => array('ConsoleHelpers\\SVNBuddy\\Config\\CommandConfig', 'command_config'),
-			'date_helper' => array('ConsoleHelpers\\SVNBuddy\\Helper\\DateHelper', 'date_helper'),
-			'size_helper' => array('ConsoleHelpers\SVNBuddy\Helper\SizeHelper', 'size_helper'),
-			'output_helper' => array('ConsoleHelpers\SVNBuddy\Helper\OutputHelper', 'output_helper'),
-			'editor' => array('ConsoleHelpers\\SVNBuddy\\InteractiveEditor', 'editor'),
+			'process_factory' => array(ProcessFactory::class, 'process_factory'),
+			'merge_source_detector' => array(MergeSourceDetectorAggregator::class, 'merge_source_detector'),
+			'repository_url_resolver' => array(UrlResolver::class, 'repository_url_resolver'),
+			'cache_manager' => array(CacheManager::class, 'cache_manager'),
+			'statement_profiler' => array(StatementProfiler::class, 'statement_profiler'),
+			'migration_manager' => array(MigrationManager::class, 'migration_manager'),
+			'revision_log_factory' => array(RevisionLogFactory::class, 'revision_log_factory'),
+			'log_message_parser_factory' => array(LogMessageParserFactory::class, 'log_message_parser_factory'),
+			'revision_list_parser' => array(RevisionListParser::class, 'revision_list_parser'),
+			'revision_printer' => array(RevisionPrinter::class, 'revision_printer'),
+			'command_factory' => array(CommandFactory::class, 'command_factory'),
+			'repository_connector' => array(Connector::class, 'repository_connector'),
+			'commit_message_builder' => array(CommitMessageBuilder::class, 'commit_message_builder'),
+			'working_copy_resolver' => array(WorkingCopyResolver::class, 'working_copy_resolver'),
+			'working_copy_conflict_tracker' => array(WorkingCopyConflictTracker::class, 'working_copy_conflict_tracker'),
+			'merge_template_factory' => array(MergeTemplateFactory::class, 'merge_template_factory'),
+			'command_config' => array(CommandConfig::class, 'command_config'),
+			'date_helper' => array(DateHelper::class, 'date_helper'),
+			'size_helper' => array(SizeHelper::class, 'size_helper'),
+			'output_helper' => array(OutputHelper::class, 'output_helper'),
+			'editor' => array(InteractiveEditor::class, 'editor'),
 		);
 
 		// The "updater" service requires executable to be writable (assuming it's PHAR file all the time).
 		$local_phar_file = realpath($_SERVER['argv'][0]) ?: $_SERVER['argv'][0];
 
 		if ( is_writable($local_phar_file) ) {
-			$new_instance_data['updater'] = array('ConsoleHelpers\\SVNBuddy\\Updater\\Updater', 'updater');
+			$new_instance_data['updater'] = array(Updater::class, 'updater');
 		}
 
 		return array_merge($instance_data, $new_instance_data);

tests/SVNBuddy/MergeSourceDetector/MergeSourceDetectorAggregatorTest.php

@@ -14,6 +14,7 @@
 use ConsoleHelpers\SVNBuddy\MergeSourceDetector\MergeSourceDetectorAggregator;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
+use ConsoleHelpers\SVNBuddy\MergeSourceDetector\AbstractMergeSourceDetector;
 
 class MergeSourceDetectorAggregatorTest extends AbstractMergeSourceDetectorTestCase
 {
@@ -33,15 +34,15 @@ class MergeSourceDetectorAggregatorTest extends AbstractMergeSourceDetectorTestC
 	 */
 	protected function setupTest()
 	{
-		$sub_detector1 = $this->prophesize('ConsoleHelpers\\SVNBuddy\\MergeSourceDetector\\AbstractMergeSourceDetector');
+		$sub_detector1 = $this->prophesize(AbstractMergeSourceDetector::class);
 		$sub_detector1->getWeight()->willReturn(2)->shouldBeCalled();
 		$this->detectors[] = $sub_detector1;
 
-		$sub_detector2 = $this->prophesize('ConsoleHelpers\\SVNBuddy\\MergeSourceDetector\\AbstractMergeSourceDetector');
+		$sub_detector2 = $this->prophesize(AbstractMergeSourceDetector::class);
 		$sub_detector2->getWeight()->willReturn(1)->shouldBeCalled();
 		$this->detectors[] = $sub_detector2;
 
-		$sub_detector2 = $this->prophesize('ConsoleHelpers\\SVNBuddy\\MergeSourceDetector\\AbstractMergeSourceDetector');
+		$sub_detector2 = $this->prophesize(AbstractMergeSourceDetector::class);
 		$sub_detector2->getWeight()->willReturn(3)->shouldBeCalled();
 		$this->detectors[] = $sub_detector2;
 	}
@@ -81,7 +82,7 @@ public function testAddingDetectorWithDuplicateWeight()
 		$this->expectException('\InvalidArgumentException');
 		$this->expectExceptionMessage('Another detector with same weight is already added.');
 
-		$sub_detector = $this->prophesize('ConsoleHelpers\\SVNBuddy\\MergeSourceDetector\\AbstractMergeSourceDetector');
+		$sub_detector = $this->prophesize(AbstractMergeSourceDetector::class);
 		$sub_detector->getWeight()->willReturn(1)->shouldBeCalled();
 
 		$detector = $this->createDetector();

tests/SVNBuddy/Process/ProcessFactoryTest.php

@@ -13,13 +13,15 @@
 
 use ConsoleHelpers\SVNBuddy\Process\ProcessFactory;
 use PHPUnit\Framework\TestCase;
+use ConsoleHelpers\SVNBuddy\Process\IProcessFactory;
+use Symfony\Component\Process\Process;
 
 class ProcessFactoryTest extends TestCase
 {
 
 	public function testImplementsCorrectInterface()
 	{
-		$this->assertInstanceOf('ConsoleHelpers\\SVNBuddy\\Process\\IProcessFactory', new ProcessFactory());
+		$this->assertInstanceOf(IProcessFactory::class, new ProcessFactory());
 	}
 
 	public function testProcessCanBeCreated()
@@ -28,7 +30,7 @@ public function testProcessCanBeCreated()
 
 		$process = $factory->createProcess('command', 10);
 
-		$this->assertInstanceOf('Symfony\\Component\\Process\\Process', $process);
+		$this->assertInstanceOf(Process::class, $process);
 		$this->assertEquals('command', $process->getCommandLine());
 		$this->assertEquals(10, $process->getIdleTimeout());
 		$this->assertNull($process->getTimeout());

tests/SVNBuddy/Repository/Connector/CommandFactoryTest.php

@@ -17,6 +17,11 @@
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
+use ConsoleHelpers\ConsoleKit\Config\ConfigEditor;
+use ConsoleHelpers\ConsoleKit\ConsoleIO;
+use ConsoleHelpers\SVNBuddy\Process\IProcessFactory;
+use ConsoleHelpers\SVNBuddy\Cache\CacheManager;
+use Symfony\Component\Process\Process;
 
 class CommandFactoryTest extends TestCase
 {
@@ -64,10 +69,10 @@ class CommandFactoryTest extends TestCase
 	 */
 	protected function setupTest()
 	{
-		$this->_configEditor = $this->prophesize('ConsoleHelpers\\ConsoleKit\\Config\\ConfigEditor');
-		$this->_io = $this->prophesize('ConsoleHelpers\\ConsoleKit\\ConsoleIO');
-		$this->_processFactory = $this->prophesize('ConsoleHelpers\\SVNBuddy\\Process\\IProcessFactory');
-		$this->_cacheManager = $this->prophesize('ConsoleHelpers\\SVNBuddy\\Cache\\CacheManager');
+		$this->_configEditor = $this->prophesize(ConfigEditor::class);
+		$this->_io = $this->prophesize(ConsoleIO::class);
+		$this->_processFactory = $this->prophesize(IProcessFactory::class);
+		$this->_cacheManager = $this->prophesize(CacheManager::class);
 
 		// To get nice exception back when unexpected command is executed.
 		$this->_processFactory
@@ -155,7 +160,7 @@ public function commandWithParamsDataProvider()
 	 */
 	private function _expectCommand($command, $output, $error_msg = null, $error_code = 0)
 	{
-		$process = $this->prophesize('Symfony\\Component\\Process\\Process');
+		$process = $this->prophesize(Process::class);
 
 		$expectation = $process
 			->mustRun(strpos($command, 'upgrade') !== false ? Argument::type('callable') : null)

tests/SVNBuddy/Repository/Connector/CommandTest.php

@@ -18,6 +18,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
+use ConsoleHelpers\SVNBuddy\Process\IProcessFactory;
+use ConsoleHelpers\ConsoleKit\ConsoleIO;
+use ConsoleHelpers\SVNBuddy\Cache\CacheManager;
+use ConsoleHelpers\SVNBuddy\Exception\RepositoryCommandException;
 
 class CommandTest extends TestCase
 {
@@ -63,10 +67,10 @@ class CommandTest extends TestCase
 	 */
 	protected function setupTest()
 	{
-		$this->_processFactory = $this->prophesize('ConsoleHelpers\SVNBuddy\Process\IProcessFactory');
-		$this->_process = $this->prophesize('Symfony\\Component\\Process\\Process');
-		$this->_io = $this->prophesize('ConsoleHelpers\\ConsoleKit\\ConsoleIO');
-		$this->_cacheManager = $this->prophesize('ConsoleHelpers\\SVNBuddy\\Cache\\CacheManager');
+		$this->_processFactory = $this->prophesize(IProcessFactory::class);
+		$this->_process = $this->prophesize(Process::class);
+		$this->_io = $this->prophesize(ConsoleIO::class);
+		$this->_cacheManager = $this->prophesize(CacheManager::class);
 	}
 
 	/**
@@ -406,8 +410,7 @@ public function testRunError()
 	{
 		$this->_command = $this->_createCommand('svn log');
 
-		/** @var ProcessFailedException $exception */
-		$exception = $this->prophesize('Symfony\\Component\\Process\\Exception\\ProcessFailedException');
+		$exception = $this->prophesize(ProcessFailedException::class);
 
 		$this->_process->mustRun(null)->willThrow($exception->reveal())->shouldBeCalled();
 		$this->_process->getErrorOutput()->willReturn('error output')->shouldBeCalled();
@@ -425,7 +428,7 @@ public function testRunError()
 		}
 		catch ( \Exception $thrown_exception ) {
 			$this->assertInstanceOf(
-				'ConsoleHelpers\\SVNBuddy\\Exception\\RepositoryCommandException',
+				RepositoryCommandException::class,
 				$thrown_exception,
 				sprintf(
 					'Exception of correct class was thrown' . PHP_EOL . 'Message:' . PHP_EOL . '%s',

tests/SVNBuddy/Repository/Connector/ConnectorTest.php

@@ -17,6 +17,11 @@
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
+use ConsoleHelpers\ConsoleKit\Config\ConfigEditor;
+use ConsoleHelpers\ConsoleKit\ConsoleIO;
+use ConsoleHelpers\SVNBuddy\Repository\Connector\CommandFactory;
+use ConsoleHelpers\SVNBuddy\Repository\Parser\RevisionListParser;
+use ConsoleHelpers\SVNBuddy\Repository\Connector\Command;
 
 class ConnectorTest extends TestCase
 {
@@ -66,10 +71,10 @@ class ConnectorTest extends TestCase
 	 */
 	protected function setupTest()
 	{
-		$this->_configEditor = $this->prophesize('ConsoleHelpers\\ConsoleKit\\Config\\ConfigEditor');
-		$this->_io = $this->prophesize('ConsoleHelpers\\ConsoleKit\\ConsoleIO');
-		$this->_commandFactory = $this->prophesize('ConsoleHelpers\\SVNBuddy\\Repository\\Connector\\CommandFactory');
-		$this->_revisionListParser = $this->prophesize('ConsoleHelpers\SVNBuddy\Repository\Parser\RevisionListParser');
+		$this->_configEditor = $this->prophesize(ConfigEditor::class);
+		$this->_io = $this->prophesize(ConsoleIO::class);
+		$this->_commandFactory = $this->prophesize(CommandFactory::class);
+		$this->_revisionListParser = $this->prophesize(RevisionListParser::class);
 
 		// To get nice exception back when unexpected command is executed.
 		$this->_commandFactory
@@ -277,7 +282,7 @@ public function testGetWorkingCopyUrlWithUnknownError()
 Error #555:
 error message
 MESSAGE;
-		$this->expectException('ConsoleHelpers\\SVNBuddy\\Exception\\RepositoryCommandException');
+		$this->expectException(RepositoryCommandException::class);
 		$this->expectExceptionMessage($exception_msg);
 
 		$this->_repositoryConnector->getWorkingCopyUrl('/path/to/working-copy');
@@ -307,7 +312,7 @@ public function testGetWorkingCopyUrlOnOldFormatWorkingCopyAndUpgradeRejected()
 error message
 MESSAGE;
 
-		$this->expectException('ConsoleHelpers\\SVNBuddy\\Exception\\RepositoryCommandException');
+		$this->expectException(RepositoryCommandException::class);
 		$this->expectExceptionMessage(sprintf(
 			$exception_msg,
 			RepositoryCommandException::SVN_ERR_WC_UPGRADE_REQUIRED
@@ -856,7 +861,7 @@ public function testGetFileContent()
 	 */
 	private function _expectCommand($sub_command, $param_string, $output, $error_msg = null, $error_code = 0)
 	{
-		$command = $this->prophesize('ConsoleHelpers\\SVNBuddy\\Repository\\Connector\\Command');
+		$command = $this->prophesize(Command::class);
 
 		if ( $sub_command === 'upgrade' ) {
 			$run_expectation = $command->runLive()->shouldBeCalled();