CS Fixes.

Author: Thinkscape

docs/DIAGNOSTICS.md

@@ -12,23 +12,7 @@
 
 ## Available checks
 
- * All checks from [ZendDiagnostics](https://github.com/zendframework/ZendDiagnostics#zenddiagnostics):
-    * [ApcFragmentation](https://github.com/zendframework/ZendDiagnostics#apcfragmentation) - check if APC memory fragmentation is below given threshold,
-    * [ApcMemory](https://github.com/zendframework/ZendDiagnostics#apcmemory) - check available APC memory,
-    * [Callback](https://github.com/zendframework/ZendDiagnostics#callback) - call a user-defined diagnostic function,
-    * [ClassExists](https://github.com/zendframework/ZendDiagnostics#classexists) - make sure class exists in current environment,
-    * [CpuPerformance](https://github.com/zendframework/ZendDiagnostics#cpuperformance) - check server CPU performance is above baseline,
-    * [DirReadable](https://github.com/zendframework/ZendDiagnostics#dirreadable) - make sure given path is readable,
-    * [DirWritable](https://github.com/zendframework/ZendDiagnostics#dirwritable) - make sure given path is writable,
-    * [DiskFree](https://github.com/zendframework/ZendDiagnostics#diskfree) - check there's enough free space on given path,
-    * [ExtensionLoaded](https://github.com/zendframework/ZendDiagnostics#extensionloaded) - make sure extension is loaded,
-    * [HttpService](https://github.com/zendframework/ZendDiagnostics#httpservice) - check if given http host is responding,
-    * [Memcache](https://github.com/zendframework/ZendDiagnostics#memcache) - check if memcache extension is loaded and given server is reachable,
-    * [PhpVersion](https://github.com/zendframework/ZendDiagnostics#phpversion) - make sure that PHP version matches constraint,
-    * [PhpFlag](https://github.com/zendframework/ZendDiagnostics#phpflag) - make sure that given PHP flag (feature) is turned on or off.
-    * [ProcessRunning](https://github.com/zendframework/ZendDiagnostics#processrunning) - check if a process with given name or ID is currently running,
-    * [SecurityAdvisory](https://github.com/zendframework/ZendDiagnostics#securityadvisory) - check installed composer dependencies against SensioLabs SA database,
-    * [SteamWrapperExists](https://github.com/zendframework/ZendDiagnostics#streamwrapperexists) - make sure given stream wrapper is available.
+ * All checks from [ZendDiagnostics](https://github.com/zendframework/ZendDiagnostics#zenddiagnostics)
 
 ## Running diagnostics in console
 

src/ZFTool/Controller/DiagnosticsController.php

@@ -56,20 +56,21 @@ public function runAction()
         if ($checkGroupName) {
             $config = array_intersect_ukey($config, array($checkGroupName => 1), 'strcasecmp');
 
-            if(empty($config)) {
+            if (empty($config)) {
                 $m = new ConsoleModel();
                 $m->setResult($console->colorize(sprintf(
                     "Unable to find a group of diagnostic checks called \"%s\". Try to use module name (i.e. \"%s\").\n",
                     $checkGroupName,
                     'Application'
                 ), ColorInterface::YELLOW));
                 $m->setErrorLevel(1);
+
                 return $m;
             }
         }
 
         // Check if there are any diagnostic checks defined
-        if(empty($config)) {
+        if (empty($config)) {
             $m = new ConsoleModel();
             $m->setResult(
                 $console->colorize(
@@ -80,6 +81,7 @@ public function runAction()
                 , ColorInterface::YELLOW)
             );
             $m->setErrorLevel(1);
+
             return $m;
         }
 

src/ZFTool/Diagnostics/Config.php

@@ -2,7 +2,6 @@
 namespace ZFTool\Diagnostics;
 
 use Zend\Stdlib\AbstractOptions;
-use \Traversable;
 
 class Config extends AbstractOptions implements ConfigInterface
 {
@@ -45,7 +44,7 @@ public function getBreakOnFailure()
      */
     public function setCatchErrorSeverity($catchErrorSeverity)
     {
-        $this->catchErrorSeverity = (int)$catchErrorSeverity;
+        $this->catchErrorSeverity = (int) $catchErrorSeverity;
     }
 
     /**
@@ -58,5 +57,4 @@ public function getCatchErrorSeverity()
         return $this->catchErrorSeverity;
     }
 
-
 }

src/ZFTool/Diagnostics/ConfigInterface.php

@@ -6,7 +6,7 @@ interface ConfigInterface
     /**
      * Should diagnostics stop on first failure.
      *
-     * @param bool $break
+     * @param  bool $break
      * @return void
      */
     public function setBreakOnFailure($break);

src/ZFTool/Diagnostics/Reporter/BasicConsole.php

@@ -41,8 +41,8 @@ public function __construct(Console $console)
     /**
      * This method is called right after Reporter starts running, via Runner::run()
      *
-     * @param ArrayObject $checks
-     * @param array        $runnerConfig
+     * @param  ArrayObject $checks
+     * @param  array       $runnerConfig
      * @return void
      */
     public function onStart(ArrayObject $checks, $runnerConfig)

src/ZFTool/Diagnostics/Reporter/VerboseConsole.php

@@ -202,7 +202,6 @@ public function onFinish(ResultsCollection $results)
             $this->console->writeLine('Diagnostics aborted because of a failure.', Color::RED);
         }
 
-
         // Display a summary line
         if ($results->getFailureCount() == 0 && $results->getWarningCount() == 0 && $results->getUnknownCount() == 0) {
             $line = 'OK (' . $this->total . ' diagnostic checks)';
@@ -283,7 +282,7 @@ public function getConsole()
      */
     public function setDisplayData($displayData)
     {
-        $this->displayData = (bool)$displayData;
+        $this->displayData = (bool) $displayData;
     }
 
     /**
@@ -298,9 +297,9 @@ public function getDisplayData()
     /**
      * Apply padding and word-wrapping for a string.
      *
-     * @param string $string  The string to transform
-     * @param int    $width   Maximum width at which the string should be wrapped to the next line
-     * @param int    $padding The left-side padding to apply
+     * @param  string $string  The string to transform
+     * @param  int    $width   Maximum width at which the string should be wrapped to the next line
+     * @param  int    $padding The left-side padding to apply
      * @return string The padded and wrapped string
      */
     protected function strColPad($string, $width, $padding)

src/ZFTool/Diagnostics/Runner.php

@@ -32,18 +32,19 @@ public function __construct($config = null, $checks = null, ReporterInterface $r
     /**
      * Run all Checks and return a Result\Collection for every check.
      *
-     * @param  string|null $checkAlias An alias of Check instance to run, or null to run all checks.
+     * @param  string|null       $checkAlias An alias of Check instance to run, or null to run all checks.
      * @return ResultsCollection The result of running Checks
      */
     public function run($checkAlias = null)
     {
         $this->breakOnFailure = $this->config->getBreakOnFailure();
         $this->catchErrorSeverity = $this->config->getBreakOnFailure();
+
         return parent::run($checkAlias);
     }
 
     /**
-     * @param ConfigInterface|array $config
+     * @param  ConfigInterface|array              $config
      * @throws Exception\InvalidArgumentException
      * @return void
      */
@@ -75,7 +76,7 @@ public function getConfig()
      */
     public function setBreakOnFailure($breakOnFailure)
     {
-        $this->config->setBreakOnFailure((bool)$breakOnFailure);
+        $this->config->setBreakOnFailure((bool) $breakOnFailure);
     }
 
     /**
@@ -94,7 +95,7 @@ public function getBreakOnFailure()
      */
     public function setCatchErrorSeverity($catchErrorSeverity)
     {
-        $this->config->setCatchErrorSeverity((int)$catchErrorSeverity);
+        $this->config->setCatchErrorSeverity((int) $catchErrorSeverity);
     }
 
     /**

tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php

@@ -409,7 +409,7 @@ public function testModuleProvidedDefinitions()
         );
 
         $x = 0;
-        foreach($results as $check){
+        foreach ($results as $check) {
             $result = $results[$check];
             list($label, $class, $message) = $expected[$x++];
             error_reporting(E_ERROR);
@@ -548,10 +548,11 @@ public function testIgnoreNumericLabel()
     public function testInvalidDefinitions($definition, $exceptionMessage)
     {
         $this->config['diagnostics']['group']['foo'] = $definition;
-        try{
+        try {
             $res = $this->controller->dispatch(new ConsoleRequest());
-        }catch(RuntimeException $e){
+        } catch (RuntimeException $e) {
             $this->assertStringMatchesFormat($exceptionMessage, $e->getMessage());
+
             return;
         }
         $this->fail('Definition is invalid!');
@@ -723,6 +724,7 @@ public function testErrorCodes()
     public static function staticTestMethod($message = 'bar', $data = null)
     {
         static::$staticTestMethodCalled = true;
+
         return new Success($message, $data);
     }
 

tests/ZFToolTest/Diagnostics/RunnerTest.php

@@ -2,11 +2,7 @@
 namespace ZFToolTest\Diagnostics;
 
 use ZFTool\Diagnostics\Config;
-use ZFToolTest\Diagnostics\TestAsset\UnknownResult as Unknown;
 use ZFTool\Diagnostics\Runner;
-use ZendDiagnostics\Result\Success;
-use ZendDiagnostics\Result\Failure;
-use ZendDiagnostics\Result\Warning;
 
 require_once __DIR__.'/TestAsset/UnknownResult.php';
 

tests/ZFToolTest/Diagnostics/TestAsset/DummyModule.php

@@ -23,7 +23,7 @@ public function __construct(ServiceLocatorInterface $sm)
     public function getDiagnostics()
     {
         return array(
-            'test1' => function() {return new Success('test1 success');},
+            'test1' => function () {return new Success('test1 success');},
             'test2' => array('is_string', 'a'),
             'test3' => array('stristr', 'abc','d'),
             'test4' => array(__CLASS__,'staticTestMethod'),

tests/ZFToolTest/Diagnostics/TestAsset/InjectableModuleManager.php

@@ -2,15 +2,14 @@
 
 namespace ZFToolTest\TestAsset;
 
-use Zend\EventManager\EventManager;
 use Zend\ModuleManager\ModuleManager;
 
 /**
  * Module manager
  */
 class InjectableModuleManager extends ModuleManager
 {
-    public function __construct(){}
+    public function __construct() {}
 
     public function injectModule($name, $module)
     {