Merge pull request #81 from grogy/code-sniffer

Added code-sniffer into tests

Author: phpjsdev623

.travis.yml

@@ -26,3 +26,4 @@ script:
   - ./vendor/bin/tester -p php tests
   - ./parallel-lint --exclude vendor --exclude tests/examples --no-colors .
   - ./parallel-lint --exclude vendor --exclude tests/examples .
+  - ./vendor/bin/phpcs --standard=phpcs-ruleset.xml -s src

composer.json

@@ -8,7 +8,8 @@
     },
     "require-dev": {
         "nette/tester": "~1.3",
-        "jakub-onderka/php-console-highlighter": "~0.3"
+        "jakub-onderka/php-console-highlighter": "~0.3",
+        "squizlabs/php_codesniffer": "~2.7"
     },
     "suggest": {
         "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet"

phpcs-ruleset.xml

@@ -50,7 +50,6 @@
     <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
 
     <rule ref="Generic.Metrics.NestingLevel"/>
-    <rule ref="Generic.Metrics.CyclomaticComplexity"/>
 
     <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>

src/JsonSerializable.php

@@ -1,7 +1,8 @@
 <?php
 
 if (!interface_exists('JsonSerializable')) {
-    interface JsonSerializable {
+    interface JsonSerializable
+    {
         public function jsonSerialize();
     }
 }

src/Manager.php

@@ -49,7 +49,8 @@ public function run(Settings $settings = null)
         $output = $this->output ?: $this->getDefaultOutput($settings);
 
         $phpExecutable = PhpExecutable::getPhpExecutable($settings->phpExecutable);
-        $translateTokens = $phpExecutable->isIsHhvmType() || $phpExecutable->getVersionId() < 50400; // From PHP version 5.4 are tokens translated by default
+        $olderThanPhp54 = $phpExecutable->getVersionId() < 50400; // From PHP version 5.4 are tokens translated by default
+        $translateTokens = $phpExecutable->isIsHhvmType() || $olderThanPhp54;
 
         $output->writeHeader($phpExecutable->getVersionId(), $settings->parallelJobs, $phpExecutable->getHhvmVersion());
 
@@ -68,9 +69,9 @@ public function run(Settings $settings = null)
         $parallelLint->setProcessCallback(function ($status, $file) use ($output) {
             if ($status === ParallelLint::STATUS_OK) {
                 $output->ok();
-            } elseif ($status === ParallelLint::STATUS_SKIP) {
+            } else if ($status === ParallelLint::STATUS_SKIP) {
                 $output->skip();
-            } elseif ($status === ParallelLint::STATUS_ERROR) {
+            } else if ($status === ParallelLint::STATUS_ERROR) {
                 $output->error();
             } else {
                 $output->fail();
@@ -155,7 +156,7 @@ protected function getFilesFromPaths(array $paths, array $extensions, array $exc
         foreach ($paths as $path) {
             if (is_file($path)) {
                 $files[] = $path;
-            } elseif (is_dir($path)) {
+            } else if (is_dir($path)) {
                 $iterator = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);
                 if (!empty($excluded)) {
                     $iterator = new RecursiveDirectoryFilterIterator($iterator, $excluded);

src/ParallelLint.php

@@ -73,7 +73,8 @@ public function lint(array $files)
 
         $skipLintProcess = new SkipLintProcess($this->phpExecutable, $files);
 
-        $processCallback = is_callable($this->processCallback) ? $this->processCallback : function() {};
+        $processCallback = is_callable($this->processCallback) ? $this->processCallback : function () {
+        };
 
         /**
          * @var LintProcess[] $running
@@ -110,15 +111,15 @@ public function lint(array $files)
                     if ($skipStatus === null) {
                         $waiting[$file] = $process;
 
-                    } elseif ($skipStatus === true) {
+                    } else if ($skipStatus === true) {
                         $skippedFiles[] = $file;
                         $processCallback(self::STATUS_SKIP, $file);
 
-                    } elseif ($process->isSuccess()) {
+                    } else if ($process->isSuccess()) {
                         $checkedFiles[] = $file;
                         $processCallback(self::STATUS_OK, $file);
 
-                    } elseif ($process->hasSyntaxError()) {
+                    } else if ($process->hasSyntaxError()) {
                         $checkedFiles[] = $file;
                         $errors[] = new SyntaxError($file, $process->getSyntaxError());
                         $processCallback(self::STATUS_ERROR, $file);
@@ -139,15 +140,15 @@ public function lint(array $files)
                 if ($skipStatus === null) {
                     throw new \Exception("File $file has empty skip status. Please contact PHP Parallel Lint author.");
 
-                } elseif ($skipStatus === true) {
+                } else if ($skipStatus === true) {
                     $skippedFiles[] = $file;
                     $processCallback(self::STATUS_SKIP, $file);
 
-                } elseif ($process->isSuccess()) {
+                } else if ($process->isSuccess()) {
                     $checkedFiles[] = $file;
                     $processCallback(self::STATUS_OK, $file);
 
-                } elseif ($process->hasSyntaxError()) {
+                } else if ($process->hasSyntaxError()) {
                     $checkedFiles[] = $file;
                     $errors[] = new SyntaxError($file, $process->getSyntaxError());
                     $processCallback(self::STATUS_ERROR, $file);

src/Process/PhpProcess.php

@@ -11,7 +11,8 @@ class PhpProcess extends Process
      */
     public function __construct(PhpExecutable $phpExecutable, array $parameters = array(), $stdIn = null)
     {
-        $cmdLine = escapeshellcmd($phpExecutable->getPath()) . ' ' . $this->constructParameters($parameters, $phpExecutable->isIsHhvmType());
+        $constructedParameters = $this->constructParameters($parameters, $phpExecutable->isIsHhvmType());
+        $cmdLine = escapeshellcmd($phpExecutable->getPath()) . ' ' . $constructedParameters;
         parent::__construct($cmdLine, $stdIn);
     }
 

src/Process/Process.php

@@ -64,15 +64,15 @@ public function __construct($cmdLine, $stdInInput = null)
      */
     public function isFinished()
     {
-        if ($this->statusCode !== NULL) {
+        if ($this->statusCode !== null) {
             return true;
         }
 
         $status = proc_get_status($this->process);
 
         if ($status['running']) {
             return false;
-        } elseif ($this->statusCode === null) {
+        } else if ($this->statusCode === null) {
             $this->statusCode = (int) $status['exitcode'];
         }