Merge pull request #1052 from cakephp/3.x-fixture-factories

Dont add fixtures if fixture factories are used.

Author: markstory

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 = [];
 

templates/bake/Model/entity.twig

@@ -59,7 +59,7 @@ class {{ name }} extends Entity{{ fileBuilder.classBuilder.implements ? ' implem
     /**
      * 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/tests/test_case.twig

@@ -63,11 +63,11 @@ class {{ className }}Test extends TestCase
 {% endfor %}
 {% endif %}
 
-{%- if fixtures %}
+{%- if fixtures and not (hasFixtureFactories|default(false)) %}
     /**
      * Fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = {{ Bake.exportVar(fixtures|values, 1)|raw }};
 {% if construction or methods %}

tests/TestCase/Command/AllCommandTest.php

@@ -29,15 +29,15 @@ class AllCommandTest extends TestCase
     /**
      * fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = [
         'plugin.Bake.Products',
         'plugin.Bake.ProductVersions',
     ];
 
     /**
-     * @var list<string>
+     * @var array<string>
      */
     protected array $tables = ['products', 'product_versions'];
 

tests/TestCase/Command/ControllerAllCommandTest.php

@@ -30,15 +30,15 @@ class ControllerAllCommandTest extends TestCase
     /**
      * fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = [
         'plugin.Bake.BakeArticles',
         'plugin.Bake.BakeComments',
     ];
 
     /**
-     * @var list<string>
+     * @var array<string>
      */
     protected array $tables = ['bake_articles', 'bake_comments'];
 

tests/TestCase/Command/ControllerCommandTest.php

@@ -32,7 +32,7 @@ class ControllerCommandTest extends TestCase
     /**
      * fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = [
         'plugin.Bake.BakeArticles',

tests/TestCase/Command/FixtureAllCommandTest.php

@@ -30,15 +30,15 @@ class FixtureAllCommandTest extends TestCase
     /**
      * fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = [
         'plugin.Bake.Articles',
         'plugin.Bake.Comments',
     ];
 
     /**
-     * @var list<string>
+     * @var array<string>
      */
     protected array $tables = ['articles', 'comments'];
 

tests/TestCase/Command/FixtureCommandTest.php

@@ -35,7 +35,7 @@ class FixtureCommandTest extends TestCase
     /**
      * fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = [
         'plugin.Bake.Articles',

tests/TestCase/Command/ModelAllCommandTest.php

@@ -30,15 +30,15 @@ class ModelAllCommandTest extends TestCase
     /**
      * fixtures
      *
-     * @var list<string>
+     * @var array<string>
      */
     protected array $fixtures = [
         'plugin.Bake.TodoTasks',
         'plugin.Bake.TodoItems',
     ];
 
     /**
-     * @var list<string>
+     * @var array<string>
      */
     protected array $tables = ['todo_tasks', 'todo_items'];