Merge pull request #87 from TomHAnderson/ENG-10137_doctrine-3.1-compatibility

Eng 10137 doctrine 3.1 compatibility

Author: TomHAnderson

.github/workflows/coding-standards.yml

@@ -13,8 +13,7 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.3.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
     with:
       php-version: '8.2'
       composer-options: '--prefer-dist --ignore-platform-req=php'
-

.github/workflows/continuous-integration.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
 
     strategy:
       fail-fast: false
@@ -62,22 +62,22 @@ jobs:
 
   upload_coverage:
     name: "Upload coverage to Codecov"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     needs:
       - "phpunit"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v6"
         with:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v4"
+        uses: "actions/download-artifact@v5"
         with:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v2"
+        uses: "codecov/codecov-action@v5"
         with:
           directory: "reports"

.github/workflows/static-analysis.yml

@@ -14,6 +14,8 @@ jobs:
         php-version:
           - "8.2"
           - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout code"

phpstan-baseline.neon

@@ -0,0 +1,19 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Call to static method registerAbstract\(\) on an unknown class LaravelDoctrine\\Fluent\\Extensions\\GedmoExtensions\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/GedmoExtensionsServiceProvider.php
+
+		-
+			message: '#^Call to static method registerAll\(\) on an unknown class LaravelDoctrine\\Fluent\\Extensions\\GedmoExtensions\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/GedmoExtensionsServiceProvider.php
+
+		-
+			message: '#^Class LaravelDoctrine\\Fluent\\FluentDriver not found\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/GedmoExtensionsServiceProvider.php

phpstan.neon.dist

@@ -0,0 +1,7 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 7
+    paths:
+        - src

src/GedmoExtensionsServiceProvider.php

@@ -4,8 +4,11 @@
 
 namespace LaravelDoctrine\Extensions;
 
-use Gedmo\DoctrineExtensions;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\ServiceProvider;
+use LaravelDoctrine\Fluent\Extensions\GedmoExtensions;
+use LaravelDoctrine\Fluent\FluentDriver;
 
 class GedmoExtensionsServiceProvider extends ServiceProvider
 {
@@ -20,16 +23,38 @@ public function register(): void
             foreach ($registry->getManagers() as $manager) {
                 $chain = $manager->getConfiguration()->getMetadataDriverImpl();
 
-                if ($this->needsAllMappings()) {
-                    DoctrineExtensions::registerMappingIntoDriverChainORM($chain);
-                } else {
-                    DoctrineExtensions::registerAbstractMappingIntoDriverChainORM($chain);
+                if (! $this->hasFluentDriver($chain)) {
+                    continue;
                 }
+
+                $this->registerGedmoForFluent($chain);
             }
         });
     }
 
-    private function needsAllMappings(): mixed
+    private function hasFluentDriver(MappingDriverChain $driver): bool
+    {
+        foreach ($driver->getDrivers() as $driver) {
+            if ($driver instanceof FluentDriver) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /** @throws BindingResolutionException */
+    private function registerGedmoForFluent(MappingDriverChain $chain): void
+    {
+        if ($this->needsAllMappings()) {
+            GedmoExtensions::registerAll($chain);
+        } else {
+            GedmoExtensions::registerAbstract($chain);
+        }
+    }
+
+    /** @throws BindingResolutionException */
+    private function needsAllMappings(): bool
     {
         return $this->app->make('config')->get('doctrine.gedmo.all_mappings', false) === true;
     }