Some sane renaming and moving files into their right adapters.

Author: beberlei

bin/refactor.php

@@ -1,6 +1,6 @@
 <?php
 
-use QafooLabs\Refactoring\Application\CliApplication;
+use QafooLabs\Refactoring\Adapters\Symfony\CliApplication;
 
 require_once __DIR__ . "/../vendor/autoload.php";
 

features/bootstrap/FeatureContext.php

@@ -11,7 +11,7 @@
 
 use Symfony\Component\Console\Input\ArrayInput;
 
-use QafooLabs\Refactoring\Application\CliApplication;
+use QafooLabs\Refactoring\Adapters\Symfony\CliApplication;
 
 require_once 'PHPUnit/Autoload.php';
 require_once 'PHPUnit/Framework/Assert/Functions.php';

src/main/QafooLabs/Refactoring/Application/CliApplication.php renamed to src/main/QafooLabs/Refactoring/Adapters/Symfony/CliApplication.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace QafooLabs\Refactoring\Application;
+namespace QafooLabs\Refactoring\Adapters\Symfony;
 
 use Symfony\Component\Console\Application;
 

src/main/QafooLabs/Refactoring/Application/Commands/ExtractMethodCommand.php renamed to src/main/QafooLabs/Refactoring/Adapters/Symfony/Commands/ExtractMethodCommand.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace QafooLabs\Refactoring\Application\Commands;
+namespace QafooLabs\Refactoring\Adapters\Symfony\Commands;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 
-use QafooLabs\Refactoring\Application\Service\ExtractMethod;
+use QafooLabs\Refactoring\Application\ExtractMethod;
 use QafooLabs\Refactoring\Adapters\PHPParser\ParserVariableScanner;
 use QafooLabs\Refactoring\Adapters\TokenReflection\StaticCodeAnalysis;
 use QafooLabs\Refactoring\Adapters\Patches\PatchEditor;

src/main/QafooLabs/Refactoring/Application/Service/ExtractMethod.php renamed to src/main/QafooLabs/Refactoring/Application/ExtractMethod.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace QafooLabs\Refactoring\Application\Service;
+namespace QafooLabs\Refactoring\Application;
 
 use QafooLabs\Refactoring\Domain\Model\LineRange;
 use QafooLabs\Refactoring\Domain\Model\File;

src/main/QafooLabs/Refactoring/Domain/Model/File.php

@@ -34,11 +34,17 @@ public function __construct($relativePath, $code)
         $this->code = $code;
     }
 
+    /**
+     * @return string
+     */
     public function getRelativePath()
     {
         return $this->relativePath;
     }
 
+    /**
+     * @return string
+     */
     public function getCode()
     {
         return $this->code;

src/test/QafooLabs/Refactoring/Application/Service/ExtractMethodTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace QafooLabs\Refactoring\Application\Service;
+namespace QafooLabs\Refactoring\Application;
 
 use QafooLabs\Refactoring\Domain\Model\File;
 use QafooLabs\Refactoring\Domain\Model\LineRange;