Fix CS

phpstan-baseline.neon

@@ -30,3 +30,8 @@ parameters:
 			count: 1
 			path: tests/Block/Service/GDPRInformationBlockServiceIntegrationTest.php
 
+		-
+			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\TestCase\\:\\:createStub\\(\\)\\.$#"
+			count: 10
+			path: tests/EventListener/KernelEventSubscriberTest.php
+

phpunit.xml.dist

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
   <php>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
   </php>
@@ -13,4 +9,9 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>

psalm-baseline.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.14.2@3538fe1955d47f6ee926c0769d71af6db08aa488"/>
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591"/>

src/Block/Service/GDPRInformationBlockService.php

@@ -103,9 +103,7 @@ public function configureSettings(OptionsResolver $resolver): void
         ]);
     }
 
-    public function validate(ErrorElement $errorElement, BlockInterface $block): void
-    {
-    }
+    public function validate(ErrorElement $errorElement, BlockInterface $block): void {}
 
     public function getMetadata(): MetadataInterface
     {

src/NucleosGDPRBundle.php

@@ -15,6 +15,4 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-final class NucleosGDPRBundle extends Bundle
-{
-}
+final class NucleosGDPRBundle extends Bundle {}

src/Resources/config/block.php

@@ -23,6 +23,5 @@
                 new Reference('twig'),
                 new Reference('request_stack'),
             ])
-
     ;
 };

src/Resources/config/listener.php

@@ -22,6 +22,5 @@
                 null,
                 false,
             ])
-
     ;
 };

tests/Block/Service/GDPRInformationBlockServiceIntegrationTest.php

@@ -30,6 +30,6 @@ public function testRender(): void
 
         $client->request('GET', '/twig-test');
 
-        static::assertSame(200, $client->getResponse()->getStatusCode());
+        self::assertSame(200, $client->getResponse()->getStatusCode());
     }
 }

tests/Block/Service/GDPRInformationBlockServiceTest.php

@@ -70,7 +70,7 @@ public function testExecute(): void
 
         $response = new Response();
 
-        $this->twig->expects(static::once())->method('render')
+        $this->twig->expects(self::once())->method('render')
             ->with(
                 '@NucleosGDPR/Block/block_gdpr.html.twig',
                 [
@@ -84,8 +84,8 @@ public function testExecute(): void
 
         $blockService = new GDPRInformationBlockService($this->twig, $this->requestStack);
 
-        static::assertSame($response, $blockService->execute($blockContext, $response));
-        static::assertSame('TWIG_CONTENT', $response->getContent());
+        self::assertSame($response, $blockService->execute($blockContext, $response));
+        self::assertSame('TWIG_CONTENT', $response->getContent());
     }
 
     public function testExecuteWithExistingCookie(): void
@@ -104,7 +104,7 @@ public function testExecuteWithExistingCookie(): void
         $blockService = new GDPRInformationBlockService($this->twig, $this->requestStack);
         $response     = $blockService->execute($blockContext);
 
-        static::assertTrue($response->isEmpty());
+        self::assertTrue($response->isEmpty());
     }
 
     public function testGetMetadata(): void
@@ -113,10 +113,10 @@ public function testGetMetadata(): void
 
         $metadata = $blockService->getMetadata();
 
-        static::assertSame('nucleos_gdpr.block.information', $metadata->getTitle());
-        static::assertNull($metadata->getImage());
-        static::assertSame('NucleosGDPRBundle', $metadata->getDomain());
-        static::assertSame([
+        self::assertSame('nucleos_gdpr.block.information', $metadata->getTitle());
+        self::assertNull($metadata->getImage());
+        self::assertSame('NucleosGDPRBundle', $metadata->getDomain());
+        self::assertSame([
             'class' => 'fa fa-balance-scale',
         ], $metadata->getOptions());
     }
@@ -128,7 +128,7 @@ public function testConfigureEditForm(): void
         $block = new Block();
 
         $formMapper = $this->createMock(FormMapper::class);
-        $formMapper->expects(static::once())->method('add');
+        $formMapper->expects(self::once())->method('add');
 
         $blockService->configureEditForm($formMapper, $block);
     }

tests/DependencyInjection/ConfigurationTest.php

@@ -29,7 +29,7 @@ public function testDefaultOptions(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 
     public function testEnabledGoogleFLoC(): void
@@ -48,7 +48,7 @@ public function testEnabledGoogleFLoC(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 
     public function testBlockedCookieEnabled(): void
@@ -68,7 +68,7 @@ public function testBlockedCookieEnabled(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 
     public function testBlockedCookieOptions(): void
@@ -90,6 +90,6 @@ public function testBlockedCookieOptions(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 }

tests/EventListener/KernelEventSubscriberTest.php

@@ -45,7 +45,7 @@ public function testCleanCookiesWithDisabledOption(): void
         $subscriber = new KernelEventSubscriber(null);
         $subscriber->cleanCookies($event);
 
-        static::assertCount(4, $response->headers->getCookies());
+        self::assertCount(4, $response->headers->getCookies());
         $this->assertHasCookie(self::SOME_COOKIE_NAME, $response);
         $this->assertHasCookie(self::KEEP_COOKIE_NAME, $response);
         $this->assertHasCookie(self::KEEP_REGED_EXAMPLE, $response);
@@ -73,7 +73,7 @@ public function testCleanCookiesWithConsent(): void
         ]);
         $subscriber->cleanCookies($event);
 
-        static::assertCount(4, $response->headers->getCookies());
+        self::assertCount(4, $response->headers->getCookies());
         $this->assertHasCookie(self::SOME_COOKIE_NAME, $response);
         $this->assertHasCookie(self::KEEP_COOKIE_NAME, $response);
         $this->assertHasCookie(self::KEEP_REGED_EXAMPLE, $response);
@@ -100,7 +100,7 @@ public function testCleanCookiesWithNoConsent(): void
         ]);
         $subscriber->cleanCookies($event);
 
-        static::assertCount(2, $response->headers->getCookies());
+        self::assertCount(2, $response->headers->getCookies());
         $this->assertHasCookie(self::KEEP_COOKIE_NAME, $response);
         $this->assertHasCookie(self::KEEP_REGED_EXAMPLE, $response);
     }
@@ -119,8 +119,8 @@ public function testAddFLoCPolicy(): void
         $subscriber = new KernelEventSubscriber(null, false);
         $subscriber->addFLoCPolicy($event);
 
-        static::assertTrue($response->headers->has('Permissions-Policy'));
-        static::assertSame('interest-cohort=()', $response->headers->get('Permissions-Policy'));
+        self::assertTrue($response->headers->has('Permissions-Policy'));
+        self::assertSame('interest-cohort=()', $response->headers->get('Permissions-Policy'));
     }
 
     public function testAddFLoCPolicyWithDisabledOption(): void
@@ -137,12 +137,12 @@ public function testAddFLoCPolicyWithDisabledOption(): void
         $subscriber = new KernelEventSubscriber(null, true);
         $subscriber->addFLoCPolicy($event);
 
-        static::assertFalse($response->headers->has('Permissions-Policy'));
+        self::assertFalse($response->headers->has('Permissions-Policy'));
     }
 
     private function assertHasCookie(string $cookieName, Response $response): void
     {
-        static::assertCount(1, array_filter($response->headers->getCookies(), static function (Cookie $cookie) use ($cookieName): bool {
+        self::assertCount(1, array_filter($response->headers->getCookies(), static function (Cookie $cookie) use ($cookieName): bool {
             return $cookie->getName() === $cookieName;
         }));
     }

tests/NucleosGDPRBundleTest.php

@@ -23,6 +23,6 @@ public function testGetContainerExtension(): void
     {
         $bundle = new NucleosGDPRBundle();
 
-        static::assertInstanceOf(NucleosGDPRExtension::class, $bundle->getContainerExtension());
+        self::assertInstanceOf(NucleosGDPRExtension::class, $bundle->getContainerExtension());
     }
 }