Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 69e125485fc6 · 2023-08-05T11:10:27.000+02:00
* 5.4:
  harden LockRegistry tests, consider PHP files only
  Psalm: Suppress UnusedConstructor errors
diff --git a/psalm.xml b/psalm.xml
@@ -38,7 +38,16 @@
                 <referencedClass name="ReflectionIntersectionType"/>
                 <referencedClass name="UnitEnum"/>
             </errorLevel>
-        </UndefinedDocblockClass>
+       </UndefinedDocblockClass>
+        <UnusedConstructor>
+            <errorLevel type="suppress">
+                <!--
+                    We use private constructors to avoid instantiation.
+                    This kind of error is bogus in most cases.
+                -->
+                <directory name="src/Symfony" />
+            </errorLevel>
+        </UnusedConstructor>
         <UndefinedAttributeClass>
             <errorLevel type="suppress">
                 <!-- These classes have been added in PHP 8.2 -->
diff --git a/src/Symfony/Component/Cache/Tests/LockRegistryTest.php b/src/Symfony/Component/Cache/Tests/LockRegistryTest.php
@@ -23,7 +23,7 @@ public function testFiles()
         }
         $lockFiles = LockRegistry::setFiles([]);
         LockRegistry::setFiles($lockFiles);
-        $expected = array_map('realpath', glob(__DIR__.'/../Adapter/*'));
+        $expected = array_map('realpath', glob(__DIR__.'/../Adapter/*.php'));
         $this->assertSame($expected, $lockFiles);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function testFiles()`
`23`	`23`	`}`
`24`	`24`	`$lockFiles = LockRegistry::setFiles([]);`
`25`	`25`	`LockRegistry::setFiles($lockFiles);`
`26`		`- $expected = array_map('realpath', glob(__DIR__.'/../Adapter/*'));`
	`26`	`+ $expected = array_map('realpath', glob(__DIR__.'/../Adapter/*.php'));`
`27`	`27`	`$this->assertSame($expected, $lockFiles);`
`28`	`28`	`}`
`29`	`29`	`}`