Merge pull request #489 from doctrine/1.7.x

Merge 1.7.x up into 1.8.x

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"

.github/workflows/coding-standards.yml

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

.github/workflows/continuous-integration.yml

@@ -61,7 +61,7 @@ jobs:
         if: "matrix.stability == 'dev'"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist"
@@ -70,9 +70,9 @@ jobs:
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
-          name: "phpunit-${{ matrix.php-version }}.coverage"
+          name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ matrix.stability }}.coverage"
           path: "coverage.xml"
 
   upload_coverage:
@@ -88,11 +88,13 @@ jobs:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v3"
+        uses: "codecov/codecov-action@v4"
         with:
           directory: "reports"
+        env:
+          CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/documentation.yml

@@ -0,0 +1,20 @@
+name: "Documentation"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/documentation.yml"
+      - "docs/**"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/documentation.yml"
+      - "docs/**"
+
+jobs:
+  documentation:
+    name: "Documentation"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@5.2.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@4.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.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:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.2.0"

docs/en/sidebar.rst

@@ -1,19 +1,15 @@
-.. toc::
+:orphan:
 
-   .. tocheader:: How-to guides
+.. toctree::
+   :caption: How-to guides
+   :depth: 3
 
-   .. toctree::
-      :depth: 3
+   how-to/loading-fixtures
+   how-to/sharing-objects-between-fixtures
+   how-to/fixture-ordering
 
-      how-to/loading-fixtures
-      how-to/sharing-objects-between-fixtures
-      how-to/fixture-ordering
+.. toctree::
+   :caption: Explanations
+   :depth: 3
 
-.. toc::
-
-   .. tocheader:: Explanations
-
-   .. toctree::
-      :depth: 3
-
-      explanation/transactions-and-purging
+   explanation/transactions-and-purging

tests/Common/DataFixtures/LoaderTest.php

@@ -6,7 +6,9 @@
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\Loader;
+use Doctrine\Common\DataFixtures\ReferenceRepository;
 use Doctrine\Common\DataFixtures\SharedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 use TestFixtures\MyFixture1;
 use TestFixtures\NotAFixture;
 
@@ -18,11 +20,9 @@ class LoaderTest extends BaseTestCase
     public function testLoadFromDirectory(): void
     {
         $loader = new Loader();
-        $loader->addFixture($this->getMockBuilder(FixtureInterface::class)->setMockClassName('Mock1')->getMock());
-        $loader->addFixture($this->getMockBuilder(FixtureInterface::class)->setMockClassName('Mock2')->getMock());
-        $loader->addFixture(
-            $this->getMockBuilder(SharedFixtureInterface::class)->setMockClassName('Mock3')->getMock(),
-        );
+        $loader->addFixture(new DummyFixtureOne());
+        $loader->addFixture(new DummyFixtureTwo());
+        $loader->addFixture(new SharedDummyFixture());
 
         $this->assertCount(3, $loader->getFixtures());
 
@@ -35,11 +35,9 @@ public function testLoadFromDirectory(): void
     public function testLoadFromFile(): void
     {
         $loader = new Loader();
-        $loader->addFixture($this->getMockBuilder(FixtureInterface::class)->setMockClassName('Mock1')->getMock());
-        $loader->addFixture($this->getMockBuilder(FixtureInterface::class)->setMockClassName('Mock2')->getMock());
-        $loader->addFixture(
-            $this->getMockBuilder(SharedFixtureInterface::class)->setMockClassName('Mock3')->getMock(),
-        );
+        $loader->addFixture(new DummyFixtureOne());
+        $loader->addFixture(new DummyFixtureTwo());
+        $loader->addFixture(new SharedDummyFixture());
 
         $this->assertCount(3, $loader->getFixtures());
 
@@ -63,3 +61,28 @@ public function testGetFixture(): void
         $this->assertInstanceOf(MyFixture1::class, $fixture);
     }
 }
+
+final class DummyFixtureOne implements FixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+    }
+}
+
+final class DummyFixtureTwo implements FixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+    }
+}
+
+final class SharedDummyFixture implements SharedFixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+    }
+
+    public function setReferenceRepository(ReferenceRepository $referenceRepository): void
+    {
+    }
+}