Add class configuration functionality instead of php files

.travis.yml

@@ -36,6 +36,7 @@ before_install:
   - git config --global user.name "John Doe"
   - composer self-update
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/console:${SYMFONY_VERSION}" "symfony/yaml:${SYMFONY_VERSION}" "symfony/process:${SYMFONY_VERSION}" --no-update; fi;
+  - composer require "phpunit/phpunit:<6" --no-update
 
 install: composer update --prefer-source $COMPOSER_FLAGS
 

src/Liip/RMT/Config/Handler.php

@@ -168,6 +168,10 @@ protected function getClassAndOptions($rawConfig, $sectionName)
      */
     protected function findClass($name, $sectionName)
     {
+        if (class_exists($name)) {
+            return $name;
+        }
+
         $file = $this->projectRoot.DIRECTORY_SEPARATOR.$name;
         if (strpos($file, '.php') > 0) {
             if (file_exists($file)) {
@@ -217,8 +221,14 @@ protected function findInternalClass($name, $sectionName)
             'version-persister' => 'Persister',
         );
         $nameSpace = $namespacesByType[$classType];
-        $className = str_replace(' ', '', ucwords(str_replace('-', ' ', $name))).$suffixByType[$classType];
+        $classNameWithoutSuffix = str_replace(' ', '', ucwords(str_replace('-', ' ', $name)));
+        $classNameSuffix = $suffixByType[$classType];
+        $className = $nameSpace.'\\'.$classNameWithoutSuffix;
+
+        if (substr($classNameWithoutSuffix, -strlen($classNameSuffix)) != $classNameSuffix) {
+            $className .= $classNameSuffix;
+        }
 
-        return $nameSpace.'\\'.$className;
+        return $className;
     }
 }

test/Liip/RMT/Tests/Unit/Config/ExternalClasses/CustomVersionGenerator.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the project RMT
+ *
+ * Copyright (c) 2013, Liip AG, http://www.liip.ch
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
+namespace Liip\RMT\Tests\Unit\Config\ExternalClasses;
+
+use Liip\RMT\Version\Generator\SimpleGenerator;
+
+class CustomVersionGenerator extends SimpleGenerator
+{
+}

test/Liip/RMT/Tests/Unit/Config/ExternalClasses/CustomVersionPersister.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the project RMT
+ *
+ * Copyright (c) 2013, Liip AG, http://www.liip.ch
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
+namespace Liip\RMT\Tests\Unit\Config\ExternalClasses;
+
+use Liip\RMT\Version\Persister\VcsTagPersister;
+
+class CustomVersionPersister extends VcsTagPersister
+{
+}

test/Liip/RMT/Tests/Unit/Config/HandlerTest.php

@@ -12,6 +12,8 @@
 namespace Liip\RMT\Tests\Unit\Config;
 
 use Liip\RMT\Config\Handler;
+use Liip\RMT\Tests\Unit\Config\ExternalClasses\CustomVersionGenerator;
+use Liip\RMT\Tests\Unit\Config\ExternalClasses\CustomVersionPersister;
 
 class HandlerTest extends \PHPUnit_Framework_TestCase
 {
@@ -225,4 +227,36 @@ public function getDataForTestingGetClassAndOptions()
             array('prerequisites_1', 'vcs-clean-check', 'Liip\RMT\Prerequisite\VcsCleanCheck', array()),
         );
     }
+
+    /**
+     * @dataProvider getDataForTestingGetClassForClassConfigurationInVersionGenerator
+     */
+    public function testGetClassForClassConfigurationInVersionGenerator($configKey, $configClass, $expectedClass)
+    {
+        $configHandler = new Handler(array(
+            'version-persister' => $configClass,
+            'version-generator' => $configClass,
+        ));
+
+        $method = new \ReflectionMethod('Liip\RMT\Config\Handler', 'getClassAndOptions');
+        $method->setAccessible(true);
+
+        $classAndOptions = $method->invokeArgs($configHandler, array($configClass, $configKey));
+
+        $this->assertEquals($expectedClass, $classAndOptions['class']);
+    }
+
+    public function getDataForTestingGetClassForClassConfigurationInVersionGenerator()
+    {
+        return array(
+            // version persister
+            array('version-persister', 'Liip\RMT\Tests\Unit\Config\ExternalClasses\CustomVersionPersister', 'Liip\RMT\Tests\Unit\Config\ExternalClasses\CustomVersionPersister'),
+            array('version-persister', 'CustomVersion', 'Liip\RMT\Version\Persister\CustomVersionPersister'),
+            array('version-persister', 'CustomVersionPersister', 'Liip\RMT\Version\Persister\CustomVersionPersister'),
+            // version generator
+            array('version-generator', 'Liip\RMT\Tests\Unit\Config\ExternalClasses\CustomVersionGenerator', 'Liip\RMT\Tests\Unit\Config\ExternalClasses\CustomVersionGenerator'),
+            array('version-generator', 'CustomVersion', 'Liip\RMT\Version\Generator\CustomVersionGenerator'),
+            array('version-generator', 'CustomVersionGenerator', 'Liip\RMT\Version\Generator\CustomVersionGenerator'),
+        );
+    }
 }