DevKit updates for 3.x branch (#692)

* DevKit updates * Fix build --------- Co-authored-by: Jordi Sala Morales <jordism91@gmail.com>
sonata-project · Jun 4, 2023 · 77c72ef · 77c72ef
1 parent c994d16
commit 77c72ef
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 82 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -42,6 +42,7 @@
     'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
     'no_useless_else' => true,
     'no_useless_return' => true,
+    'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],

diff --git a/src/DependencyInjection/Compiler/AdminExtensionCompilerPass.php b/src/DependencyInjection/Compiler/AdminExtensionCompilerPass.php
@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container): void
 
                 $modelClass = $container->getParameterBag()->resolveValue($modelClassName);
 
-                if (!$modelClass || !class_exists($modelClass)) {
+                if (null === $modelClass || !class_exists($modelClass)) {
                     continue;
                 }
                 $modelClassReflection = new \ReflectionClass($modelClass);

diff --git a/tests/Fixtures/Traits/ORM/Knplabs/AbstractArticleTranslation.php b/tests/Fixtures/Traits/ORM/Knplabs/AbstractArticleTranslation.php
@@ -32,7 +32,7 @@ abstract class AbstractArticleTranslation
         cascade: ['persist', 'merge'],
     )]
     #[ORM\JoinColumn(name: 'translatable_id', referencedColumnName: 'id', onDelete: 'CASCADE')]
-    protected $translatable = null;
+    protected $translatable;
 
     #[ORM\Column(length: 128)]
     protected ?string $title = null;

diff --git a/tests/Resources/XliffTest.php b/tests/Resources/XliffTest.php