consolidation / robo

src/ClassDiscovery/RelativeNamespaceDiscovery.php

Indentation +2 added lines, -2 removed lines

@@ -91,8 +91,8 @@
     {
         $finder = new Finder();
         $finder->files()
-          ->name($pattern)
-          ->in($directories);
+            ->name($pattern)
+            ->in($directories);
 
         return $finder;
     }

Doc Comments +5 added lines, -3 removed lines

@@ -62,6 +62,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $class
      */
     public function getFile($class)
     {
@@ -70,7 +71,7 @@ 
 
     /**
      * @param $directories
-     * @param $pattern
+     * @param string $pattern
      *
      * @return \Symfony\Component\Finder\Finder
      */
@@ -85,9 +86,9 @@ 
     }
 
     /**
-     * @param $path
+     * @param string $path
      *
-     * @return mixed
+     * @return string
      */
     protected function convertPathToNamespace($path)
     {
@@ -95,6 +96,7 @@ 
     }
 
     /**
+     * @param string $namespace
      * @return string
      */
     public function convertNamespaceToPath($namespace)

Spacing +4 added lines, -4 removed lines

@@ -53,14 +53,14 @@ 
         $relativePath = $this->convertNamespaceToPath($this->relativeNamespace);
 
         foreach ($this->classLoader->getPrefixesPsr4() as $baseNamespace => $directories) {
-            $directories = array_filter(array_map(function ($directory) use ($relativePath) {
-                return $directory.$relativePath;
+            $directories = array_filter(array_map(function($directory) use ($relativePath) {
+                return $directory . $relativePath;
             }, $directories), 'is_dir');
 
             if ($directories) {
                 foreach ($this->search($directories, $this->searchPattern) as $file) {
                     $relativePathName = $file->getRelativePathname();
-                    $classes[] = $baseNamespace.$this->convertPathToNamespace($relativePath.'/'.$relativePathName);
+                    $classes[] = $baseNamespace . $this->convertPathToNamespace($relativePath . '/' . $relativePathName);
                 }
             }
         }
@@ -107,6 +107,6 @@ 
      */
     public function convertNamespaceToPath($namespace)
     {
-        return '/'.str_replace("\\", '/', trim($namespace, '\\'));
+        return '/' . str_replace("\\", '/', trim($namespace, '\\'));
     }
 }

tests/unit/ClassDiscovery/RelativeNamespaceDiscoveryTest.php

Indentation +7 added lines, -7 removed lines

@@ -38,10 +38,10 @@ 
     public function testConvertPathToNamespaceData()
     {
         return [
-          ['/A/B/C', 'A\B\C'],
-          ['A/B/C', 'A\B\C'],
-          ['A/B/C', 'A\B\C'],
-          ['A/B/C.php', 'A\B\C'],
+            ['/A/B/C', 'A\B\C'],
+            ['A/B/C', 'A\B\C'],
+            ['A/B/C', 'A\B\C'],
+            ['A/B/C.php', 'A\B\C'],
         ];
     }
 
@@ -61,9 +61,9 @@ 
     public function testConvertNamespaceToPathData()
     {
         return [
-          ['A\B\C', '/A/B/C'],
-          ['\A\B\C\\', '/A/B/C'],
-          ['A\B\C\\', '/A/B/C'],
+            ['A\B\C', '/A/B/C'],
+            ['\A\B\C\\', '/A/B/C'],
+            ['A\B\C\\', '/A/B/C'],
         ];
     }
 

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public function testGetClasses()
     {
         $classLoader = new ClassLoader();
-        $classLoader->addPsr4('\\Robo\\PluginTest\\', [realpath(__DIR__.'/../../plugins')]);
+        $classLoader->addPsr4('\\Robo\\PluginTest\\', [realpath(__DIR__ . '/../../plugins')]);
         $service = new RelativeNamespaceDiscovery($classLoader);
         $service->setRelativeNamespace('Robo\Plugin');
         $service->setSearchPattern('*Commands.php');
@@ -25,7 +25,7 @@ 
     public function testGetFile()
     {
         $classLoader = new ClassLoader();
-        $classLoader->addPsr4('\\Robo\\PluginTest\\', [realpath(__DIR__.'/../../plugins')]);
+        $classLoader->addPsr4('\\Robo\\PluginTest\\', [realpath(__DIR__ . '/../../plugins')]);
         $service = new RelativeNamespaceDiscovery($classLoader);
         $service->setRelativeNamespace('Robo\Plugin');
 

src/Runner.php

Doc Comments +7 added lines, -4 removed lines

@@ -68,6 +68,9 @@ 
         $this->dir = getcwd();
     }
 
+    /**
+     * @param string $errorType
+     */
     protected function errorCondition($msg, $errorType)
     {
         $this->errorConditions[$msg] = $errorType;
@@ -115,7 +118,7 @@ 
     }
 
     /**
-     * @param array $argv
+     * @param string[] $argv
      * @param null|string $appName
      * @param null|string $appVersion
      * @param null|\Symfony\Component\Console\Output\OutputInterface $output
@@ -138,7 +141,7 @@ 
      * @param null|\Symfony\Component\Console\Input\InputInterface $input
      * @param null|\Symfony\Component\Console\Output\OutputInterface $output
      * @param null|\Robo\Application $app
-     * @param array[] $commandFiles
+     * @param null|string $commandFiles
      * @param null|ClassLoader $classLoader
      *
      * @return int
@@ -231,9 +234,9 @@ 
     }
 
     /**
-     * @param $relativeNamespace
+     * @param string $relativeNamespace
      *
-     * @return array|string[]
+     * @return string[]
      */
     protected function discoverCommandClasses($relativeNamespace)
     {

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
     public function __construct($roboClass = null, $roboFile = null)
     {
         // set the const as class properties to allow overwriting in child classes
-        $this->roboClass = $roboClass ? $roboClass : self::ROBOCLASS ;
+        $this->roboClass = $roboClass ? $roboClass : self::ROBOCLASS;
         $this->roboFile  = $roboFile ? $roboFile : self::ROBOFILE;
         $this->dir = getcwd();
     }
@@ -239,7 +239,7 @@ 
     {
         /** @var \Robo\ClassDiscovery\RelativeNamespaceDiscovery $discovery */
         $discovery = Robo::service('relativeNamespaceDiscovery');
-        $discovery->setRelativeNamespace($relativeNamespace.'\Commands')
+        $discovery->setRelativeNamespace($relativeNamespace . '\Commands')
             ->setSearchPattern('*Commands.php');
         return $discovery->getClasses();
     }
@@ -413,9 +413,9 @@ 
 
         if (substr($argv[$pos], 0, 12) == '--load-from=') {
             $this->dir = substr($argv[$pos], 12);
-        } elseif (isset($argv[$pos +1])) {
-            $this->dir = $argv[$pos +1];
-            unset($argv[$pos +1]);
+        } elseif (isset($argv[$pos + 1])) {
+            $this->dir = $argv[$pos + 1];
+            unset($argv[$pos + 1]);
         }
         unset($argv[$pos]);
         // Make adjustments if '--load-from' points at a file.