Merge pull request #103 from core23/update-tools

Update tools
nucleos · Dec 3, 2023 · 13d4af1 · 13d4af1
2 parents 4582c2d + 178ca6f
commit 13d4af1
Show file tree

Hide file tree

Showing 18 changed files with 699 additions and 785 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="src/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPass.php">
-    <InvalidPropertyAssignmentValue occurrences="2">
-      <code>$container-&gt;getParameter('sonata.auto_configure.admin.manager_type')</code>
-      <code>$container-&gt;getParameter('sonata.auto_configure.controller.suffix')</code>
+    <InvalidPropertyAssignmentValue>
+      <code><![CDATA[$container->getParameter('sonata.auto_configure.admin.manager_type')]]></code>
+      <code><![CDATA[$container->getParameter('sonata.auto_configure.controller.suffix')]]></code>
     </InvalidPropertyAssignmentValue>
   </file>
 </files>
diff --git a/src/Exception/SonataAutoConfigureExceptionInterface.php b/src/Exception/SonataAutoConfigureExceptionInterface.php
@@ -15,6 +15,4 @@
 
 use Throwable;
 
-interface SonataAutoConfigureExceptionInterface extends Throwable
-{
-}
+interface SonataAutoConfigureExceptionInterface extends Throwable {}
diff --git a/tests/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPassTest.php b/tests/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPassTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider processData
+     * @dataProvider provideProcessCases
      *
      * @param array<string, mixed> $tagOptions
      * @param string[]             $methodCalls
@@ -82,25 +82,25 @@ public function testProcess(
 
         $adminDefinition = $this->containerBuilder->getDefinition($definitionId);
 
-        static::assertSame(
+        self::assertSame(
             $tagOptions,
             $adminDefinition->getTag('sonata.admin')[0]
         );
 
-        static::assertSame(
+        self::assertSame(
             $entity,
             $adminDefinition->getArgument(1)
         );
 
         foreach ($methodCalls as $methodCall) {
-            static::assertTrue($adminDefinition->hasMethodCall($methodCall));
+            self::assertTrue($adminDefinition->hasMethodCall($methodCall));
         }
     }
 
     /**
      * @return mixed[]
      */
-    public function processData(): iterable
+    public function provideProcessCases(): iterable
     {
         yield [
             CategoryAdmin::class,

diff --git a/tests/DependencyInjection/Compiler/AutoConfigureExtensionsCompilerPassTest.php b/tests/DependencyInjection/Compiler/AutoConfigureExtensionsCompilerPassTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider processData
+     * @dataProvider provideProcessCases
      *
      * @param string[] $expectedTags
      */
@@ -56,17 +56,17 @@ public function testProcess(string $extensionServiceId, array $expectedTags = []
         $extensionDefinition = $this->containerBuilder->getDefinition($extensionServiceId);
 
         $actualTags = $extensionDefinition->getTag('sonata.admin.extension');
-        static::assertGreaterThan(0, $actualTags);
+        self::assertGreaterThan(0, $actualTags);
         foreach ($expectedTags as $i => $expectedTag) {
-            static::assertArrayHasKey($i, $actualTags);
-            static::assertSame($expectedTag, $actualTags[$i]);
+            self::assertArrayHasKey($i, $actualTags);
+            self::assertSame($expectedTag, $actualTags[$i]);
         }
     }
 
     /**
      * @return mixed[]
      */
-    public function processData(): iterable
+    public function provideProcessCases(): iterable
     {
         yield [ExtensionWithoutOptions::class];
 
@@ -104,7 +104,7 @@ public function testProcessSkipAutoConfigured(): void
 
         $definition = $this->containerBuilder->getDefinition(TargetedWithPriorityExtension::class);
         $tag        = $definition->getTag('sonata.admin.extension');
-        static::assertEmpty(reset($tag));
+        self::assertEmpty(reset($tag));
     }
 
     public function testProcessSkipIfAttributeMissing(): void
@@ -119,7 +119,7 @@ public function testProcessSkipIfAttributeMissing(): void
 
         $definition = $this->containerBuilder->getDefinition(ExtensionWithoutOptions::class);
         $tag        = $definition->getTag('sonata.admin.extension');
-        static::assertEmpty(reset($tag));
+        self::assertEmpty(reset($tag));
     }
 
     /**

diff --git a/tests/Fixtures/Admin/AttributedAdmin.php b/tests/Fixtures/Admin/AttributedAdmin.php
@@ -36,6 +36,4 @@
         'admin.product',
     ]
 )]
-class AttributedAdmin extends AbstractAdmin
-{
-}
+class AttributedAdmin extends AbstractAdmin {}
diff --git a/tests/Fixtures/Admin/CategoryAdmin.php b/tests/Fixtures/Admin/CategoryAdmin.php
@@ -18,6 +18,4 @@
 /**
  * @extends AbstractAdmin<object>
  */
-class CategoryAdmin extends AbstractAdmin
-{
-}
+class CategoryAdmin extends AbstractAdmin {}
diff --git a/tests/Fixtures/Admin/DisableAutowireEntityAdmin.php b/tests/Fixtures/Admin/DisableAutowireEntityAdmin.php
@@ -20,6 +20,4 @@
  * @extends AbstractAdmin<object>
  */
 #[Admin(autowireEntity: false, templates: null)]
-class DisableAutowireEntityAdmin extends AbstractAdmin
-{
-}
+class DisableAutowireEntityAdmin extends AbstractAdmin {}
diff --git a/tests/Fixtures/Admin/Extension/ExtensionWithoutOptions.php b/tests/Fixtures/Admin/Extension/ExtensionWithoutOptions.php
@@ -20,6 +20,4 @@
  * @extends AbstractAdminExtension<object>
  */
 #[AdminExtension]
-class ExtensionWithoutOptions extends AbstractAdminExtension
-{
-}
+class ExtensionWithoutOptions extends AbstractAdminExtension {}
diff --git a/tests/Fixtures/Admin/Extension/GlobalExtension.php b/tests/Fixtures/Admin/Extension/GlobalExtension.php
@@ -20,6 +20,4 @@
  * @extends AbstractAdminExtension<object>
  */
 #[AdminExtension(global: true)]
-class GlobalExtension extends AbstractAdminExtension
-{
-}
+class GlobalExtension extends AbstractAdminExtension {}
diff --git a/tests/Fixtures/Admin/Extension/MultipleTargetedExtension.php b/tests/Fixtures/Admin/Extension/MultipleTargetedExtension.php
@@ -22,6 +22,4 @@
 #[AdminExtension(
     target: ['app.admin.category', 'app.admin.media']
 )]
-class MultipleTargetedExtension extends AbstractAdminExtension
-{
-}
+class MultipleTargetedExtension extends AbstractAdminExtension {}
diff --git a/tests/Fixtures/Admin/Extension/TargetedWithPriorityExtension.php b/tests/Fixtures/Admin/Extension/TargetedWithPriorityExtension.php
@@ -20,6 +20,4 @@
  * @extends AbstractAdminExtension<object>
  */
 #[AdminExtension(priority: 5, target: ['app.admin.category'])]
-class TargetedWithPriorityExtension extends AbstractAdminExtension
-{
-}
+class TargetedWithPriorityExtension extends AbstractAdminExtension {}
diff --git a/tests/Fixtures/Admin/InvalidAdminClass.php b/tests/Fixtures/Admin/InvalidAdminClass.php
@@ -14,6 +14,4 @@
 use Nucleos\SonataAutoConfigureBundle\Attribute\Admin;
 
 #[Admin]
-class InvalidAdminClass
-{
-}
+class InvalidAdminClass {}
diff --git a/tests/Fixtures/Admin/NoEntityAdmin.php b/tests/Fixtures/Admin/NoEntityAdmin.php
@@ -18,6 +18,4 @@
 /**
  * @extends AbstractAdmin<object>
  */
-class NoEntityAdmin extends AbstractAdmin
-{
-}
+class NoEntityAdmin extends AbstractAdmin {}
diff --git a/tests/Fixtures/Controller/CategoryController.php b/tests/Fixtures/Controller/CategoryController.php
@@ -13,6 +13,4 @@
 
 namespace Nucleos\SonataAutoConfigureBundle\Tests\Fixtures\Controller;
 
-class CategoryController
-{
-}
+class CategoryController {}
diff --git a/tests/Fixtures/Entity/Category.php b/tests/Fixtures/Entity/Category.php
@@ -13,6 +13,4 @@
 
 namespace Nucleos\SonataAutoConfigureBundle\Tests\Fixtures\Entity;
 
-class Category
-{
-}
+class Category {}
diff --git a/tests/SonataAutoConfigureBundleTest.php b/tests/SonataAutoConfigureBundleTest.php
@@ -31,7 +31,7 @@ public function testCompilerPasses(): void
         $containerBuilder = $this->createMock(ContainerBuilder::class);
 
         $containerBuilder
-            ->expects(static::exactly(2))
+            ->expects(self::exactly(2))
             ->method('addCompilerPass')
             ->willReturn($containerBuilder)
         ;

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -24,5 +24,10 @@
             "phpstan/extension-installer": true
         },
         "bin-dir": "../../vendor/bin"
+    },
+    "extra": {
+        "symfony": {
+            "require": "6.4.*"
+        }
     }
 }