Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 144f13a38df5 · 2025-05-10T15:41:10.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -9593,9 +9593,11 @@
       <code><![CDATA[$context]]></code>
       <code><![CDATA[$context]]></code>
       <code><![CDATA[$filesFound]]></code>
-      <code><![CDATA[$filesFound]]></code>
       <code><![CDATA[$filesInfos]]></code>
     </MixedAssignment>
+    <PossiblyUndefinedArrayOffset>
+      <code><![CDATA[$filesFound[0]['exception']]]></code>
+    </PossiblyUndefinedArrayOffset>
   </file>
   <file src="tests/unit/Config/ConfigFileTest.php">
     <MixedArrayAccess>
diff --git a/resources/js/src/table/gis_visualization.ts b/resources/js/src/table/gis_visualization.ts
@@ -432,7 +432,14 @@ class OlVisualization extends GisVisualization {
             return undefined;
         }
 
-        $('head').append('<link rel="stylesheet" type="text/css" href="js/vendor/openlayers/theme/ol.css">');
+        const olCss = 'js/vendor/openlayers/theme/ol.css';
+        if (! document.querySelector('link[rel="stylesheet"][href="' + olCss + '"]')) {
+            const link = document.createElement('link');
+            link.rel = 'stylesheet';
+            link.type = 'text/css';
+            link.href = olCss;
+            document.head.appendChild(link);
+        }
 
         const vectorSource = new window.ol.source.Vector({
             features: getFeaturesFromOpenLayersData(this.data),
diff --git a/src/Command/TwigLintCommand.php b/src/Command/TwigLintCommand.php
@@ -139,7 +139,7 @@ static function (int $level, string $message, string $file, int $line) use (&$pr
     }
 
     /** @return array{template: string, file: string, exception?:Error}[] */
-    protected function getFilesInfo(string $templatesPath): array
+    public function getFilesInfo(string $templatesPath): array
     {
         $filesInfo = [];
         $filesFound = $this->findFiles($templatesPath);
diff --git a/tests/unit/Command/TwigLintCommandTest.php b/tests/unit/Command/TwigLintCommandTest.php
@@ -10,7 +10,6 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use Symfony\Component\Console\Command\Command;
 use Twig\Error\SyntaxError;
-use Twig\Source;
 
 use function class_exists;
 use function sort;
@@ -86,36 +85,19 @@ public function testGetFilesInfo(): void
 
     public function testGetFilesInfoInvalidFile(): void
     {
-        $command = $this->getMockBuilder(TwigLintCommand::class)
-            ->onlyMethods(['getTemplateContents', 'findFiles'])
-            ->getMock();
-
-        $command->expects(self::exactly(1))
-            ->method('findFiles')
-            ->willReturn(
-                ['foo.twig', 'foo-invalid.twig'],
-            );
-
-        $command->expects(self::exactly(2))->method('getTemplateContents')->willReturnMap([
-            ['foo.twig', '{{ file }}'],
-            ['foo-invalid.twig', '{{ file }'],
-        ]);
-
-        $filesFound = $this->callFunction($command, TwigLintCommand::class, 'getFilesInfo', [
-            __DIR__ . '/../_data/file_listing',
-        ]);
-
-        self::assertEquals([
-            ['template' => '{{ file }}', 'file' => 'foo.twig'],
-            [
-                'template' => '{{ file }',
-                'file' => 'foo-invalid.twig',
-                'exception' => new SyntaxError('Unexpected "}".', 1, new Source(
-                    '{{ file }',
-                    'foo-invalid.twig',
-                )),
-            ],
-        ], $filesFound);
+        $twigLintCommand = new TwigLintCommand();
+        $path = __DIR__ . '/../_data/templates/lint_command';
+        $filesFound = $twigLintCommand->getFilesInfo($path);
+
+        self::assertCount(2, $filesFound);
+        self::assertSame('{{ file }' . "\n", $filesFound[0]['template']);
+        self::assertSame($path . '/foo-invalid.twig', $filesFound[0]['file']);
+        self::assertArrayHasKey('exception', $filesFound[0]);
+        $exception = $filesFound[0]['exception'];
+        self::assertInstanceOf(SyntaxError::class, $exception);
+        self::assertSame('Unexpected "}" in "' . $path . '/foo-invalid.twig" at line 1.', $exception->getMessage());
+        self::assertSame('{{ file }}' . "\n", $filesFound[1]['template']);
+        self::assertSame($path . '/foo-valid.twig', $filesFound[1]['file']);
     }
 
     public function testGetContext(): void
diff --git a/tests/unit/_data/templates/lint_command/foo-invalid.twig b/tests/unit/_data/templates/lint_command/foo-invalid.twig
@@ -0,0 +1 @@
+{{ file }
diff --git a/tests/unit/_data/templates/lint_command/foo-valid.twig b/tests/unit/_data/templates/lint_command/foo-valid.twig
@@ -0,0 +1 @@
+{{ file }}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ static function (int $level, string $message, string $file, int $line) use (&$pr`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/** @return array{template: string, file: string, exception?:Error}[] */`
`142`		`- protected function getFilesInfo(string $templatesPath): array`
	`142`	`+ public function getFilesInfo(string $templatesPath): array`
`143`	`143`	`{`
`144`	`144`	`$filesInfo = [];`
`145`	`145`	`$filesFound = $this->findFiles($templatesPath);`