Merge branch '3.x' into 3.next

Author: dereuromark

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@v10
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open for 120 days with no activity. Remove the `stale` label or comment or this will be closed in 15 days'

phpcs.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <ruleset name="CakePHP Bake">
-    <config name="installed_paths" value="../../cakephp/cakephp-codesniffer" />
     <arg value="ns"/>
 
     <file>src/</file>

src/Command/PluginCommand.php

@@ -125,7 +125,9 @@ public function bake(string $plugin, Arguments $args, ConsoleIo $io): ?bool
         $this->_generateFiles($plugin, $this->path, $args, $io);
 
         if (!$this->isVendor) {
-            $this->_modifyApplication($plugin, $io);
+            if (!$args->getOption('class-only')) {
+                $this->_modifyApplication($plugin, $io);
+            }
 
             $composer = $this->findComposer($args, $io);
 
@@ -247,6 +249,12 @@ protected function _generateFiles(
                     }
                 }
 
+                if ($args->getOption('class-only')) {
+                    $files = array_filter($files, function ($file) {
+                        return $file->getFilename() === 'Plugin.php.twig';
+                    });
+                }
+
                 $templates = array_keys($files);
             }
         } while (!$templates);
@@ -370,6 +378,10 @@ public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionPar
         ->addOption('standalone-path', [
             'short' => 'p',
             'help' => 'Generate a standalone plugin in the provided path.',
+        ])->addOption('class-only', [
+            'short' => 'c',
+            'boolean' => true,
+            'help' => 'Generate only the plugin class.',
         ]);
 
         return $parser;

src/Command/TestCommand.php

@@ -242,8 +242,13 @@ public function bake(string $type, string $className, Arguments $args, ConsoleIo
         $prefix = $this->getPrefix($args);
         $fullClassName = $this->getRealClassName($type, $className, $prefix);
 
+        // Check if fixture factories plugin is available
+        $hasFixtureFactories = $this->hasFixtureFactories();
+
         if (!$args->getOption('no-fixture')) {
-            if ($args->getOption('fixtures')) {
+            if ($hasFixtureFactories) {
+                $io->info('Fixture Factories plugin detected - skipping fixture property generation.');
+            } elseif ($args->getOption('fixtures')) {
                 $fixtures = array_map('trim', explode(',', $args->getOption('fixtures')));
                 $this->_fixtures = array_filter($fixtures);
             } elseif ($this->typeCanDetectFixtures($type) && class_exists($fullClassName)) {
@@ -277,6 +282,7 @@ public function bake(string $type, string $className, Arguments $args, ConsoleIo
         $contents = $this->createTemplateRenderer()
             ->set('fixtures', $this->_fixtures)
             ->set('plugin', $this->plugin)
+            ->set('hasFixtureFactories', $hasFixtureFactories)
             ->set(compact(
                 'subject',
                 'className',
@@ -305,6 +311,17 @@ public function bake(string $type, string $className, Arguments $args, ConsoleIo
         return false;
     }
 
+    /**
+     * Check if the CakePHP Fixture Factories plugin is available
+     *
+     * @return bool
+     */
+    protected function hasFixtureFactories(): bool
+    {
+        return class_exists('CakephpFixtureFactories\Plugin')
+            || class_exists('CakephpFixtureFactories\CakephpFixtureFactoriesPlugin');
+    }
+
     /**
      * Checks whether the chosen type can find its own fixtures.
      * Currently only model, and controller are supported

src/Utility/SubsetSchemaCollection.php

@@ -33,7 +33,7 @@ class SubsetSchemaCollection implements CollectionInterface
     protected CollectionInterface $collection;
 
     /**
-     * @var list<string>
+     * @var array<string>
      */
     protected array $tables = [];
 

src/View/Helper/BakeHelper.php

@@ -304,7 +304,7 @@ public function columnData(string $field, TableSchema $schema): ?array
     public function enumSupportsLabel(string $field, TableSchema $schema): bool
     {
         $typeName = $schema->getColumnType($field);
-        if (!str_starts_with($typeName, 'enum-')) {
+        if (!$typeName || !str_starts_with($typeName, 'enum-')) {
             return false;
         }
         $type = TypeFactory::build($typeName);

templates/bake/Controller/controller.twig

@@ -32,7 +32,7 @@
 {% endif %}
 
 {%- for component in components %}
-{% set classInfo = Bake.classInfo(component, 'Controller/Component', 'Component') %}
+    {%~ set classInfo = Bake.classInfo(component, 'Controller/Component', 'Component') %}
  * @property {{ classInfo.fqn }} ${{ classInfo.name }}
 {% endfor %}
  */
@@ -48,20 +48,20 @@ class {{ name }}Controller extends AppController
     {
         parent::initialize();
 
-{% for component in components %}
+    {%~ for component in components %}
         $this->loadComponent('{{ component }}');
-{% endfor %}
-{% if helpers %}
+    {%~ endfor %}
+    {%~ if helpers %}
         $this->viewBuilder()->setHelpers({{ Bake.exportArray(helpers)|raw }});
-{% endif %}
-{% if has_login %}
+    {%~ endif %}
+    {%~ if has_login %}
         $this->Authentication->allowUnauthenticated(['login']);
-{% endif %}
+    {%~ endif %}
     }
-{% if actions|length %}{{ "\n" }}{% endif %}
+    {%~ if actions|length %}{{ "\n" }}{% endif %}
 {% endif %}
-{%- for action in actions %}
-{% if loop.index > 1 %}{{ "\n" }}{% endif %}
+{% for action in actions %}
+    {%~ if loop.index > 1 %}{{ "\n" }}{% endif %}
     {{- element('Bake.Controller/' ~ action) -}}
 {% endfor %}
 }

templates/bake/Model/entity.twig

@@ -18,8 +18,8 @@
 {% set annotations = DocBlock.propertyHints(propertyHintMap) %}
 
 {%- if associationHintMap %}
-    {%- set annotations = annotations|merge(['']) %}
-    {%- set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
+    {%~ set annotations = annotations|merge(['']) %}
+    {%~ set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
 {% endif %}
 
 {%- set accessible = Bake.getFieldAccessibility(fields, primaryKey) %}
@@ -39,7 +39,7 @@ class {{ name }} extends Entity{{ fileBuilder.classBuilder.implements ? ' implem
 
 {% endif %}
 {% if accessible %}
-{%- set generatedProperties = generatedProperties|merge(['_accessible']) %}
+{%~ set generatedProperties = generatedProperties|merge(['_accessible']) %}
     /**
      * Fields that can be mass assigned using newEntity() or patchEntity().
      *
@@ -54,12 +54,12 @@ class {{ name }} extends Entity{{ fileBuilder.classBuilder.implements ? ' implem
 {% if accessible and hidden %}
 
 {% endif %}
-{%- if hidden %}
-{%- set generatedProperties = generatedProperties|merge(['_hidden']) %}
+{% if hidden %}
+    {%~ set generatedProperties = generatedProperties|merge(['_hidden']) %}
     /**
      * Fields that are excluded from JSON versions of the entity.
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $_hidden = {{ Bake.exportVar(hidden, 1)|raw }};
 {% endif %}

templates/bake/Model/table.twig

@@ -50,58 +50,43 @@ class {{ name }}Table extends Table{{ fileBuilder.classBuilder.implements ? ' im
 {%- if displayField %}
         $this->setDisplayField({{ (displayField is iterable ? Bake.exportArray(displayField) : Bake.exportVar(displayField))|raw }});
 {% endif %}
-
-{%- if primaryKey %}
-    {%- if primaryKey is iterable and primaryKey|length > 1 %}
+{% if primaryKey %}
+    {%~ if primaryKey is iterable and primaryKey|length > 1 %}
         $this->setPrimaryKey({{ Bake.exportArray(primaryKey)|raw }});
-        {{- "\n" }}
-    {%- else %}
+    {%~ else %}
         $this->setPrimaryKey('{{ primaryKey|as_array|first }}');
-        {{- "\n" }}
-    {%- endif %}
+    {%~ endif %}
 {% endif %}
+{% if enums %}
 
-{%- if enums %}
-
-{% endif %}
-
-{%- if enums %}
-
-{%- for name, className in enums %}
+    {%~ for name, className in enums %}
         $this->getSchema()->setColumnType('{{ name }}', \Cake\Database\Type\EnumType::from(\{{ className }}::class));
-{% endfor %}
+    {%~ endfor %}
 {% endif %}
+{% if behaviors %}
 
-{%- if behaviors %}
-
-{% endif %}
-
-{%- for behavior, behaviorData in behaviors %}
+    {%~ for behavior, behaviorData in behaviors %}
         $this->addBehavior('{{ behavior }}'{{ (behaviorData ? (", " ~ Bake.exportArray(behaviorData, 2)|raw ~ '') : '')|raw }});
-{% endfor %}
-
-{%- if associations.belongsTo or associations.hasMany or associations.belongsToMany %}
-
+    {%~ endfor %}
 {% endif %}
-
-{%- for type, assocs in associations %}
-    {%- for assoc in assocs %}
-        {%- set assocData = [] %}
-        {%- for key, val in assoc %}
-            {%- if key is not same as('alias') %}
-                {%- set assocData = assocData|merge({(key): val}) %}
-            {%- endif %}
-        {%- endfor %}
+{% if associations.belongsTo or associations.hasMany or associations.belongsToMany %}
+
+    {%~ for type, assocs in associations %}
+        {%~ for assoc in assocs %}
+            {%~ set assocData = [] %}
+            {%~ for key, val in assoc %}
+                {%~ if key is not same as('alias') %}
+                    {%~ set assocData = assocData|merge({(key): val}) %}
+                {%~ endif %}
+            {%~ endfor %}
         $this->{{ type }}('{{ assoc.alias }}', {{ Bake.exportArray(assocData, 2)|raw }});
-        {{- "\n" }}
-    {%- endfor %}
-{% endfor %}
+        {%~ endfor %}
+    {%~ endfor %}
+{% endif %}
     }
-{{- "\n" }}
-
-{%- if validation %}
-{% set generatedFunctions = generatedFunctions|merge(['validationDefault']) %}
+{% if validation %}
 
+    {%~ set generatedFunctions = generatedFunctions|merge(['validationDefault']) %}
     /**
      * Default validation rules.
      *
@@ -110,25 +95,24 @@ class {{ name }}Table extends Table{{ fileBuilder.classBuilder.implements ? ' im
      */
     public function validationDefault(Validator $validator): Validator
     {
-{% for field, rules in validation %}
-{% set validationMethods = Bake.getValidationMethods(field, rules) %}
-{% if validationMethods %}
+    {%~ for field, rules in validation %}
+        {%~ set validationMethods = Bake.getValidationMethods(field, rules) %}
+        {%~ if validationMethods %}
         $validator
-{% for validationMethod in validationMethods %}
-{% if loop.last %}
-{% set validationMethod = validationMethod ~ ';' %}
-{% endif %}
+            {%~ for validationMethod in validationMethods %}
+                {%~ if loop.last %}
+                    {%~ set validationMethod = validationMethod ~ ';' %}
+                {%~ endif %}
             {{ validationMethod|raw }}
-{% endfor %}
+            {%~ endfor %}
 
-{% endif %}
-{% endfor %}
+        {%~ endif %}
+    {%~ endfor %}
         return $validator;
     }
 {% endif %}
-
 {%- if rulesChecker %}
-{% set generatedFunctions = generatedFunctions|merge(['buildRules']) %}
+    {%~ set generatedFunctions = generatedFunctions|merge(['buildRules']) %}
 
     /**
      * Returns a rules checker object that will be used for validating
@@ -139,21 +123,20 @@ class {{ name }}Table extends Table{{ fileBuilder.classBuilder.implements ? ' im
      */
     public function buildRules(RulesChecker $rules): RulesChecker
     {
-{% for rule in rulesChecker %}
-{% set fields = Bake.exportArray(rule.fields) %}
-{% set options = '' %}
-{% for optionName, optionValue in rule.options %}
-    {%~ set options = (loop.first ? '[' : options) ~ "'#{optionName}' => " ~ Bake.exportVar(optionValue) ~ (loop.last ? ']' : ', ') %}
-{% endfor %}
+    {%~ for rule in rulesChecker %}
+        {%~ set fields = Bake.exportArray(rule.fields) %}
+        {%~ set options = '' %}
+        {%~ for optionName, optionValue in rule.options %}
+            {%~ set options = (loop.first ? '[' : options) ~ "'#{optionName}' => " ~ Bake.exportVar(optionValue) ~ (loop.last ? ']' : ', ') %}
+        {%~ endfor %}
         $rules->add($rules->{{ rule.name }}({{ fields|raw }}{{ (rule.extra|default ? ", '#{rule.extra}'" : '')|raw }}{{ (options ? ', ' ~ options : '')|raw }}), ['errorField' => '{{ rule.fields[0] }}']);
-{% endfor %}
+    {%~ endfor %}
 
         return $rules;
     }
 {% endif %}
-
-{%- if connection is not same as('default') %}
-{% set generatedFunctions = generatedFunctions|merge(['defaultConnectionName']) %}
+{% if connection is not same as('default') %}
+    {%~ set generatedFunctions = generatedFunctions|merge(['defaultConnectionName']) %}
 
     /**
      * Returns the database connection name to use by default.

templates/bake/Template/add.twig

@@ -17,18 +17,15 @@
 /**
  * @var \{{ namespace }}\View\AppView $this
  * @var \{{ entityClass }} ${{ singularVar }}
-        {{- "\n" }}
-{%- if associations.BelongsTo is defined %}
-    {%- for assocName, assocData in associations.BelongsTo %}
+{% if associations.BelongsTo is defined %}
+    {%~ for assocName, assocData in associations.BelongsTo %}
  * @var \Cake\Collection\CollectionInterface|string[] ${{ assocData.variable }}
-        {{- "\n" }}
-    {%- endfor %}
+    {%~ endfor %}
 {% endif %}
-{%- if associations.BelongsToMany is defined %}
-    {%- for assocName, assocData in associations.BelongsToMany %}
+{% if associations.BelongsToMany is defined %}
+    {%~ for assocName, assocData in associations.BelongsToMany %}
  * @var \Cake\Collection\CollectionInterface|string[] ${{ assocData.variable }}
-        {{- "\n" }}
-    {%- endfor %}
+    {%~ endfor %}
 {% endif %}
  */
 ?>