Merge pull request #435 from greg0ire/4.0.x

Merge 3.6.x up into 4.0.x

.gitattributes

@@ -1,7 +1,7 @@
 /.gitattributes export-ignore
 /.github export-ignore
 /.gitignore export-ignore
-/Tests export-ignore
+/tests export-ignore
 /phpcs.xml.dist export-ignore
 /phpunit.xml.dist export-ignore
 /phpstan.neon.dist export-ignore

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@4.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -11,4 +11,4 @@ on:
 
 jobs:
   static-analysis:
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"

.symfony.bundle.yaml

@@ -1,4 +1,12 @@
-branches: ["3.3.x", "3.4.x", "3.5.x", "3.6.x"]
-maintained_branches: ["3.5.x", "3.6.x"]
-doc_dir: "Resources/doc/"
-dev_branch: "3.6.x"
+branches:
+    - "3.3.x"
+    - "3.4.x"
+    - "3.5.x"
+    - "3.6.x"
+    - "3.7.x"
+maintained_branches:
+    - "3.5.x"
+    - "3.6.x"
+    - "3.7.x"
+doc_dir: "docs/"
+dev_branch: "3.7.x"

composer.json

@@ -43,7 +43,10 @@
         "doctrine/dbal": "< 3"
     },
     "autoload": {
-        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\": "" }
+        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\": "src" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\Tests\\": "tests" }
     },
     "config": {
         "sort-packages": true,

Resources/doc/index.rst → docs/index.rst

@@ -412,7 +412,7 @@ First, add a new ``PSR-4`` autoload-entry in the ``composer.json`` with the new
 
 .. note::
 
-    You need to dump the autoloader with ``composer dump-autoloader``
+    You need to dump the autoloader with ``composer dump-autoload``
 
 Then, enable Dependency Injection for the ``fixtures`` directory:
 

phpcs.xml.dist

@@ -11,22 +11,22 @@
      <!-- Ignore warnings and show progress of the run -->
     <arg value="nps"/>
 
-    <file>.</file>
-    <exclude-pattern>/vendor</exclude-pattern>
+    <file>src</file>
+    <file>tests</file>
 
     <rule ref="Doctrine" />
 
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix">
-        <exclude-pattern>FixtureGroupInterface.php</exclude-pattern>
-        <exclude-pattern>ORMFixtureInterface.php</exclude-pattern>
+        <exclude-pattern>src/FixtureGroupInterface.php</exclude-pattern>
+        <exclude-pattern>src/ORMFixtureInterface.php</exclude-pattern>
     </rule>
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <exclude-pattern>Loader/SymfonyBridgeLoader.php</exclude-pattern>
-        <exclude-pattern>Command/CommandCompatibility.php</exclude-pattern>
-        <exclude-pattern>Tests/IntegrationTest.php</exclude-pattern>
+        <exclude-pattern>src/Loader/SymfonyBridgeLoader.php</exclude-pattern>
+        <exclude-pattern>src/Command/CommandCompatibility.php</exclude-pattern>
+        <exclude-pattern>tests/IntegrationTest.php</exclude-pattern>
     </rule>
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
-        <exclude-pattern>Tests/IntegrationTest.php</exclude-pattern>
+        <exclude-pattern>tests/IntegrationTest.php</exclude-pattern>
     </rule>
 </ruleset>

phpstan-baseline.neon

@@ -3,5 +3,4 @@ parameters:
 		-
 			message: "#^Constructor of class Doctrine\\\\Bundle\\\\FixturesBundle\\\\Tests\\\\Fixtures\\\\FooBundle\\\\DataFixtures\\\\RequiredConstructorArgsFixtures has an unused parameter \\$fooRequiredArg\\.$#"
 			count: 1
-			path: Tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php
-
+			path: tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php

phpstan.neon.dist

@@ -2,9 +2,8 @@ parameters:
     phpVersion: 80100
     level: 3
     paths:
-        - .
-    excludePaths:
-        - vendor
+        - src
+        - tests
 
 includes:
     - phpstan-baseline.neon

phpunit.xml.dist

@@ -3,18 +3,13 @@
 <phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="DoctrineFixturesBundle for the Symfony Framework">
-            <directory>./Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>.</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
+            <directory>src</directory>
         </whitelist>
     </filter>
 

psalm.xml

@@ -10,15 +10,8 @@
     findUnusedCode="false"
 >
     <projectFiles>
-        <directory name="Command" />
-        <directory name="DependencyInjection" />
-        <directory name="Loader" />
-        <directory name="Purger" />
-        <directory name="Tests" />
-        <file name="DoctrineFixturesBundle.php" />
-        <file name="Fixture.php" />
-        <file name="FixtureGroupInterface.php" />
-        <file name="ORMFixtureInterface.php" />
+        <directory name="src" />
+        <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>

DependencyInjection/DoctrineFixturesExtension.php → src/DependencyInjection/DoctrineFixturesExtension.php

@@ -8,8 +8,8 @@
 use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 use function dirname;
 
@@ -20,7 +20,7 @@ class DoctrineFixturesExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__) . '/../config'));
 
         $loader->load('services.xml');
 

DoctrineFixturesBundle.php → src/DoctrineFixturesBundle.php

@@ -9,11 +9,18 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+use function dirname;
+
 class DoctrineFixturesBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new FixturesCompilerPass());
         $container->addCompilerPass(new PurgerFactoryCompilerPass());
     }
+
+    public function getPath(): string
+    {
+        return dirname(__DIR__);
+    }
 }

Loader/SymfonyFixturesLoader.php → src/Loader/SymfonyFixturesLoader.php

@@ -11,9 +11,8 @@
 use Doctrine\Common\DataFixtures\Loader;
 use LogicException;
 use ReflectionClass;
-use RuntimeException;
 
-use function array_key_exists;
+use function array_keys;
 use function array_values;
 use function get_class;
 use function sprintf;
@@ -100,19 +99,22 @@ public function getFixtures(array $groups = []): array
             return $fixtures;
         }
 
-        $filteredFixtures = [];
-        foreach ($fixtures as $fixture) {
-            foreach ($groups as $group) {
-                $fixtureClass = $fixture::class;
-                if (isset($this->groupsFixtureMapping[$group][$fixtureClass])) {
-                    $filteredFixtures[$fixtureClass] = $fixture;
-                    continue 2;
-                }
+        $requiredFixtures = [];
+        foreach ($groups as $group) {
+            if (! isset($this->groupsFixtureMapping[$group])) {
+                continue;
             }
+
+            $requiredFixtures += $this->collectDependencies(...array_keys($this->groupsFixtureMapping[$group]));
         }
 
-        foreach ($filteredFixtures as $fixture) {
-            $this->validateDependencies($filteredFixtures, $fixture);
+        $filteredFixtures = [];
+        foreach ($fixtures as $order => $fixture) {
+            $fixtureClass = $fixture::class;
+            if (isset($requiredFixtures[$fixtureClass])) {
+                $filteredFixtures[$order] = $fixture;
+                continue;
+            }
         }
 
         return array_values($filteredFixtures);
@@ -131,22 +133,25 @@ private function addGroupsFixtureMapping(string $className, array $groups): void
     }
 
     /**
-     * @param string[] $fixtures An array of fixtures with class names as keys
+     * Collect any dependent fixtures from the given classes.
      *
-     * @throws RuntimeException
+     * @psalm-return array<string,true>
      */
-    private function validateDependencies(array $fixtures, FixtureInterface $fixture): void
+    private function collectDependencies(string ...$fixtureClass): array
     {
-        if (! $fixture instanceof DependentFixtureInterface) {
-            return;
-        }
+        $dependencies = [];
 
-        $dependenciesClasses = $fixture->getDependencies();
+        foreach ($fixtureClass as $class) {
+            $dependencies[$class] = true;
+            $fixture              = $this->getFixture($class);
 
-        foreach ($dependenciesClasses as $class) {
-            if (! array_key_exists($class, $fixtures)) {
-                throw new RuntimeException(sprintf('Fixture "%s" was declared as a dependency for fixture "%s", but it was not included in any of the loaded fixture groups.', $class, $fixture::class));
+            if (! $fixture instanceof DependentFixtureInterface) {
+                continue;
             }
+
+            $dependencies += $this->collectDependencies(...$fixture->getDependencies());
         }
+
+        return $dependencies;
     }
 }

tests/Fixtures/FooBundle/DataFixtures/WithDeepDependenciesFixtures.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class WithDeepDependenciesFixtures implements ORMFixtureInterface, DependentFixtureInterface, FixtureGroupInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+        // ...
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDependencies(): array
+    {
+        return [WithDependenciesFixtures::class, DependentOnRequiredConstructorArgsFixtures::class];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public static function getGroups(): array
+    {
+        return ['groupWithDeepDependencies'];
+    }
+}

Tests/Fixtures/FooBundle/DataFixtures/WithDependenciesFixtures.php → tests/Fixtures/FooBundle/DataFixtures/WithDependenciesFixtures.php

@@ -29,6 +29,6 @@ public function getDependencies(): array
      */
     public static function getGroups(): array
     {
-        return ['missingDependencyGroup', 'fulfilledDependencyGroup'];
+        return ['groupWithDependencies', 'fulfilledDependencyGroup'];
     }
 }

Tests/IntegrationTest.php → tests/IntegrationTest.php

@@ -11,6 +11,8 @@
 use Doctrine\Bundle\FixturesBundle\Purger\PurgerFactory;
 use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\DependentOnRequiredConstructorArgsFixtures;
 use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\OtherFixtures;
+use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\RequiredConstructorArgsFixtures;
+use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\WithDeepDependenciesFixtures;
 use Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\WithDependenciesFixtures;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\Common\EventManager;
@@ -19,7 +21,6 @@
 use Doctrine\Persistence\ManagerRegistry;
 use LogicException;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -171,18 +172,26 @@ public function testFixturesLoaderWithGroupsOptionViaTag(): void
         $this->assertCount(0, $loader->getFixtures(['group3']));
     }
 
-    public function testLoadFixturesViaGroupWithMissingDependency(): void
+    public function testLoadFixturesViaGroupWithDependenciesNotInGroup(): void
     {
         $kernel = new IntegrationTestKernel('dev', true);
         $kernel->addServices(static function (ContainerBuilder $c): void {
-            // has a "staging" group via the getGroups() method
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
 
-            // no getGroups() method
             $c->autowire(WithDependenciesFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
 
+            $c->autowire(WithDeepDependenciesFixtures::class)
+                ->addTag(FixturesCompilerPass::FIXTURE_TAG);
+
+            $c->autowire(RequiredConstructorArgsFixtures::class)
+                ->setArgument('$fooRequiredArg', 'test')
+                ->addTag(FixturesCompilerPass::FIXTURE_TAG);
+
+            $c->autowire(DependentOnRequiredConstructorArgsFixtures::class)
+                ->addTag(FixturesCompilerPass::FIXTURE_TAG);
+
             $c->setAlias('test.doctrine.fixtures.loader', new Alias('doctrine.fixtures.loader', true));
         });
         $kernel->boot();
@@ -191,10 +200,8 @@ public function testLoadFixturesViaGroupWithMissingDependency(): void
         $loader = $container->get('test.doctrine.fixtures.loader');
         $this->assertInstanceOf(SymfonyFixturesLoader::class, $loader);
 
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Fixture "Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\OtherFixtures" was declared as a dependency for fixture "Doctrine\Bundle\FixturesBundle\Tests\Fixtures\FooBundle\DataFixtures\WithDependenciesFixtures", but it was not included in any of the loaded fixture groups.');
-
-        $loader->getFixtures(['missingDependencyGroup']);
+        self::assertCount(2, $loader->getFixtures(['groupWithDependencies']));
+        self::assertCount(5, $loader->getFixtures(['groupWithDeepDependencies']));
     }
 
     public function testLoadFixturesViaGroupWithFulfilledDependency(): void