Merge pull request #761 from cakephp/cs-fixes

Fixed cs errors. Added psalm composer scripts.

Author: ADmad

composer.json

@@ -52,15 +52,11 @@
         "ext-pdo_sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
     },
     "scripts": {
-        "cs-check": [
-          "phpcs --colors --parallel=16 -p src/ tests/"
-        ],
-        "cs-fix": [
-          "phpcbf --colors --parallel=16 -p src/ tests/"
-        ],
-        "test": [
-          "phpunit"
-        ]
+        "cs-check": "phpcs --colors --parallel=16 -p src/ tests/",
+        "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
+        "test": "phpunit",
+        "psalm": "psalm.phar --show-info=false",
+        "psalm-setup": "cp composer.json composer.backup && composer require --dev psalm/phar:^3.11 && mv composer.backup composer.json"
     },
     "prefer-stable": true
 }

src/Command/BenchmarkCommand.php

@@ -55,7 +55,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
         $times = [];
 
         $io->out(Text::insert(__d('debug_kit', '-> Testing :url'), compact('url')));
-        $io->out("");
+        $io->out('');
         for ($i = 0; $i < $options['n']; $i++) {
             if (floor($options['t'] - array_sum($times)) <= 0 || $options['n'] <= 1) {
                 break;
@@ -86,7 +86,7 @@ protected function _results($times)
         $this->io->out(Text::insert(__d('debug_kit', 'Total Requests made: :requests'), compact('requests')));
         $this->io->out(Text::insert(__d('debug_kit', 'Total Time elapsed: :duration (seconds)'), compact('duration')));
 
-        $this->io->out("");
+        $this->io->out('');
 
         $this->io->out(Text::insert(__d('debug_kit', 'Requests/Second: :rps req/sec'), [
                 'rps' => round($requests / $duration, 3),
@@ -105,7 +105,7 @@ protected function _results($times)
                 'shortest' => round(min($times), 3),
         ]));
 
-        $this->io->out("");
+        $this->io->out('');
     }
 
     /**

src/Controller/DebugKitController.php

@@ -46,9 +46,9 @@ public function beforeFilter(EventInterface $event)
                 $authorizationService->skipAuthorization();
             } else {
                 Log::info(
-                    "Cake Authorization plugin is enabled. If you would like " .
-                    "to force DebugKit to ignore it, set `DebugKit.ignoreAuthorization` " .
-                    " Configure option to true."
+                    'Cake Authorization plugin is enabled. If you would like ' .
+                    'to force DebugKit to ignore it, set `DebugKit.ignoreAuthorization` ' .
+                    ' Configure option to true.'
                 );
             }
         }

src/Controller/MailPreviewController.php

@@ -156,7 +156,7 @@ protected function respondWithPart($email, $partType)
 
         $response = $this->response->withType($partType);
         if ($partType === 'text') {
-            $part = '<pre>' . (string)$part . "</pre>";
+            $part = '<pre>' . (string)$part . '</pre>';
         }
         $response = $response->withStringBody($part);
 
@@ -199,8 +199,8 @@ protected function getMailPreviewClasses()
                 }
             })
             ->unfold(function ($path, $plugin) {
-                foreach (glob($path . "*Preview.php") as $file) {
-                    $base = str_replace(".php", "", basename($file));
+                foreach (glob($path . '*Preview.php') as $file) {
+                    $base = str_replace('.php', '', basename($file));
                     $class = App::className($plugin . $base, 'Mailer/Preview');
                     if ($class) {
                         yield ['plugin' => trim($plugin, '.'), 'class' => new $class()];
@@ -266,7 +266,7 @@ protected function findPreview($previewName, $emailName, $plugin = '')
             $plugin = "$plugin.";
         }
 
-        $realClass = App::className($plugin . $previewName, "Mailer/Preview");
+        $realClass = App::className($plugin . $previewName, 'Mailer/Preview');
         if (!$realClass) {
             throw new NotFoundException("Mailer preview ${previewName} not found");
         }
@@ -276,7 +276,7 @@ protected function findPreview($previewName, $emailName, $plugin = '')
         if (!$email) {
             throw new NotFoundException(__d(
                 'debug_kit',
-                "Mailer preview {0}::{1} not found",
+                'Mailer preview {0}::{1} not found',
                 $previewName,
                 $emailName
             ));

src/Panel/RequestPanel.php

@@ -34,7 +34,7 @@ public function shutdown(EventInterface $event)
         $controller = $event->getSubject();
         $request = $controller->getRequest();
         $this->_data = [
-            'params' => $request->getAttribute("params"),
+            'params' => $request->getAttribute('params'),
             'query' => $request->getQueryParams(),
             'data' => $request->getData(),
             'cookie' => $request->getCookieParams(),

src/ToolbarService.php

@@ -145,7 +145,7 @@ protected function isSuspiciouslyProduction()
             Log::warning(
                 "DebugKit is disabling itself as your host `{$host}` " .
                 "is not in the known safe list of top-level-domains ({$safeList}). " .
-                "If you would like to force DebugKit on use the `DebugKit.forceEnable` Configure option."
+                'If you would like to force DebugKit on use the `DebugKit.forceEnable` Configure option.'
             );
 
             return true;

src/View/Helper/CredentialsHelper.php

@@ -58,7 +58,7 @@ public function filter($in)
         $link = $this->Html->tag('a', '******', [
             'class' => 'filtered-credentials',
             'title' => h($credentials),
-            'onclick' => "this.innerHTML = this.title",
+            'onclick' => 'this.innerHTML = this.title',
         ]);
 
         return h($protocol) . $link . '@' . h($tail);

src/View/Helper/SimpleGraphHelper.php

@@ -73,7 +73,7 @@ public function bar($value, $offset, $options = [])
             '<div class="graph-bar" style="%s"><div class="graph-bar-value" style="%s" title="%s"> </div></div>',
             "width: {$width}px",
             "margin-left: {$graphOffset}px; width: {$graphValue}px",
-            __d('debug_kit', "Starting {0}ms into the request, taking {1}ms", $offset, $value)
+            __d('debug_kit', 'Starting {0}ms into the request, taking {1}ms', $offset, $value)
         );
     }
 }