Fix CS

nucleos · Dec 5, 2023 · 961810d · 961810d
1 parent b6e127d
commit 961810d
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 38 deletions.
diff --git a/phpunit.xml.dist b/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>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,29 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="src/Block/Service/MapBlockService.php">
     <MixedAssignment>
       <code>$latitude</code>
       <code>$longitude</code>
     </MixedAssignment>
-    <PossiblyNullArgument>
-      <code><![CDATA[$blockContext->getTemplate()]]></code>
-    </PossiblyNullArgument>
-    <UnusedClosureParam>
-      <code>$value</code>
-    </UnusedClosureParam>
   </file>
   <file src="src/DependencyInjection/Configuration.php">
     <PossiblyNullReference>
       <code>end</code>
     </PossiblyNullReference>
-    <PossiblyUndefinedMethod>
-      <code>end</code>
-    </PossiblyUndefinedMethod>
-    <UnusedMethodCall>
-      <code>end</code>
-      <code>end</code>
+    <UndefinedInterfaceMethod>
       <code>end</code>
-    </UnusedMethodCall>
+    </UndefinedInterfaceMethod>
   </file>
   <file src="src/DependencyInjection/NucleosMapsExtension.php">
     <MixedArgument>

diff --git a/src/Block/Service/MapBlockService.php b/src/Block/Service/MapBlockService.php
@@ -151,9 +151,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
     {

diff --git a/src/NucleosMapsBundle.php b/src/NucleosMapsBundle.php
@@ -13,6 +13,4 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-final class NucleosMapsBundle extends Bundle
-{
-}
+final class NucleosMapsBundle extends Bundle {}
diff --git a/src/Resources/config/block.php b/src/Resources/config/block.php
@@ -24,6 +24,5 @@
             ->call('setLogger', [
                 new Reference('logger'),
             ])
-
     ;
 };
diff --git a/src/Resources/config/twig.php b/src/Resources/config/twig.php
@@ -16,6 +16,5 @@
 
         ->set(MapsExtensions::class)
             ->tag('twig.extension')
-
     ;
 };
diff --git a/tests/Block/BundleIntegrationTest.php b/tests/Block/BundleIntegrationTest.php
@@ -29,6 +29,6 @@ public function testStartup(): void
         $client = new KernelBrowser(new AppKernel());
         $client->request('GET', '/test');
 
-        static::assertSame(200, $client->getResponse()->getStatusCode());
+        self::assertSame(200, $client->getResponse()->getStatusCode());
     }
 }
diff --git a/tests/Block/Service/MapBlockServiceTest.php b/tests/Block/Service/MapBlockServiceTest.php
@@ -84,7 +84,7 @@ public function testExecute(): void
 
         $response = new Response();
 
-        $this->twig->expects(static::once())->method('render')
+        $this->twig->expects(self::once())->method('render')
             ->with(
                 '@NucleosMaps/Block/block_map.html.twig',
                 [
@@ -99,7 +99,7 @@ public function testExecute(): void
 
         $blockService = new MapBlockService($this->twig, $this->provider);
 
-        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());
     }
 }
diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
@@ -31,6 +31,6 @@ public function testOptions(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 }
diff --git a/tests/NucleosMapsBundleTest.php b/tests/NucleosMapsBundleTest.php
@@ -19,6 +19,6 @@ public function testGetContainerExtension(): void
     {
         $bundle = new NucleosMapsBundle();
 
-        static::assertInstanceOf(NucleosMapsExtension::class, $bundle->getContainerExtension());
+        self::assertInstanceOf(NucleosMapsExtension::class, $bundle->getContainerExtension());
     }
 }
diff --git a/tests/Twig/MapsExtensionsTest.php b/tests/Twig/MapsExtensionsTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
 
     public function testRenderGoogleMap(): void
     {
-        static::assertSame(
+        self::assertSame(
             '<div
                     data-controller="nucleos--maps-bundle--googlemaps"
                     data-nucleos--maps-bundle--googlemaps-latitude-value="12"
@@ -39,7 +39,7 @@ public function testRenderGoogleMap(): void
 
     public function testRenderGoogleMapWithOptapiKeyions(): void
     {
-        static::assertSame(
+        self::assertSame(
             '<div
                     data-controller="mycontroller nucleos--maps-bundle--googlemaps"
                     data-nucleos--maps-bundle--googlemaps-latitude-value="12"
@@ -68,7 +68,7 @@ class="myclass"></div>',
 
     public function testRenderOpenStreetMap(): void
     {
-        static::assertSame(
+        self::assertSame(
             '<div
                     data-controller="nucleos--maps-bundle--openstreetmap"
                     data-nucleos--maps-bundle--openstreetmap-latitude-value="12"
@@ -83,7 +83,7 @@ public function testRenderOpenStreetMap(): void
 
     public function testRenderOpenStreetMapWithOptions(): void
     {
-        static::assertSame(
+        self::assertSame(
             '<div
                     data-controller="mycontroller nucleos--maps-bundle--openstreetmap"
                     data-nucleos--maps-bundle--openstreetmap-latitude-value="12"
-Original file line number
+Diff line change
@@ Expand Up @@
             ]);
         }
-        public function validate(ErrorElement $errorElement, BlockInterface $block): void
-        {
-        }
+        public function validate(ErrorElement $errorElement, BlockInterface $block): void {}
         public function getMetadata(): MetadataInterface
         {
@@ Expand Down @@