Fix CS

davidspeijer · Nov 22, 2019 · 6930c41 · 6930c41
1 parent 83fab70
commit 6930c41
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -50,5 +50,13 @@
     },
     "suggest": {
         "ext-pdo_sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs --colors -p src/ tests/",
+        "cs-fix": "phpcbf --colors -p src/ tests/"
     }
 }
diff --git a/src/Cache/Engine/DebugEngine.php b/src/Cache/Engine/DebugEngine.php
@@ -75,7 +75,7 @@ public function init(array $config = [])
 
             return true;
         }
-        $registry = new CacheRegistry;
+        $registry = new CacheRegistry();
         $this->_engine = $registry->load('spies', $this->_config);
         unset($registry);
 

diff --git a/src/Controller/MailPreviewController.php b/src/Controller/MailPreviewController.php
@@ -202,7 +202,7 @@ protected function getMailPreviewClasses()
                     $base = str_replace(".php", "", basename($file));
                     $class = App::className($plugin . $base, 'Mailer/Preview');
                     if ($class) {
-                        yield ['plugin' => trim($plugin, '.'), 'class' => new $class];
+                        yield ['plugin' => trim($plugin, '.'), 'class' => new $class()];
                     }
                 }
             });
@@ -269,7 +269,7 @@ protected function findPreview($previewName, $emailName, $plugin = null)
         if (!$realClass) {
             throw new NotFoundException("Mailer preview ${previewName} not found");
         }
-        $mailPreview = new $realClass;
+        $mailPreview = new $realClass();
 
         $email = $mailPreview->find($emailName);
         if (!$email) {

diff --git a/src/Model/Table/PanelsTable.php b/src/Model/Table/PanelsTable.php
@@ -30,7 +30,6 @@
  */
 class PanelsTable extends Table
 {
-
     use LazyTableTrait;
 
     /**

diff --git a/src/Model/Table/RequestsTable.php b/src/Model/Table/RequestsTable.php
@@ -31,7 +31,6 @@
  */
 class RequestsTable extends Table
 {
-
     use LazyTableTrait;
 
     /**

diff --git a/src/Panel/MailPanel.php b/src/Panel/MailPanel.php
@@ -44,7 +44,7 @@ public function initialize()
         $property->setAccessible(true);
         $configs = $property->getValue();
 
-        $log = $this->emailLog = new ArrayObject;
+        $log = $this->emailLog = new ArrayObject();
 
         foreach ($configs as $name => &$transport) {
             if (is_object($transport)) {

diff --git a/src/Panel/VariablesPanel.php b/src/Panel/VariablesPanel.php
@@ -93,7 +93,8 @@ public function shutdown(Event $event)
         $errors = [];
 
         $walker = function (&$item) use (&$walker) {
-            if ($item instanceof Collection ||
+            if (
+                $item instanceof Collection ||
                 $item instanceof Query ||
                 $item instanceof ResultSet
             ) {
@@ -108,7 +109,8 @@ public function shutdown(Event $event)
                 } catch (InvalidArgumentException $e) {
                     $item = $this->_walkDebugInfo($walker, $item);
                 }
-            } elseif ($item instanceof Closure ||
+            } elseif (
+                $item instanceof Closure ||
                 $item instanceof PDO ||
                 $item instanceof SimpleXMLElement
             ) {

diff --git a/src/ToolbarService.php b/src/ToolbarService.php
@@ -208,7 +208,8 @@ public function saveData(ServerRequest $request, ResponseInterface $response)
     {
         // Skip debugkit requests and requestAction()
         $path = $request->getUri()->getPath();
-        if (strpos($path, 'debug_kit') !== false ||
+        if (
+            strpos($path, 'debug_kit') !== false ||
             strpos($path, 'debug-kit') !== false ||
             $request->is('requested')
         ) {

diff --git a/src/View/Helper/TidyHelper.php b/src/View/Helper/TidyHelper.php
@@ -50,7 +50,7 @@ class TidyHelper extends Helper
      * Fudge the markup slightly so that the tag which is invalid is highlighted
      *
      * @param string $html ''
-     * @param string &$out ''
+     * @param string $out ''
      * @return array
      */
     public function process($html = '', &$out = '')
@@ -125,7 +125,7 @@ public function report($html = null)
      * normalized string so that the error messages can be linked to the line that caused them.
      *
      * @param string $in ''
-     * @param string &$out ''
+     * @param string $out ''
      * @return string
      */
     public function tidyErrors($in = '', &$out = '')
@@ -163,7 +163,7 @@ public function tidyErrors($in = '', &$out = '')
      * exec method
      *
      * @param mixed $cmd ''
-     * @param mixed &$out null
+     * @param mixed $out null
      * @return bool True if successful
      */
     protected function _exec($cmd, &$out = null)

diff --git a/src/View/Helper/ToolbarHelper.php b/src/View/Helper/ToolbarHelper.php
@@ -127,7 +127,8 @@ public function makeNeatArray($values, $openDepth = 0, $currentDepth = 0, $doubl
                 $value = ' - recursion';
             }
 
-            if ((
+            if (
+                (
                 $value instanceof ArrayAccess ||
                 $value instanceof Iterator ||
                 is_array($value) ||

diff --git a/tests/TestCase/DebugTimerTest.php b/tests/TestCase/DebugTimerTest.php
@@ -50,7 +50,7 @@ public function testTimers()
         sleep(1);
         $this->assertTrue(DebugTimer::stop('test2'));
         $elapsed = DebugTimer::elapsedTime('test2');
-        $expected = stripos(PHP_OS, 'win') === false ? 0.999: 0.95; // Windows timer's precision is bad
+        $expected = stripos(PHP_OS, 'win') === false ? 0.999 : 0.95; // Windows timer's precision is bad
         $this->assertTrue($elapsed >= $expected);
 
         DebugTimer::start('test3');

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -34,7 +34,7 @@
 define('CACHE', TMP);
 define('LOGS', TMP);
 
-$loader = new \Cake\Core\ClassLoader;
+$loader = new \Cake\Core\ClassLoader();
 $loader->register();
 
 $loader->addNamespace('TestApp', APP);
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
      */
     class PanelsTable extends Table
     {
         use LazyTableTrait;
         /**
@@ Expand Down @@