Merge pull request #988 from cakephp/5.x-stan-update

5.x: stan update
cakephp · Jan 21, 2024 · cdb3138 · cdb3138
2 parents 9975b66 + a42d3ed
commit cdb3138
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 6 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.22" installed="1.10.22" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.13.1" installed="5.13.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="1.10.56" installed="1.10.56" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.20.0" installed="5.20.0" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
+  <file src="src/Cache/Engine/DebugEngine.php">
+    <RiskyTruthyFalsyComparison>
+      <code>$key</code>
+    </RiskyTruthyFalsyComparison>
+  </file>
+  <file src="src/Controller/MailPreviewController.php">
+    <RiskyTruthyFalsyComparison>
+      <code><![CDATA[$this->findPart($email, $partType)]]></code>
+    </RiskyTruthyFalsyComparison>
+  </file>
   <file src="src/Database/Log/DebugLog.php">
     <InternalMethod>
       <code>jsonSerialize</code>
@@ -11,32 +21,79 @@
       <code><![CDATA[$this->_pluginPaths]]></code>
     </PossiblyNullArrayOffset>
   </file>
+  <file src="src/DebugMemory.php">
+    <RiskyTruthyFalsyComparison>
+      <code>!$message</code>
+    </RiskyTruthyFalsyComparison>
+  </file>
   <file src="src/DebugSql.php">
     <InternalMethod>
       <code>bindings</code>
     </InternalMethod>
+    <RiskyTruthyFalsyComparison>
+      <code>$file</code>
+      <code>$file</code>
+      <code>$file</code>
+      <code>$line</code>
+      <code>$line</code>
+    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/DebugTimer.php">
     <PossiblyNullArrayOffset>
       <code>self::$_timers</code>
     </PossiblyNullArrayOffset>
+    <RiskyTruthyFalsyComparison>
+      <code>!$message</code>
+      <code>!$name</code>
+      <code>!$name</code>
+    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Mailer/MailPreview.php">
     <PossiblyFalseOperand>
       <code>$pos</code>
     </PossiblyFalseOperand>
   </file>
+  <file src="src/Mailer/PreviewResult.php">
+    <RiskyTruthyFalsyComparison>
+      <code><![CDATA[!$mailer->viewBuilder()->getTemplate()]]></code>
+    </RiskyTruthyFalsyComparison>
+  </file>
   <file src="src/Mailer/Transport/DebugKitTransport.php">
     <InvalidReturnStatement>
       <code>$result</code>
     </InvalidReturnStatement>
     <MoreSpecificReturnType>
       <code>array</code>
     </MoreSpecificReturnType>
+    <NullArgument>
+      <code><![CDATA[$this->emailLog]]></code>
+    </NullArgument>
     <PropertyTypeCoercion>
       <code>new $className($config)</code>
     </PropertyTypeCoercion>
   </file>
+  <file src="src/Model/Table/LazyTableTrait.php">
+    <RiskyTruthyFalsyComparison>
+      <code><![CDATA[strpos($e->getMessage(), 'unable to open')]]></code>
+    </RiskyTruthyFalsyComparison>
+  </file>
+  <file src="src/Panel/DeprecationsPanel.php">
+    <RiskyTruthyFalsyComparison>
+      <code>$pluginName</code>
+      <code>$vendorName</code>
+    </RiskyTruthyFalsyComparison>
+  </file>
+  <file src="src/Panel/IncludePanel.php">
+    <RiskyTruthyFalsyComparison>
+      <code>$pluginName</code>
+      <code>$vendorName</code>
+    </RiskyTruthyFalsyComparison>
+  </file>
+  <file src="src/Panel/LogPanel.php">
+    <RiskyTruthyFalsyComparison>
+      <code><![CDATA[Log::getConfig('debug_kit_log_panel')]]></code>
+    </RiskyTruthyFalsyComparison>
+  </file>
   <file src="src/Panel/PanelRegistry.php">
     <LessSpecificImplementedReturnType>
       <code>string|null</code>
@@ -50,6 +107,12 @@
       <code>genericInstances</code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="src/ToolbarService.php">
+    <RiskyTruthyFalsyComparison>
+      <code><![CDATA[!$GLOBALS['FORCE_DEBUGKIT_TOOLBAR']]]></code>
+      <code>$enabled</code>
+    </RiskyTruthyFalsyComparison>
+  </file>
   <file src="src/View/Helper/ToolbarHelper.php">
     <InternalClass>
       <code>new HtmlFormatter()</code>

diff --git a/src/Controller/PanelsController.php b/src/Controller/PanelsController.php
@@ -31,7 +31,7 @@ class PanelsController extends DebugKitController
      */
     public function viewClasses(): array
     {
-        return ['json' => JsonView::class];
+        return [JsonView::class];
     }
 
     /**

diff --git a/src/DebugInclude.php b/src/DebugInclude.php
@@ -66,8 +66,10 @@ public function __construct()
             $packages = array_merge($lockContent['packages'], $lockContent['packages-dev']);
 
             foreach ($packages as $package) {
-                $this->_composerPaths[$package['name']] = $vendorDir
-                    . str_replace('/', DIRECTORY_SEPARATOR, $package['name'])
+                /** @var string $name */
+                $name = $package['name'];
+                $this->_composerPaths[$name] = $vendorDir
+                    . str_replace('/', DIRECTORY_SEPARATOR, $name)
                     . DIRECTORY_SEPARATOR;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ class PanelsController extends DebugKitController @@
          */
         public function viewClasses(): array
         {
-            return ['json' => JsonView::class];
+            return [JsonView::class];
         }
         /**
@@ Expand Down @@