Merge branch '3.x' into 3.next

Author: LordSimal

.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
 

.gitignore

@@ -4,10 +4,11 @@
 vendor/
 /.idea/
 /.phpunit.cache
+/.phpunit.result.cache
+.phpcs.cache
 tests/test_app/App/Model/Table/CommentsTable.php
 tests/test_app/App/Controller/ProductVersionsController.php
 tests/test_app/App/Controller/ProductsController.php
 tests/test_app/Plugin/TestBake/
 tests/test_app/tests/
 clover.xml
-/.phpunit.result.cache

.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>

composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "php": ">=8.1",
-        "brick/varexporter": "^0.6.0",
+        "brick/varexporter": "^0.6.0 || ^0.7.0",
         "cakephp/cakephp": "^5.1",
         "cakephp/twig-view": "^2.0.2",
         "nikic/php-parser": "^5.0.0"
@@ -40,10 +40,17 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Authentication\\": "tests/test_app/Plugin/Authentication/src/",
+            "Authorization\\": "tests/test_app/Plugin/Authorization/src/",
             "BakeTest\\": "tests/test_app/Plugin/BakeTest/src/",
             "Bake\\Test\\": "tests/",
             "Bake\\Test\\App\\": "tests/test_app/App/",
             "Company\\Pastry\\": "tests/test_app/Plugin/Company/Pastry/src/",
+            "FixtureTest\\": "tests/test_app/App/Plugin/FixtureTest/src/",
+            "TestBake\\": "tests/test_app/Plugin/TestBake/src/",
+            "TestBakeTheme\\": "tests/test_app/Plugin/TestBakeTheme/src/",
+            "TestTemplate\\": "tests/test_app/App/Plugin/TestTemplate/src/",
+            "TestTest\\": "tests/test_app/App/Plugin/TestTest/src/",
             "WithBakeSubFolder\\": "tests/test_app/Plugin/WithBakeSubFolder/src/"
         }
     },
@@ -58,8 +65,8 @@
             "@test",
             "@cs-check"
         ],
-        "cs-check": "phpcs --parallel=16 -p src/ tests/",
-        "cs-fix": "phpcbf --parallel=16 -p src/ tests/",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "phpstan": "tools/phpstan analyse",
         "stan": "@phpstan",
         "stan-baseline": "tools/phpstan --generate-baseline",

docs/en/usage.rst

@@ -64,6 +64,55 @@ For non-conventional relations, you can use references in the constraints / fore
     ->addForeignKey('shipping_country_id', 'countries', 'cid')
 
 
+Bake Enums
+==========
+
+You can use bake to generate `backed enums <https://www.php.net/manual/en/language.enumerations.backed.php>`_
+for use in your models. Enums are placed in **src/Model/Enum/** and implement
+``EnumLabelInterface`` which provides a ``label()`` method for human-readable display.
+
+To bake a string-backed enum::
+
+    bin/cake bake enum ArticleStatus draft,published,archived
+
+This generates **src/Model/Enum/ArticleStatus.php**::
+
+    namespace App\Model\Enum;
+
+    use Cake\Database\Type\EnumLabelInterface;
+    use Cake\Utility\Inflector;
+
+    enum ArticleStatus: string implements EnumLabelInterface
+    {
+        case Draft = 'draft';
+        case Published = 'published';
+        case Archived = 'archived';
+
+        public function label(): string
+        {
+            return Inflector::humanize(Inflector::underscore($this->name));
+        }
+    }
+
+For int-backed enums, use the ``-i`` option and provide values with colons::
+
+    bin/cake bake enum Priority low:1,medium:2,high:3 -i
+
+This generates an int-backed enum::
+
+    enum Priority: int implements EnumLabelInterface
+    {
+        case Low = 1;
+        case Medium = 2;
+        case High = 3;
+
+        // ...
+    }
+
+You can also bake enums into plugins::
+
+    bin/cake bake enum MyPlugin.OrderStatus pending,processing,shipped
+
 Bake Themes
 ===========
 

phpcs.xml

@@ -6,6 +6,10 @@
     <file>tests/</file>
 
     <rule ref="CakePHP" />
+    <arg value="nps"/>
+    <arg name="colors"/>
+    <arg name="parallel" value="4"/>
+    <arg name="cache" value=".phpcs.cache"/>
 
     <exclude-pattern>*/comparisons/*</exclude-pattern>
     <exclude-pattern>tests/test_app/*</exclude-pattern>

phpstan.neon

@@ -2,10 +2,10 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-    level: 6
-    paths:
-        - src/
-    bootstrapFiles:
-        - tests/bootstrap.php
-    ignoreErrors:
-        - identifier: missingType.iterableValue
+	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 &&