Merge 4.x into 5.x

sonata-project · Dec 18, 2023 · 0639742 · 0639742
2 parents 3dd18e0 + 6605764
commit 0639742
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -27,8 +27,9 @@
 HEADER;
 
 $rules = [
-    '@PHP74Migration' => true,
-    '@PHP74Migration:risky' => true,
+    '@PHP80Migration' => true,
+    '@PHP80Migration:risky' => true,
+    '@PHPUnit84Migration:risky' => true,
     '@PSR12' => true,
     '@PSR12:risky' => true,
     '@Symfony' => true,
@@ -42,6 +43,7 @@
     'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
     'no_useless_else' => true,
     'no_useless_return' => true,
+    'no_superfluous_elseif' => 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,
@@ -51,16 +53,14 @@
         ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
         ['psalm-suppress', 'phpstan-ignore-next-line'],
         ['Assert\\*'],
-        ['ODM\\*'],
-        ['ORM\\*'],
     ]],
-    'php_unit_strict' => true,
-    'php_unit_test_case_static_method_calls' => true,
     'php_unit_data_provider_name' => true,
     'php_unit_data_provider_return_type' => true,
+    'php_unit_strict' => true,
+    'php_unit_test_case_static_method_calls' => true,
     'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']],
-    'single_line_throw' => false,
     'static_lambda' => true,
+    'single_line_throw' => false,
     'strict_comparison' => true,
     'strict_param' => true,
     'void_return' => false,

diff --git a/src/DependencyInjection/SonataMediaExtension.php b/src/DependencyInjection/SonataMediaExtension.php
@@ -267,7 +267,8 @@ public function configureFilesystemAdapter(ContainerBuilder $container, array $c
             $async = true === $config['filesystem']['s3']['async'];
             if ($async && !class_exists(SimpleS3Client::class)) {
                 throw new \RuntimeException('You must install "async-aws/simple-s3" to use async S3 adapter');
-            } elseif (!$async && !class_exists(S3Client::class)) {
+            }
+            if (!$async && !class_exists(S3Client::class)) {
                 throw new \RuntimeException('You must install "aws/aws-sdk-php" to use Amazon S3 filesystem');
             }