[AllBundles] Bump gedmo/doctrine-extensions to prepare for php8 support

Kunstmaan · Jul 11, 2021 · 5cfc9b4 · 5cfc9b4
1 parent 1a57739
commit 5cfc9b4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -63,7 +63,7 @@
         "guzzlehttp/guzzle": "~6.1",
         "babdev/pagerfanta-bundle": "^2.5",
         "kunstmaan/google-api-custom": "~1.0",
-        "gedmo/doctrine-extensions": "^2.4.34",
+        "gedmo/doctrine-extensions": "^2.4.34|^3.1.0",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "stof/doctrine-extensions-bundle": "^1.3",
         "liip/imagine-bundle": "^2.4",

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclWalkerTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclWalkerTest.php
@@ -25,6 +25,7 @@ public function testWalker()
     {
         $range = new RangeVariableDeclaration('someschema', 's');
         $expr = new PathExpression('int', 'id');
+        $expr->type = PathExpression::TYPE_STATE_FIELD;
         $indexBy = new IndexBy($expr);
         $from = new FromClause([new IdentificationVariableDeclaration($range, $indexBy, [])]);
 

diff --git a/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php b/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php
@@ -2,6 +2,7 @@
 
 namespace Kunstmaan\MediaBundle\DependencyInjection;
 
+use Gedmo\DoctrineExtensions;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -95,13 +96,15 @@ public function prepend(ContainerBuilder $container)
 
         $container->prependExtensionConfig('stof_doctrine_extensions', $stofDoctrineExtensionsConfig);
 
+        $baseDir = version_compare(DoctrineExtensions::VERSION, '3.0.0', '>=') ? 'src' : 'lib/Gedmo';
+
         $doctrineGedmoEntityConfig = [
             'orm' => [
                 'mappings' => [
                     'gedmo_translatable' => [
                         'type' => 'annotation',
                         'prefix' => 'Gedmo\Translatable\Entity',
-                        'dir' => '%kernel.project_dir%/vendor/gedmo/doctrine-extensions/lib/Gedmo/Translatable/Entity',
+                        'dir' => '%kernel.project_dir%/vendor/gedmo/doctrine-extensions/' . $baseDir . '/Translatable/Entity',
                         'alias' => 'GedmoTranslatable',
                         'is_bundle' => false,
                     ],

diff --git a/src/Kunstmaan/MediaBundle/composer.json b/src/Kunstmaan/MediaBundle/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": "^7.2",
-        "gedmo/doctrine-extensions": "^2.4.34",
+        "gedmo/doctrine-extensions": "^2.4.34|^3.1.0",
         "stof/doctrine-extensions-bundle": "^1.3",
         "liip/imagine-bundle": "^2.4",
         "symfony/mime": "^4.4",

diff --git a/src/Kunstmaan/NodeBundle/composer.json b/src/Kunstmaan/NodeBundle/composer.json
@@ -15,7 +15,7 @@
     "require": {
         "php": "^7.2",
         "doctrine/dbal": "^2.9",
-        "gedmo/doctrine-extensions": "^2.4.34",
+        "gedmo/doctrine-extensions": "^2.4.34|^3.1.0",
         "kunstmaan/admin-bundle": "^5.9",
         "kunstmaan/adminlist-bundle": "~5.2",
         "stof/doctrine-extensions-bundle": "^1.3",