Merge pull request #1073 from cakephp/phpstan

Bump up phpstan to level 8

Author: ADmad

.editorconfig

@@ -11,6 +11,12 @@ indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.neon]
+indent_style = tab
+
+[*.neon.dist]
+indent_style = tab
+
 [*.yml]
 indent_size = 2
 

.phive/phars.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.33" installed="2.1.33" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="2.1.39" installed="2.1.39" location="./tools/phpstan" copy="false"/>
 </phive>

phpstan.neon

@@ -2,12 +2,10 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-    level: 6
-    paths:
-        - src/
-    bootstrapFiles:
-        - tests/bootstrap.php
-    ignoreErrors:
-        - identifier: missingType.iterableValue
-        - identifier: missingType.generics
-        - identifier: method.childReturnType
+	level: 8
+	paths:
+	- src/
+	bootstrapFiles:
+		- tests/bootstrap.php
+	ignoreErrors:
+		- identifier: missingType.iterableValue

src/BakePlugin.php

@@ -26,7 +26,6 @@
 use Cake\Http\BaseApplication;
 use DirectoryIterator;
 use ReflectionClass;
-use ReflectionException;
 
 /**
  * Plugin class for bake
@@ -140,11 +139,11 @@ protected function findInPath(string $namespace, string $path): array
             $class = $namespace . $item->getBasename('.php');
 
             if (!$hasSubfolder) {
-                try {
-                    $reflection = new ReflectionClass($class);
-                } catch (ReflectionException) {
+                if (!class_exists($class)) {
                     continue;
                 }
+
+                $reflection = new ReflectionClass($class);
                 if (!$reflection->isInstantiable() || !$reflection->isSubclassOf(BakeCommand::class)) {
                     continue;
                 }

src/CodeGen/CodeParser.php

@@ -81,7 +81,11 @@ public function parseFile(string $code): ?ParsedFile
     {
         $this->fileText = $code;
         try {
-            $this->traverser->traverse($this->parser->parse($code));
+            $ast = $this->parser->parse($code);
+            if ($ast === null) {
+                return null;
+            }
+            $this->traverser->traverse($ast);
         } catch (Error $e) {
             throw new ParseException($e->getMessage(), null, $e);
         }
@@ -172,7 +176,11 @@ public function enterNode(Node $node)
                     throw new ParseException('Multiple constants per line are not supported, update your file');
                 }
 
-                $name = (string)current($constant->consts)->name;
+                $const = current($constant->consts);
+                if ($const === false) {
+                    continue;
+                }
+                $name = (string)$const->name;
                 $constants[$name] = $this->getNodeCode($constant);
             }
 
@@ -182,7 +190,11 @@ public function enterNode(Node $node)
                     throw new ParseException('Multiple properties per line are not supported, update your file');
                 }
 
-                $name = (string)current($property->props)->name;
+                $prop = current($property->props);
+                if ($prop === false) {
+                    continue;
+                }
+                $name = (string)$prop->name;
                 $properties[$name] = $this->getNodeCode($property);
             }
 

src/CodeGen/ColumnTypeExtractor.php

@@ -73,6 +73,9 @@ public function extract(string $code): array
             // Wrap code in a dummy class if needed for parsing
             $wrappedCode = "<?php\nclass Dummy {\n" . $code . "\n}";
             $ast = $this->parser->parse($wrappedCode);
+            if ($ast === null) {
+                return [];
+            }
 
             $traverser = new NodeTraverser();
             $traverser->addVisitor($this);
@@ -144,8 +147,13 @@ protected function processMethodCall(MethodCall $methodCall): void
             ) {
                 // Extract the column name and type expression
                 if (count($methodCall->args) >= 2) {
-                    $columnArg = $methodCall->args[0]->value;
-                    $typeArg = $methodCall->args[1]->value;
+                    $columnArgNode = $methodCall->args[0];
+                    $typeArgNode = $methodCall->args[1];
+                    if (!$columnArgNode instanceof Node\Arg || !$typeArgNode instanceof Node\Arg) {
+                        return;
+                    }
+                    $columnArg = $columnArgNode->value;
+                    $typeArg = $typeArgNode->value;
 
                     // Get column name
                     $columnName = $this->getStringValue($columnArg);
@@ -199,7 +207,11 @@ protected function getTypeExpression(Node $node): ?string
             if ($className === 'EnumType' || str_ends_with($className, '\\EnumType')) {
                 if ($methodName === 'from' && count($node->args) > 0) {
                     // Extract the enum class name
-                    $arg = $node->args[0]->value;
+                    $argNode = $node->args[0];
+                    if (!$argNode instanceof Node\Arg) {
+                        return null;
+                    }
+                    $arg = $argNode->value;
                     if ($arg instanceof Node\Expr\ClassConstFetch) {
                         if (
                             $arg->class instanceof Node\Name &&

src/Command/BakeCommand.php

@@ -112,6 +112,7 @@ protected function _getName(string $name): string
      */
     protected function getPrefix(Arguments $args): string
     {
+        /** @var string|null $prefix */
         $prefix = $args->getOption('prefix');
         if (!$prefix) {
             return '';
@@ -225,7 +226,12 @@ protected function isValidColumnName(string $name): bool
     protected function parseFile(string $path): ?ParsedFile
     {
         if (file_exists($path)) {
-            return (new CodeParser())->parseFile(file_get_contents($path));
+            $contents = file_get_contents($path);
+            if ($contents === false) {
+                return null;
+            }
+
+            return (new CodeParser())->parseFile($contents);
         }
 
         return null;

src/Command/CommandCommand.php

@@ -69,7 +69,7 @@ public function templateData(Arguments $arguments): array
         $data['command_name'] = Inflector::underscore(str_replace(
             '.',
             ' ',
-            $arguments->getArgument('name'),
+            $arguments->getArgument('name') ?? '',
         ));
 
         return $data;

src/Command/ControllerCommand.php

@@ -84,7 +84,7 @@ public function bake(string $controllerName, Arguments $args, ConsoleIo $io): vo
             $actions = ['index', 'view', 'add', 'edit', 'delete'];
         }
         if ($args->getOption('actions')) {
-            $actions = array_map('trim', explode(',', $args->getOption('actions')));
+            $actions = array_map('trim', explode(',', (string)$args->getOption('actions')));
             $actions = array_filter($actions);
         }
         if (!$args->getOption('actions') && Plugin::isLoaded('Authentication') && $controllerName === 'Users') {
@@ -221,7 +221,7 @@ public function getComponents(Arguments $args): array
     {
         $components = [];
         if ($args->getOption('components')) {
-            $components = explode(',', $args->getOption('components'));
+            $components = explode(',', (string)$args->getOption('components'));
             $components = array_values(array_filter(array_map('trim', $components)));
         } else {
             if (Plugin::isLoaded('Authorization')) {
@@ -242,7 +242,7 @@ public function getHelpers(Arguments $args): array
     {
         $helpers = [];
         if ($args->getOption('helpers')) {
-            $helpers = explode(',', $args->getOption('helpers'));
+            $helpers = explode(',', (string)$args->getOption('helpers'));
             $helpers = array_values(array_filter(array_map('trim', $helpers)));
         }
 

src/Command/FixtureAllCommand.php

@@ -83,7 +83,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
         $this->extractCommonProperties($args);
 
         /** @var \Cake\Database\Connection $connection */
-        $connection = ConnectionManager::get($args->getOption('connection') ?? 'default');
+        $connection = ConnectionManager::get((string)($args->getOption('connection') ?: 'default'));
         $scanner = new TableScanner($connection);
         $fixture = new FixtureCommand();