Code style

Author: JakubOnderka

src/Manager.php

@@ -263,8 +263,8 @@ public function accept()
     {
         $current = $this->current()->getPathname();
 
-        if(".".DIRECTORY_SEPARATOR !== $current[0].$current[1]) {
-            $current = ".".DIRECTORY_SEPARATOR.$current;
+        if ('.' . DIRECTORY_SEPARATOR !== $current[0] . $current[1]) {
+            $current = '.' . DIRECTORY_SEPARATOR . $current;
         }
 
         return !in_array($current, $this->excluded);
@@ -295,15 +295,15 @@ public function getChildren()
     }
 
     /**
-     * @param string $excluded
+     * @param string $file
      * @return string
      */
     private function getPathname($file)
     {
-        if(".".DIRECTORY_SEPARATOR !== $file[0].$file[1]) {
-            $file = ".".DIRECTORY_SEPARATOR.$file;
+        if ('.' . DIRECTORY_SEPARATOR !== $file[0] . $file[1]) {
+            $file = '.' . DIRECTORY_SEPARATOR . $file;
         }
-        
+
         $directoryFile = new \SplFileInfo($file);
         return $directoryFile->getPathname();
     }

tests/Manager.run.phpt

@@ -9,6 +9,8 @@ require_once __DIR__ . '/../src/Settings.php';
 require_once __DIR__ . '/../src/exceptions.php';
 
 use JakubOnderka\PhpParallelLint\Manager;
+use JakubOnderka\PhpParallelLint\NullWriter;
+use JakubOnderka\PhpParallelLint\Output;
 use JakubOnderka\PhpParallelLint\Settings;
 use Tester\Assert;
 
@@ -24,8 +26,6 @@ class ManagerRunTest extends Tester\TestCase
         }, 'JakubOnderka\PhpParallelLint\NotExistsPathException');
     }
 
-
-
     public function testFilesNotFound()
     {
         $settings = $this->prepareSettings();
@@ -36,76 +36,71 @@ class ManagerRunTest extends Tester\TestCase
         }, 'JakubOnderka\PhpParallelLint\Exception', 'No file found to check.');
     }
 
-
-
     public function testSuccess()
     {
         $settings = $this->prepareSettings();
         $settings->paths = array('examples/example-02/');
-        $manager = new Manager($settings);
-        ob_start();
-            $code = $manager->run($settings);
-        ob_clean();
+
+        $manager = $this->getManager($settings);
+        $code = $manager->run($settings);
         Assert::true($code);
     }
 
-
-
     public function testError()
     {
         $settings = $this->prepareSettings();
         $settings->paths = array('examples/example-03/');
-        $manager = new Manager($settings);
-        ob_start();
-            $code = $manager->run($settings);
-        ob_clean();
+
+        $manager = $this->getManager($settings);
+        $code = $manager->run($settings);
         Assert::false($code);
     }
 
-
-
     public function testExcludeRelativeSubdirectory()
     {
         $settings = $this->prepareSettings();
         $settings->paths = array('examples/example-04/');
 
-        $manager = new Manager($settings);
-        ob_start();
-            $code = $manager->run($settings);
-        ob_clean();
+        $manager = $this->getManager($settings);
+        $code = $manager->run($settings);
         Assert::false($code);
 
         $settings->excluded = array('examples/example-04/dir1/dir2');
 
-        $manager = new Manager($settings);
-        ob_start();
-            $code = $manager->run($settings);
-        ob_clean();
+        $manager = $this->getManager($settings);
+        $code = $manager->run($settings);
         Assert::true($code);
     }
 
-    function testExcludeAbsoluteSubdirectory() 
+    public function testExcludeAbsoluteSubdirectory()
     {
         $settings = $this->prepareSettings();
         $cwd = getcwd();
-        $settings->paths = array($cwd."/examples/example-04/");
+        $settings->paths = array($cwd . '/examples/example-04/');
         $settings->excluded = array();
 
-        $manager = new Manager($settings);
-        ob_start();
-            $code = $manager->run($settings);
-        ob_clean();
+        $manager = $this->getManager($settings);
+        $code = $manager->run($settings);
         Assert::false($code);
 
+        $settings->excluded = array($cwd . '/examples/example-04/dir1/dir2');
 
-        $settings->excluded = array($cwd.'/examples/example-04/dir1/dir2');
-        $manager = new Manager($settings);
-        ob_start();
-            $code = $manager->run($settings);
-        ob_clean();
+        $manager = $this->getManager($settings);
+        $code = $manager->run($settings);
         Assert::true($code);
     }
 
+    /**
+     * @param Settings $settings
+     * @return Manager
+     */
+    private function getManager(Settings $settings)
+    {
+        $manager = new Manager($settings);
+        $manager->setOutput(new Output(new NullWriter()));
+        return $manager;
+    }
+
     /**
      * @return JakubOnderka\PhpParallelLint\Settings
      */

tests/examples/example-04/dir1/dir2/index.php

@@ -1,4 +1,3 @@
 <?php
-    $foo ='bar'
-    echo $foo;
-?>
+$foo ='bar'
+echo $foo;

tests/examples/example-04/dir1/index.php

@@ -1,3 +1,2 @@
 <?php
-    $foo = 'bar';
-?>
+$foo = 'bar';

tests/examples/example-04/index.php

@@ -1,3 +1,2 @@
 <?php
-    $foo = 'bar';
-?>
+$foo = 'bar';