Merge 3.x into 4.x

sonata-project · Mar 23, 2022 · abf8cc2 · abf8cc2
2 parents c47e912 + 36d796b
commit abf8cc2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.1](https://github.com/sonata-project/SonataTranslationBundle/compare/3.0.0...3.0.1) - 2022-03-22
+### Fixed
+- [[#630](https://github.com/sonata-project/SonataTranslationBundle/pull/630)] Support of new admin declaration with `model_class` as attribute ([@fransweerts](https://github.com/fransweerts))
+
 ## [3.0.0](https://github.com/sonata-project/SonataTranslationBundle/compare/3.0.0-rc.1...3.0.0) - 2022-01-27
 No changes.
 

diff --git a/src/DependencyInjection/Compiler/AdminExtensionCompilerPass.php b/src/DependencyInjection/Compiler/AdminExtensionCompilerPass.php
@@ -30,23 +30,32 @@ public function process(ContainerBuilder $container): void
         \assert(\is_array($translationTargets));
         $adminExtensionReferences = $this->getAdminExtensionReferenceByTypes(array_keys($translationTargets));
 
-        foreach ($container->findTaggedServiceIds('sonata.admin') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('sonata.admin') as $id => $tags) {
             $admin = $container->getDefinition($id);
-            $modelClass = $container->getParameterBag()->resolveValue($admin->getArgument(1));
-            if (!$modelClass || !class_exists($modelClass)) {
-                continue;
-            }
-            $modelClassReflection = new \ReflectionClass($modelClass);
 
-            foreach ($adminExtensionReferences as $type => $reference) {
-                foreach ($translationTargets[$type]['implements'] as $interface) {
-                    if ($modelClassReflection->implementsInterface($interface)) {
-                        $admin->addMethodCall('addExtension', [$reference]);
-                    }
+            // NEXT_MAJOR: Remove this line.
+            $defaultModelClass = $admin->getArguments()[1] ?? null;
+            foreach ($tags as $attributes) {
+                // NEXT_MAJOR: Remove the fallback to $defaultModelClass and use null instead.
+                $modelClassName = $attributes['model_class'] ?? $defaultModelClass;
+
+                $modelClass = $container->getParameterBag()->resolveValue($modelClassName);
+
+                if (!$modelClass || !class_exists($modelClass)) {
+                    continue;
                 }
-                foreach ($translationTargets[$type]['instanceof'] as $class) {
-                    if ($modelClassReflection->getName() === $class || $modelClassReflection->isSubclassOf($class)) {
-                        $admin->addMethodCall('addExtension', [$reference]);
+                $modelClassReflection = new \ReflectionClass($modelClass);
+
+                foreach ($adminExtensionReferences as $type => $reference) {
+                    foreach ($translationTargets[$type]['implements'] as $interface) {
+                        if ($modelClassReflection->implementsInterface($interface)) {
+                            $admin->addMethodCall('addExtension', [$reference]);
+                        }
+                    }
+                    foreach ($translationTargets[$type]['instanceof'] as $class) {
+                        if ($modelClassReflection->getName() === $class || $modelClassReflection->isSubclassOf($class)) {
+                            $admin->addMethodCall('addExtension', [$reference]);
+                        }
                     }
                 }
             }