Merge pull request #1097 from cakephp/3.next

3.next

Author: ADmad

composer.json

@@ -22,16 +22,16 @@
         "source": "https://github.com/cakephp/bake"
     },
     "require": {
-        "php": ">=8.1",
-        "brick/varexporter": "^0.6.0 || ^0.7.0",
-        "cakephp/cakephp": "^5.1",
-        "cakephp/twig-view": "^2.0.2",
+        "php": ">=8.2",
+        "brick/varexporter": "^0.7.0",
+        "cakephp/cakephp": "^5.4",
+        "cakephp/twig-view": "^2.1",
         "nikic/php-parser": "^5.0.0"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^5.0.0",
         "cakephp/debug_kit": "^5.0.0",
-        "phpunit/phpunit": "^10.5.40 || ^11.5.20 || ^12.2.4 || ^13.0"
+        "phpunit/phpunit": "^11.5.20 || ^12.2.4 || ^13.0"
     },
     "autoload": {
         "psr-4": {

phpstan-baseline.neon

@@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Method Bake\\BakePlugin\:\:bootstrap\(\) has parameter \$app with generic interface Cake\\Core\\PluginApplicationInterface but does not specify its types\: TSubject$#'
-			identifier: missingType.generics
-			count: 1
-			path: src/BakePlugin.php
-
 		-
 			message: '#^Instanceof between mixed and Cake\\Chronos\\Chronos will always evaluate to false\.$#'
 			identifier: instanceof.alwaysFalse

src/BakePlugin.php

@@ -109,8 +109,7 @@ protected function discoverCommands(CommandCollection $commands): CommandCollect
      *
      * @param string $namespace The namespace classes are expected to be in.
      * @param string $path The path to look in.
-     * @return array<string>
-     * @phpstan-return array<string, class-string<\Bake\Command\BakeCommand>>
+     * @return array<string, class-string<\Bake\Command\BakeCommand>>
      */
     protected function findInPath(string $namespace, string $path): array
     {

src/Command/CellCommand.php

@@ -59,8 +59,7 @@ public function template(): string
      * Get template data.
      *
      * @param \Cake\Console\Arguments $arguments Arguments object.
-     * @return array
-     * @phpstan-return array<string, mixed>
+     * @return array<string, mixed>
      */
     public function templateData(Arguments $arguments): array
     {

src/Command/CommandCommand.php

@@ -57,8 +57,7 @@ public function template(): string
      * Get template data.
      *
      * @param \Cake\Console\Arguments $arguments Arguments object.
-     * @return array
-     * @phpstan-return array<string, mixed>
+     * @return array<string, mixed>
      */
     public function templateData(Arguments $arguments): array
     {

src/Command/ControllerAllCommand.php

@@ -40,17 +40,6 @@ public static function defaultName(): string
         return 'bake controller all';
     }
 
-    /**
-     * initialize
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        parent::initialize();
-        $this->controllerCommand = new ControllerCommand();
-    }
-
     /**
      * Execute the command.
      *
@@ -82,6 +71,11 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
      */
     protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionParser
     {
+        // Assigned here (not initialize()) because on CakePHP 5.4+ the parser is built
+        // before initialize() runs, while older versions build it after. ??= keeps it
+        // safe under either ordering and idempotent across repeated calls.
+        $this->controllerCommand ??= new ControllerCommand();
+
         $parser = $this->controllerCommand->buildOptionParser($parser);
         $parser
             ->setDescription('Bake all controller files with tests.')

src/Command/EnumCommand.php

@@ -61,8 +61,7 @@ public function template(): string
      * Get template data.
      *
      * @param \Cake\Console\Arguments $arguments The arguments for the command
-     * @return array
-     * @phpstan-return array<string, mixed>
+     * @return array<string, mixed>
      */
     public function templateData(Arguments $arguments): array
     {

src/Command/ModelAllCommand.php

@@ -40,17 +40,6 @@ public static function defaultName(): string
         return 'bake model all';
     }
 
-    /**
-     * initialize
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        parent::initialize();
-        $this->modelCommand = new ModelCommand();
-    }
-
     /**
      * Gets the option parser instance and configures it.
      *
@@ -59,6 +48,11 @@ public function initialize(): void
      */
     protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionParser
     {
+        // Assigned here (not initialize()) because on CakePHP 5.4+ the parser is built
+        // before initialize() runs, while older versions build it after. ??= keeps it
+        // safe under either ordering and idempotent across repeated calls.
+        $this->modelCommand ??= new ModelCommand();
+
         $parser = $this->modelCommand->buildOptionParser($parser);
         $parser
             ->setDescription('Bake all model files with associations and validation.')

src/Command/SimpleBakeCommand.php

@@ -53,8 +53,7 @@ abstract public function template(): string;
      * Get template data.
      *
      * @param \Cake\Console\Arguments $arguments The arguments for the command
-     * @return array
-     * @phpstan-return array<string, mixed>
+     * @return array<string, mixed>
      */
     public function templateData(Arguments $arguments): array
     {

src/Command/TemplateAllCommand.php

@@ -37,17 +37,6 @@ public static function defaultName(): string
         return 'bake template all';
     }
 
-    /**
-     * initialize
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        parent::initialize();
-        $this->templateCommand = new TemplateCommand();
-    }
-
     /**
      * Execute the command.
      *
@@ -85,6 +74,11 @@ public function execute(Arguments $args, ConsoleIo $io): int
      */
     protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionParser
     {
+        // Assigned here (not initialize()) because on CakePHP 5.4+ the parser is built
+        // before initialize() runs, while older versions build it after. buildOptionParser()
+        // always runs before execute(), so this guarantees the subcommand is available there.
+        $this->templateCommand ??= new TemplateCommand();
+
         $parser = $this->_setCommonOptions($parser);
         $parser
             ->setDescription('Bake all view template files.')