Merge pull request #994 from cakephp/5.x-phpstan-7

5.x phpstan 7

Author: markstory

psalm-baseline.xml

@@ -68,9 +68,6 @@
     <NullArgument>
       <code><![CDATA[$this->emailLog]]></code>
     </NullArgument>
-    <PropertyTypeCoercion>
-      <code>new $className($config)</code>
-    </PropertyTypeCoercion>
   </file>
   <file src="src/Model/Table/LazyTableTrait.php">
     <RiskyTruthyFalsyComparison>

src/Controller/ComposerController.php

@@ -85,7 +85,7 @@ private function executeComposerCommand(ArrayInput $input): BufferedOutput
         putenv('COMPOSER_HOME=' . $bin);
         putenv('COMPOSER_CACHE_DIR=' . CACHE);
 
-        $dir = getcwd();
+        $dir = (string)getcwd();
         chdir(ROOT);
         $timeLimit = ini_get('max_execution_time');
         set_time_limit(300);

src/Controller/MailPreviewController.php

@@ -203,7 +203,9 @@ protected function getMailPreviewClasses(): CollectionInterface
                 }
             })
             ->unfold(function ($path, $plugin) {
-                foreach (glob($path . '*Preview.php') as $file) {
+                /** @var list<string> $files */
+                $files = glob($path . '*Preview.php');
+                foreach ($files as $file) {
                     $base = str_replace('.php', '', basename($file));
                     $class = App::className($plugin . $base, 'Mailer/Preview');
                     if ($class) {
@@ -271,16 +273,17 @@ protected function findPreview(string $previewName, string $emailName, string $p
             $plugin = "$plugin.";
         }
 
+        /** @var \DebugKit\Mailer\MailPreview $realClass */
         $realClass = App::className($plugin . $previewName, 'Mailer/Preview');
         if (!$realClass) {
             throw new NotFoundException("Mailer preview $previewName not found");
         }
         $mailPreview = new $realClass();
 
         $email = $mailPreview->find($emailName);
-        if (!$email) {
+        if ($email === null) {
             throw new NotFoundException(sprintf(
-                'Mailer preview %s::%s not found',
+                'Mailer preview `%s::%s` not found',
                 $previewName,
                 $emailName
             ));

src/DebugInclude.php

@@ -82,7 +82,8 @@ public function __construct()
      */
     public function includePaths(): array
     {
-        $paths = explode(PATH_SEPARATOR, get_include_path());
+        /** @psalm-suppress RedundantCast */
+        $paths = explode(PATH_SEPARATOR, (string)get_include_path());
         $paths = array_filter($paths, function ($path) {
             if ($path === '.' || strlen($path) === 0) {
                 return false;

src/DebugSql.php

@@ -96,6 +96,7 @@ public static function sql(
             if (defined('CAKE_CORE_INCLUDE_PATH')) {
                 array_unshift($search, CAKE_CORE_INCLUDE_PATH);
             }
+            /** @var string $file */
             $file = str_replace($search, '', $file);
         }
 

src/Mailer/Transport/DebugKitTransport.php

@@ -47,6 +47,7 @@ public function __construct(array $config = [], ?AbstractTransport $originalTran
 
         $className = false;
         if (!empty($config['originalClassName'])) {
+            /** @var class-string<\Cake\Mailer\AbstractTransport> $className */
             $className = App::className(
                 $config['originalClassName'],
                 'Mailer/Transport',
@@ -56,6 +57,7 @@ public function __construct(array $config = [], ?AbstractTransport $originalTran
 
         if ($className) {
             unset($config['originalClassName'], $config['debugKitLog']);
+            /** @psalm-suppress UnsafeInstantiation */
             $this->originalTransport = new $className($config);
         }
     }
@@ -91,7 +93,10 @@ public function send(Message $message): array
      */
     public function __call(string $method, array $args): mixed
     {
-        return call_user_func_array([$this->originalTransport, $method], $args);
+        /** @var callable $callable */
+        $callable = [$this->originalTransport, $method];
+
+        return call_user_func_array($callable, $args);
     }
 
     /**

src/Model/Behavior/TimedBehavior.php

@@ -34,7 +34,9 @@ class TimedBehavior extends Behavior
      */
     public function beforeFind(EventInterface $event, SelectQuery $query): SelectQuery
     {
-        $alias = $event->getSubject()->getAlias();
+        /** @var \Cake\Datasource\RepositoryInterface $table */
+        $table = $event->getSubject();
+        $alias = $table->getAlias();
         DebugTimer::start($alias . '_find', $alias . '->find()');
 
         return $query->formatResults(function ($results) use ($alias) {
@@ -52,7 +54,9 @@ public function beforeFind(EventInterface $event, SelectQuery $query): SelectQue
      */
     public function beforeSave(EventInterface $event): void
     {
-        $alias = $event->getSubject()->getAlias();
+        /** @var \Cake\Datasource\RepositoryInterface $table */
+        $table = $event->getSubject();
+        $alias = $table->getAlias();
         DebugTimer::start($alias . '_save', $alias . '->save()');
     }
 
@@ -64,7 +68,9 @@ public function beforeSave(EventInterface $event): void
      */
     public function afterSave(EventInterface $event): void
     {
-        $alias = $event->getSubject()->getAlias();
+        /** @var \Cake\Datasource\RepositoryInterface $table */
+        $table = $event->getSubject();
+        $alias = $table->getAlias();
         DebugTimer::stop($alias . '_save');
     }
 }

src/Model/Entity/Panel.php

@@ -31,7 +31,7 @@ class Panel extends Entity
     /**
      * Some fields should not be in JSON/array exports.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected array $_hidden = ['content'];
 
@@ -47,7 +47,7 @@ class Panel extends Entity
     protected function _getContent(mixed $content): string
     {
         if (is_resource($content)) {
-            return stream_get_contents($content);
+            return (string)stream_get_contents($content);
         }
 
         return $content;

src/Panel/SessionPanel.php

@@ -32,12 +32,12 @@ class SessionPanel extends DebugPanel
      */
     public function shutdown(EventInterface $event): void
     {
-        /** @var \Cake\Http\ServerRequest|null $request */
-        $request = $event->getSubject()->getRequest();
-        if ($request) {
-            $maxDepth = Configure::read('DebugKit.maxDepth', 5);
-            $content = Debugger::exportVarAsNodes($request->getSession()->read(), $maxDepth);
-            $this->_data = compact('content');
-        }
+        /** @var \Cake\Controller\Controller $controller */
+        $controller = $event->getSubject();
+        $request = $controller->getRequest();
+
+        $maxDepth = Configure::read('DebugKit.maxDepth', 5);
+        $content = Debugger::exportVarAsNodes($request->getSession()->read(), $maxDepth);
+        $this->_data = compact('content');
     }
 }

src/Panel/SqlLogPanel.php

@@ -74,7 +74,8 @@ public function initialize(): void
             }
             $logger = new DebugLog($logger, $name, $includeSchemaReflection);
 
-            $connection->getDriver()->setLogger($logger);
+            /** @var \Cake\Database\Driver $driver */
+            $driver->setLogger($logger);
 
             $this->_loggers[] = $logger;
         }