Fix CS.

dereuromark · dereuromark · commit 93536385697b · 2025-04-20T00:56:24.000+02:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,7 +2,7 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-	level: 6
+	level: 8
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- tests/bootstrap.php
diff --git a/src/Command/BenchmarkCommand.php b/src/Command/BenchmarkCommand.php
@@ -169,7 +169,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOption
     {
         $parser->setDescription(
             'Allows you to obtain some rough benchmarking statistics' .
-            'about a fully qualified URL.'
+            'about a fully qualified URL.',
         )
         ->addArgument('url', [
             'help' => 'The URL to request.',
@@ -187,7 +187,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOption
         ])
         ->setEpilog(
             'Example Use: `cake benchmark --n 10 --t 100 http://localhost/testsite`. ' .
-            '<info>Note:</info> this benchmark does not include browser render times.'
+            '<info>Note:</info> this benchmark does not include browser render times.',
         );
 
         return $parser;
diff --git a/src/Controller/DebugKitController.php b/src/Controller/DebugKitController.php
@@ -49,7 +49,7 @@ public function beforeFilter(EventInterface $event): void
                 Log::info(
                     'Cake Authorization plugin is enabled. If you would like ' .
                     'to force DebugKit to ignore it, set `DebugKit.ignoreAuthorization` ' .
-                    ' Configure option to true.'
+                    ' Configure option to true.',
                 );
             }
         }
diff --git a/src/Controller/MailPreviewController.php b/src/Controller/MailPreviewController.php
@@ -254,8 +254,7 @@ protected function findPreferredPart(AbstractResult $email, ?string $partType):
             }
         }
 
-        /** @psalm-suppress PossiblyNullArgument */
-        return $this->findPart($email, $partType) ?: null;
+        return $this->findPart($email, (string)$partType) ?: null;
     }
 
     /**
@@ -285,7 +284,7 @@ protected function findPreview(string $previewName, string $emailName, string $p
             throw new NotFoundException(sprintf(
                 'Mailer preview `%s::%s` not found',
                 $previewName,
-                $emailName
+                $emailName,
             ));
         }
 
diff --git a/src/DebugSql.php b/src/DebugSql.php
@@ -72,7 +72,7 @@ public static function sql(
         Query $query,
         bool $showValues = true,
         ?bool $showHtml = null,
-        int $stackDepth = 0
+        int $stackDepth = 0,
     ): Query {
         if (!Configure::read('debug')) {
             return $query;
@@ -126,7 +126,7 @@ public static function sql(
                     HtmlHighlighter::HIGHLIGHT_WORD => 'style="color: #9c27b0;"',
                     HtmlHighlighter::HIGHLIGHT_PRE => 'style="color: #222; background-color: transparent;"',
                 ],
-                false
+                false,
             );
         } else {
             $highlighter = new NullHighlighter();
@@ -164,7 +164,7 @@ public static function sqld(
         Query $query,
         bool $showValues = true,
         ?bool $showHtml = null,
-        int $stackDepth = 1
+        int $stackDepth = 1,
     ): void {
         static::sql($query, $showValues, $showHtml, $stackDepth);
         die(1);
@@ -221,6 +221,6 @@ private static function interpolate(string $sql, array $bindings): string
             $keys[] = is_string($key) ? "/$key\b/" : '/[?]/';
         }
 
-        return preg_replace($keys, $params, $sql, $limit);
+        return (string)preg_replace($keys, $params, $sql, $limit);
     }
 }
diff --git a/src/Mailer/Transport/DebugKitTransport.php b/src/Mailer/Transport/DebugKitTransport.php
@@ -51,7 +51,7 @@ public function __construct(array $config = [], ?AbstractTransport $originalTran
             $className = App::className(
                 $config['originalClassName'],
                 'Mailer/Transport',
-                'Transport'
+                'Transport',
             );
         }
 
diff --git a/src/Model/Table/LazyTableTrait.php b/src/Model/Table/LazyTableTrait.php
@@ -79,7 +79,7 @@ public function ensureTables(array $fixtures): void
             if (strpos($e->getMessage(), 'unable to open')) {
                 throw new RuntimeException(
                     'Could not create a SQLite database. ' .
-                    'Ensure that your webserver has write access to the database file and folder it is in.'
+                    'Ensure that your webserver has write access to the database file and folder it is in.',
                 );
             }
             throw $e;
diff --git a/src/Model/Table/RequestsTable.php b/src/Model/Table/RequestsTable.php
@@ -160,7 +160,7 @@ public function gc(): void
                 } catch (PDOException $e) {
                     Log::warning(
                         'Unable to run VACUUM on debug kit SQLite database. ' .
-                            'Please manually remove the database file'
+                            'Please manually remove the database file',
                     );
                     Log::warning((string)$e);
                 }
diff --git a/src/Model/Table/SqlTraceTrait.php b/src/Model/Table/SqlTraceTrait.php
@@ -66,7 +66,7 @@ public function deleteQuery(): DeleteQuery
     protected function fileStamp(
         SelectQuery|UpdateQuery|DeleteQuery $query,
         int $start = 1,
-        bool $debugOnly = true
+        bool $debugOnly = true,
     ): SelectQuery|UpdateQuery|DeleteQuery {
         if (!Configure::read('debug') && $debugOnly === true) {
             return $query;
diff --git a/src/Panel/EnvironmentPanel.php b/src/Panel/EnvironmentPanel.php
@@ -51,7 +51,7 @@ protected function _prepare(): array
         $phpVer = phpversion();
         $return['php'] = array_merge(
             ['PHP_VERSION' => $phpVer],
-            $_SERVER
+            $_SERVER,
         );
         unset($return['php']['argv']);
 
@@ -86,7 +86,7 @@ protected function _prepare(): array
             [
                 'TIME_START', 'SECOND', 'MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'YEAR',
             ],
-            ''
+            '',
         );
         $var = get_defined_constants(true);
         $return['app'] = array_diff_key($var['user'], $return['cake'], $hiddenCakeConstants);
@@ -131,7 +131,7 @@ protected function prepareIncludedFiles(): array
                 $return['plugins'][$pluginName][$this->_debug->getFileType($file)][] = $this->_debug->niceFileName(
                     $file,
                     'plugin',
-                    $pluginName
+                    $pluginName,
                 );
             } elseif ($this->_debug->isAppFile($file)) {
                 $return['app'][$this->_debug->getFileType($file)][] = $this->_debug->niceFileName($file, 'app');
diff --git a/src/Panel/IncludePanel.php b/src/Panel/IncludePanel.php
@@ -41,7 +41,7 @@ public function __construct()
         $this->_debug = new DebugInclude();
         deprecationWarning(
             '5.1.0',
-            'Include panel is deprecated. Remove it from your panel configuration, and use Environment Panel instead.'
+            'Include panel is deprecated. Remove it from your panel configuration, and use Environment Panel instead.',
         );
     }
 
@@ -62,7 +62,7 @@ protected function _prepare(): array
                 $return['plugins'][$pluginName][$this->_debug->getFileType($file)][] = $this->_debug->niceFileName(
                     $file,
                     'plugin',
-                    $pluginName
+                    $pluginName,
                 );
             } elseif ($this->_debug->isAppFile($file)) {
                 $return['app'][$this->_debug->getFileType($file)][] = $this->_debug->niceFileName($file, 'app');
diff --git a/src/Panel/SessionPanel.php b/src/Panel/SessionPanel.php
@@ -35,7 +35,7 @@ public function shutdown(EventInterface $event): void
     {
         deprecationWarning(
             '5.1.0',
-            'SessionPanel is deprecated. Remove it from your panel list, and use Request panel instead.'
+            'SessionPanel is deprecated. Remove it from your panel list, and use Request panel instead.',
         );
         /** @var \Cake\Controller\Controller $controller */
         $controller = $event->getSubject();
diff --git a/src/Panel/VariablesPanel.php b/src/Panel/VariablesPanel.php
@@ -65,14 +65,15 @@ protected function _getErrors(EntityInterface $entity): array
     protected function _walkDebugInfo(callable $walker, object $item): array|string
     {
         try {
+            /** @phpstan-ignore method.notFound */
             $info = $item->__debugInfo();
         } catch (Exception $exception) {
             return sprintf(
                 'Could not retrieve debug info - %s. Error: %s in %s, line %d',
                 get_class($item),
                 $exception->getMessage(),
                 $exception->getFile(),
-                $exception->getLine()
+                $exception->getLine(),
             );
         }
 
diff --git a/src/ToolbarService.php b/src/ToolbarService.php
@@ -178,7 +178,7 @@ protected function isSuspiciouslyProduction(): bool
             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.',
             );
         }
 
@@ -278,7 +278,7 @@ public function saveData(ServerRequest $request, ResponseInterface $response): R
         } catch (MissingDatasourceConfigException $e) {
             Log::warning(
                 'Unable to save request. Check your debug_kit datasource connection ' .
-                'or ensure that PDO SQLite extension is enabled.'
+                'or ensure that PDO SQLite extension is enabled.',
             );
             Log::warning($e->getMessage());
 
@@ -379,7 +379,7 @@ public function injectScripts(Request $row, ResponseInterface $response): Respon
             $row->id,
             $url,
             Router::url($this->getToolbarUrl()),
-            $nonce
+            $nonce,
         );
         $contents = substr($contents, 0, $pos) . $script . substr($contents, $pos);
         $body->rewind();
diff --git a/src/View/Helper/SimpleGraphHelper.php b/src/View/Helper/SimpleGraphHelper.php
@@ -73,7 +73,7 @@ public function bar(float|int $value, float|int $offset, array $options = []): s
             '<div class="c-graph-bar" style="%s"><div class="c-graph-bar__value" style="%s" title="%s"> </div></div>',
             "width: {$width}px",
             "margin-left: {$graphOffset}px; width: {$graphValue}px",
-            "Starting {$offset}ms into the request, taking {$value}ms"
+            "Starting {$offset}ms into the request, taking {$value}ms",
         );
     }
 }
diff --git a/tests/TestCase/DebugIncludeTest.php b/tests/TestCase/DebugIncludeTest.php
@@ -74,27 +74,27 @@ public function testNiceFileName()
 
         $this->assertSame(
             'CAKE/Controller/Controller.php',
-            $include->niceFileName(CAKE . 'Controller/Controller.php', 'cake')
+            $include->niceFileName(CAKE . 'Controller/Controller.php', 'cake'),
         );
 
         $this->assertSame(
             'APP/Application.php',
-            $include->niceFileName(APP . 'Application.php', 'app')
+            $include->niceFileName(APP . 'Application.php', 'app'),
         );
 
         $this->assertSame(
             'ROOT/tests/bootstrap.php',
-            $include->niceFileName(ROOT . '/tests/bootstrap.php', 'root')
+            $include->niceFileName(ROOT . '/tests/bootstrap.php', 'root'),
         );
 
         $this->assertSame(
             'DebugKit/tests/bootstrap.php',
-            $include->niceFileName(ROOT . '/tests/bootstrap.php', 'plugin', 'DebugKit')
+            $include->niceFileName(ROOT . '/tests/bootstrap.php', 'plugin', 'DebugKit'),
         );
 
         $this->assertSame(
             'src/Controller/Controller.php',
-            $include->niceFileName(CAKE . 'Controller/Controller.php', 'vendor', 'cakephp/cakephp')
+            $include->niceFileName(CAKE . 'Controller/Controller.php', 'vendor', 'cakephp/cakephp'),
         );
     }
 
diff --git a/tests/TestCase/Mailer/Transport/DebugKitTransportTest.php b/tests/TestCase/Mailer/Transport/DebugKitTransportTest.php
@@ -46,7 +46,7 @@ public function customMethod(): string
         };
         $this->transport = new DebugKitTransport(
             ['debugKitLog' => $this->log],
-            $this->wrapped
+            $this->wrapped,
         );
     }
 
diff --git a/tests/TestCase/ToolbarServiceTest.php b/tests/TestCase/ToolbarServiceTest.php
@@ -261,7 +261,7 @@ public function testSaveData()
         $this->assertSame('DebugKit.timer_panel', $result->panels[11]->element);
         $this->assertMatchesRegularExpression(
             '/\d+\.\d+\s[ms]+\s+\/\s+\d+\.?\d+\s+[mbMB]+/',
-            $result->panels[11]->summary
+            $result->panels[11]->summary,
         );
         $this->assertSame('Timer', $result->panels[11]->title);
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function beforeFilter(EventInterface $event): void`
`49`	`49`	`Log::info(`
`50`	`50`	`'Cake Authorization plugin is enabled. If you would like ' .`
`51`	`51`	'to force DebugKit to ignore it, set `DebugKit.ignoreAuthorization` ' .
`52`		`- ' Configure option to true.'`
	`52`	`+ ' Configure option to true.',`
`53`	`53`	`);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,7 @@ protected function findPreferredPart(AbstractResult $email, ?string $partType):`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`- /** @psalm-suppress PossiblyNullArgument */`
`258`		`- return $this->findPart($email, $partType) ?: null;`
	`257`	`+ return $this->findPart($email, (string)$partType) ?: null;`
`259`	`258`	`}`
`260`	`259`
`261`	`260`	`/**`
`@@ -285,7 +284,7 @@ protected function findPreview(string $previewName, string $emailName, string $p`
`285`	`284`	`throw new NotFoundException(sprintf(`
`286`	`285`	'Mailer preview `%s::%s` not found',
`287`	`286`	`$previewName,`
`288`		`- $emailName`
	`287`	`+ $emailName,`
`289`	`288`	`));`
`290`	`289`	`}`
`291`	`290`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(array $config = [], ?AbstractTransport $originalTran`
`51`	`51`	`$className = App::className(`
`52`	`52`	`$config['originalClassName'],`
`53`	`53`	`'Mailer/Transport',`
`54`		`- 'Transport'`
	`54`	`+ 'Transport',`
`55`	`55`	`);`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function ensureTables(array $fixtures): void`
`79`	`79`	`if (strpos($e->getMessage(), 'unable to open')) {`
`80`	`80`	`throw new RuntimeException(`
`81`	`81`	`'Could not create a SQLite database. ' .`
`82`		`- 'Ensure that your webserver has write access to the database file and folder it is in.'`
	`82`	`+ 'Ensure that your webserver has write access to the database file and folder it is in.',`
`83`	`83`	`);`
`84`	`84`	`}`
`85`	`85`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function gc(): void`
`160`	`160`	`} catch (PDOException $e) {`
`161`	`161`	`Log::warning(`
`162`	`162`	`'Unable to run VACUUM on debug kit SQLite database. ' .`
`163`		`- 'Please manually remove the database file'`
	`163`	`+ 'Please manually remove the database file',`
`164`	`164`	`);`
`165`	`165`	`Log::warning((string)$e);`
`166`	`166`	`}`