Merge branch '10.5'

sebastianbergmann · Jan 18, 2024 · d257301 · d257301
2 parents 546cd50 + cb04e88
commit d257301
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetectionResult.php b/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetectionResult.php
@@ -18,6 +18,9 @@
  */
 abstract readonly class SchemaDetectionResult
 {
+    /**
+     * @psalm-assert-if-true SuccessfulSchemaDetectionResult $this
+     */
     public function detected(): bool
     {
         return false;

diff --git a/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetector.php b/src/TextUI/Configuration/Xml/SchemaDetector/SchemaDetector.php
@@ -26,12 +26,16 @@ public function detect(string $filename): SchemaDetectionResult
 
         $schemaFinder = new SchemaFinder;
 
+        $tried = [];
+
         foreach ($schemaFinder->available() as $candidate) {
             $schema = (new SchemaFinder)->find($candidate);
 
             if (!(new Validator)->validate($document, $schema)->hasValidationErrors()) {
-                return new SuccessfulSchemaDetectionResult($candidate);
+                return new SuccessfulSchemaDetectionResult($candidate, $tried);
             }
+
+            $tried[] = $candidate;
         }
 
         return new FailedSchemaDetectionResult;

diff --git a/src/TextUI/Configuration/Xml/SchemaDetector/SuccessfulSchemaDetectionResult.php b/src/TextUI/Configuration/Xml/SchemaDetector/SuccessfulSchemaDetectionResult.php
@@ -16,20 +16,47 @@
  */
 final readonly class SuccessfulSchemaDetectionResult extends SchemaDetectionResult
 {
+    /**
+     * @psalm-var non-empty-string
+     */
     private string $version;
 
-    public function __construct(string $version)
+    /**
+     * @psalm-var list<non-empty-string>
+     */
+    private array $tried;
+
+    /**
+     * @psalm-param non-empty-string $version
+     * @psalm-param list<non-empty-string> $tried
+     */
+    public function __construct(string $version, array $tried)
     {
         $this->version = $version;
+        $this->tried   = $tried;
     }
 
+    /**
+     * @psalm-assert-if-true SuccessfulSchemaDetectionResult $this
+     */
     public function detected(): bool
     {
         return true;
     }
 
+    /**
+     * @psalm-return non-empty-string
+     */
     public function version(): string
     {
         return $this->version;
     }
+
+    /**
+     * @psalm-return list<non-empty-string>
+     */
+    public function tried(): array
+    {
+        return $this->tried;
+    }
 }