Check the quality of generated PHP code

README.md

@@ -37,3 +37,14 @@ without having to manually edit each one:
 ```bash
 UPDATE_TEST_COMPARISON_FILES=1 vendor/bin/phpunit
 ```
+
+Generated PHP registered by command tests is checked with `php -l` before cleanup.
+A dedicated integration test also bakes classes, a complete CRUD stack, and plugin
+skeletons and checks them against the CakePHP coding standard and the project's
+Rector rules. PHPCS uses the generated files' intended application paths so
+test-fixture exclusions cannot hide violations. Rector runs in dry-run mode and
+fails if it proposes changes; generated files are never rewritten by the checks:
+
+```bash
+vendor/bin/phpunit tests/TestCase/GeneratedCodeTest.php
+```

composer.json

@@ -31,7 +31,8 @@
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^6.0",
         "cakephp/debug_kit": "^6.0",
-        "phpunit/phpunit": "^13.0"
+        "phpunit/phpunit": "^13.0",
+        "rector/rector": "~2.7.0"
     },
     "autoload": {
         "psr-4": {

src/Command/TestCommand.php

@@ -752,7 +752,9 @@ public function generateUses(string $type, string $fullClassName): array
         if ($type === 'Behavior') {
             $uses[] = 'Cake\ORM\Table';
         }
-        $uses[] = $fullClassName;
+        if (!in_array($type, ['Controller', 'Command'], true)) {
+            $uses[] = $fullClassName;
+        }
 
         return $uses;
     }

templates/bake/Controller/component.twig

@@ -17,7 +17,6 @@
     namespace: "#{namespace}\\Controller\\Component",
     classImports: [
         'Cake\\Controller\\Component',
-        'Cake\\Controller\\ComponentRegistry',
     ],
 }) }}
 

templates/bake/Controller/controller.twig

@@ -17,9 +17,13 @@
  * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
+{% set classImports = ((plugin or prefix) ? ["#{baseNamespace}\\Controller\\AppController"] : [])|merge(routingImports) %}
+{% if 'delete' in actions %}
+    {%~ set classImports = classImports|merge(['Cake\\Http\\Response']) %}
+{% endif %}
 {{ element('Bake.file_header', {
     namespace: "#{namespace}\\Controller#{prefix}",
-    classImports: ((plugin or prefix) ? ["#{baseNamespace}\\Controller\\AppController"] : [])|merge(routingImports),
+    classImports: classImports,
 }) }}
 {% set has_login = 'login' in actions and Bake.hasPlugin('Authentication') %}
 {% set include_initialize = components or helpers or has_login %}

templates/bake/Model/behavior.twig

@@ -17,7 +17,6 @@
     namespace: "#{namespace}\\Model\\Behavior",
     classImports: [
         'Cake\\ORM\\Behavior',
-        'Cake\\ORM\\Table',
     ],
 }) }}
 

templates/bake/Model/table.twig

@@ -15,9 +15,16 @@
 #}
 {% set annotations = DocBlock.buildTableAnnotations(associations, associationInfo, behaviors, entity, namespace) %}
 {% set generatedFunctions = ['initialize'] %}
+{% set classImports = ['Cake\\ORM\\Table'] %}
+{% if validation %}
+    {%~ set classImports = classImports|merge(['Cake\\Validation\\Validator']) %}
+{% endif %}
+{% if rulesChecker %}
+    {%~ set classImports = classImports|merge(['Cake\\ORM\\RulesChecker']) %}
+{% endif %}
 {{ element('Bake.file_header', {
     namespace: fileBuilder.namespace,
-    classImports: fileBuilder.classImports(['Cake\\ORM\\Query\\SelectQuery', 'Cake\\ORM\\RulesChecker', 'Cake\\ORM\\Table', 'Cake\\Validation\\Validator']),
+    classImports: fileBuilder.classImports(classImports),
 }) }}
 
 {{ DocBlock.classDescription(name, 'Model', annotations)|raw }}

templates/bake/Plugin/src/Plugin.php.twig

@@ -59,13 +59,13 @@ class {{ name }}Plugin extends BasePlugin
         $routes->plugin(
             '{{ plugin }}',
             ['path' => '/{{ routePath }}'],
-            function (RouteBuilder $builder) {
+            function (RouteBuilder $builder): void {
                 // Add custom routes here
 {% if not attributeRouting %}
 
                 $builder->fallbacks();
 {% endif %}
-            }
+            },
         );
         parent::routes($routes);
     }

templates/bake/Plugin/tests/bootstrap.php.twig

@@ -68,4 +68,4 @@ if (file_exists($root . '/config/bootstrap.php')) {
 use Cake\TestSuite\Fixture\SchemaLoader;
 
 // Load a schema dump file.
-(new SchemaLoader())->loadSqlFiles('tests/schema.sql', 'test');
+new SchemaLoader()->loadSqlFiles('tests/schema.sql', 'test');

templates/bake/View/cell.twig

@@ -47,7 +47,7 @@ class {{ name }}Cell extends Cell
      *
      * @return void
      */
-    public function display()
+    public function display(): void
     {
     }
 }

templates/bake/View/helper.twig

@@ -17,7 +17,6 @@
     namespace: "#{namespace}\\View\\Helper",
     classImports: [
         'Cake\\View\\Helper',
-        'Cake\\View\\View',
     ],
 }) }}
 

templates/bake/element/Controller/delete.twig

@@ -16,14 +16,14 @@
     /**
      * Delete method
      *
-     * @param string|null $id {{ singularHumanName }} id.
+     * @param string|int $id {{ singularHumanName }} id.
      * @return \Cake\Http\Response|null Redirects to index.
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
      */
 {% if attributeRouting %}
     #[Route('/delete/{id}')]
 {% endif %}
-    public function delete($id = null)
+    public function delete(int|string $id): ?Response
     {
         $this->request->allowMethod(['post', 'delete']);
         ${{ singularName }} = $this->{{ currentModelName }}->get($id);

templates/bake/element/Controller/edit.twig

@@ -19,14 +19,14 @@
     /**
      * Edit method
      *
-     * @param string|null $id {{ singularHumanName }} id.
+     * @param string|int $id {{ singularHumanName }} id.
      * @return \Cake\Http\Response|null|void Redirects on successful edit, renders view otherwise.
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
      */
 {% if attributeRouting %}
     #[Route('/edit/{id}')]
 {% endif %}
-    public function edit($id = null)
+    public function edit(int|string $id)
     {
         ${{ singularName }} = $this->{{ currentModelName }}->get($id, contain: {{ Bake.exportArray(belongsToMany)|raw }});
 {% if Bake.hasPlugin('Authorization') %}

templates/bake/element/Controller/view.twig

@@ -20,14 +20,14 @@
     /**
      * View method
      *
-     * @param string|null $id {{ singularHumanName }} id.
+     * @param string|int $id {{ singularHumanName }} id.
      * @return \Cake\Http\Response|null|void Renders view
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
      */
 {% if attributeRouting %}
     #[Route('/view/{id}')]
 {% endif %}
-    public function view($id = null)
+    public function view(int|string $id)
     {
         ${{ singularName }} = $this->{{ currentModelName }}->get($id, contain: {{ Bake.exportArray(allAssociations)|raw }});
 {% if Bake.hasPlugin('Authorization') %}

tests/TestCase/Command/AllCommandTest.php

@@ -200,7 +200,7 @@ public function testExecuteWithPrefix(): void
             $path . 'Controller/Admin/ProductsController.php',
         );
         $this->assertFileContains(
-            'use Bake\Test\App\Controller\Admin\ProductsController;',
+            '@link \Bake\Test\App\Controller\Admin\ProductsController',
             $testsPath . 'TestCase/Controller/Admin/ProductsControllerTest.php',
         );
         $this->assertOutputContains('Bake All complete');

tests/TestCase/Command/TestCommandTest.php

@@ -610,10 +610,10 @@ public function testGenerateUses(): void
         $this->assertEquals($expected, $result);
 
         $result = $command->generateUses('Controller', 'App\Controller\PostsController');
-        $expected = [
-            'App\Controller\PostsController',
-        ];
-        $this->assertEquals($expected, $result);
+        $this->assertSame([], $result);
+
+        $result = $command->generateUses('Command', 'App\Command\ExampleCommand');
+        $this->assertSame([], $result);
 
         $result = $command->generateUses('Helper', 'App\View\Helper\FormHelper');
         $expected = [