Extract MatrixInterface::lowestAndHighest into static class `Versio…

…ns` (#16)
typisttech · Dec 24, 2024 · ecf8c5f · ecf8c5f
1 parent e8b84da
commit ecf8c5f
Show file tree

Hide file tree

Showing 234 changed files with 9,375 additions and 9,331 deletions.
diff --git a/README.md b/README.md
@@ -30,16 +30,16 @@ $ php-matrix "^7 || ^8"
 {
     "constraint": "^7 || ^8",
     "versions": [
-        "7.4",
-        "7.3",
-        "7.2",
-        "7.1",
         "7.0",
-        "8.4",
-        "8.3",
-        "8.2",
+        "7.1",
+        "7.2",
+        "7.3",
+        "7.4",
+        "8.0",
         "8.1",
-        "8.0"
+        "8.2",
+        "8.3",
+        "8.4"
     ],
     "lowest": "7.0",
     "highest": "8.4"
@@ -49,13 +49,13 @@ $ php-matrix --mode=full  "~7.4.29 || ~8.1.29"
 {
     "constraint": "~7.4.29 || ~8.1.29",
     "versions": [
-        "7.4.33",
-        "7.4.32",
-        "7.4.30",
         "7.4.29",
-        "8.1.31",
+        "7.4.30",
+        "7.4.32",
+        "7.4.33",
+        "8.1.29",
         "8.1.30",
-        "8.1.29"
+        "8.1.31"
     ],
     "lowest": "7.4.29",
     "highest": "8.1.31"
@@ -65,13 +65,13 @@ $ php-matrix --mode=minor-only  ">=7.2 <8.4"
 {
     "constraint": ">=7.2 <8.4",
     "versions": [
-        "7.4",
-        "7.3",
         "7.2",
-        "8.3",
-        "8.2",
+        "7.3",
+        "7.4",
+        "8.0",
         "8.1",
-        "8.0"
+        "8.2",
+        "8.3"
     ],
     "lowest": "7.2",
     "highest": "8.3"

diff --git a/src/Console/Command.php b/src/Console/Command.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use TypistTech\PhpMatrix\Versions;
 
 #[AsCommand(
     name: 'php-matrix',
@@ -118,14 +119,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             );
         }
 
-        [$lowest, $highest] = $matrix->lowestAndHighest(...$versions);
-
         $result = json_encode(
             (object) [
                 self::CONSTRAINT_ARGUMENT_NAME => $constraint,
-                'versions' => $versions,
-                'lowest' => $lowest,
-                'highest' => $highest,
+                'versions' => Versions::sort(...$versions),
+                'lowest' => Versions::lowest(...$versions),
+                'highest' => Versions::highest(...$versions),
             ],
             JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT
         );

diff --git a/src/Matrix.php b/src/Matrix.php
@@ -22,16 +22,4 @@ public function satisfiedBy(string $constraint): array
             $constraint
         );
     }
-
-    public function lowestAndHighest(string $version, string ...$versions): array
-    {
-        if (empty($versions)) {
-            return [$version, $version];
-        }
-
-        $sorted = Semver::sort([$version, ...$versions]);
-        $count = count($sorted);
-
-        return [$sorted[0], $sorted[$count - 1]];
-    }
 }
diff --git a/src/MatrixInterface.php b/src/MatrixInterface.php
@@ -10,9 +10,4 @@ interface MatrixInterface
      * @return string[]
      */
     public function satisfiedBy(string $constraint): array;
-
-    /**
-     * @return string[]
-     */
-    public function lowestAndHighest(string $version, string ...$versions): array;
 }
diff --git a/src/Versions.php b/src/Versions.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypistTech\PhpMatrix;
+
+use Composer\Semver\Semver;
+use UnexpectedValueException;
+
+readonly class Versions
+{
+    public static function sort(string ...$versions): array
+    {
+        if (empty($versions)) {
+            throw new UnexpectedValueException('Argument #1 ($versions) must not be empty');
+        }
+
+        return Semver::sort($versions);
+    }
+
+    public static function lowest(string ...$versions): string
+    {
+        $sorted = self::sort(...$versions);
+
+        return $sorted[0];
+    }
+
+    public static function highest(string ...$versions): string
+    {
+        $sorted = self::sort(...$versions);
+
+        return $sorted[array_key_last($sorted)];
+    }
+}
diff --git a/...mand__→_it_fails_with_data_set_____4_______auto_______full_______4____auto____full__.snap b/...mand__→_it_fails_with_data_set_____4_______auto_______full_______4____auto____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...ails_with_data_set_____4_______auto_______minor_only_______4____auto____minor_only__.snap b/...ails_with_data_set_____4_______auto_______minor_only_______4____auto____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...ails_with_data_set_____4_______auto_______not_a_mode_______4____auto____not_a_mode__.snap b/...ails_with_data_set_____4_______auto_______not_a_mode_______4____auto____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]  
 

diff --git a/..._Command__→_it_fails_with_data_set_____4_______auto______null______4____auto___null_.snap b/..._Command__→_it_fails_with_data_set_____4_______auto______null______4____auto___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/..._with_data_set_____4_______not_a_source_______full_______4____not_a_source____full__.snap b/..._with_data_set_____4_______not_a_source_______full_______4____not_a_source____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/...et_____4_______not_a_source_______minor_only_______4____not_a_source____minor_only__.snap b/...et_____4_______not_a_source_______minor_only_______4____not_a_source____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/...et_____4_______not_a_source_______not_a_mode_______4____not_a_source____not_a_mode__.snap b/...et_____4_______not_a_source_______not_a_mode_______4____not_a_source____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/...ails_with_data_set_____4_______not_a_source______null______4____not_a_source___null_.snap b/...ails_with_data_set_____4_______not_a_source______null______4____not_a_source___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/...→_it_fails_with_data_set_____4_______offline_______full_______4____offline____full__.snap b/...→_it_fails_with_data_set_____4_______offline_______full_______4____offline____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...ith_data_set_____4_______offline_______minor_only_______4____offline____minor_only__.snap b/...ith_data_set_____4_______offline_______minor_only_______4____offline____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...ith_data_set_____4_______offline_______not_a_mode_______4____offline____not_a_mode__.snap b/...ith_data_set_____4_______offline_______not_a_mode_______4____offline____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]  
 

diff --git a/...nd__→_it_fails_with_data_set_____4_______offline______null______4____offline___null_.snap b/...nd__→_it_fails_with_data_set_____4_______offline______null______4____offline___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...→_it_fails_with_data_set_____4_______php_net_______full_______4____php_net____full__.snap b/...→_it_fails_with_data_set_____4_______php_net_______full_______4____php_net____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...ith_data_set_____4_______php_net_______minor_only_______4____php_net____minor_only__.snap b/...ith_data_set_____4_______php_net_______minor_only_______4____php_net____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...ith_data_set_____4_______php_net_______not_a_mode_______4____php_net____not_a_mode__.snap b/...ith_data_set_____4_______php_net_______not_a_mode_______4____php_net____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]  
 

diff --git a/...nd__→_it_fails_with_data_set_____4_______php_net______null______4____php_net___null_.snap b/...nd__→_it_fails_with_data_set_____4_______php_net______null______4____php_net___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/..._Command__→_it_fails_with_data_set_____4______null______full_______4___null___full__.snap b/..._Command__→_it_fails_with_data_set_____4______null______full_______4___null___full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...it_fails_with_data_set_____4______null______minor_only_______4___null___minor_only__.snap b/...it_fails_with_data_set_____4______null______minor_only_______4___null___minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...it_fails_with_data_set_____4______null______not_a_mode_______4___null___not_a_mode__.snap b/...it_fails_with_data_set_____4______null______not_a_mode_______4___null___not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]  
 

diff --git a/...sole_Command__→_it_fails_with_data_set_____4______null_____null______4___null__null_.snap b/...sole_Command__→_it_fails_with_data_set_____4______null_____null______4___null__null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^4'.  
 

diff --git a/...it_fails_with_data_set_____7_999_______auto_______full_______7_999____auto____full__.snap b/...it_fails_with_data_set_____7_999_______auto_______full_______7_999____auto____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/...h_data_set_____7_999_______auto_______minor_only_______7_999____auto____minor_only__.snap b/...h_data_set_____7_999_______auto_______minor_only_______7_999____auto____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/...h_data_set_____7_999_______auto_______not_a_mode_______7_999____auto____not_a_mode__.snap b/...h_data_set_____7_999_______auto_______not_a_mode_______7_999____auto____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]  
 

diff --git a/...__→_it_fails_with_data_set_____7_999_______auto______null______7_999____auto___null_.snap b/...__→_it_fails_with_data_set_____7_999_______auto______null______7_999____auto___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/...ta_set_____7_999_______not_a_source_______full_______7_999____not_a_source____full__.snap b/...ta_set_____7_999_______not_a_source_______full_______7_999____not_a_source____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/..._999_______not_a_source_______minor_only_______7_999____not_a_source____minor_only__.snap b/..._999_______not_a_source_______minor_only_______7_999____not_a_source____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/..._999_______not_a_source_______not_a_mode_______7_999____not_a_source____not_a_mode__.snap b/..._999_______not_a_source_______not_a_mode_______7_999____not_a_source____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/...h_data_set_____7_999_______not_a_source______null______7_999____not_a_source___null_.snap b/...h_data_set_____7_999_______not_a_source______null______7_999____not_a_source___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 86:
+In Command.php line 87:
 
   Error! Invalid source 'not-a-source'. Available sources: [auto, php.net, of  
   fline]                                                                       

diff --git a/...ls_with_data_set_____7_999_______offline_______full_______7_999____offline____full__.snap b/...ls_with_data_set_____7_999_______offline_______full_______7_999____offline____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/..._set_____7_999_______offline_______minor_only_______7_999____offline____minor_only__.snap b/..._set_____7_999_______offline_______minor_only_______7_999____offline____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/..._set_____7_999_______offline_______not_a_mode_______7_999____offline____not_a_mode__.snap b/..._set_____7_999_______offline_______not_a_mode_______7_999____offline____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]  
 

diff --git a/..._fails_with_data_set_____7_999_______offline______null______7_999____offline___null_.snap b/..._fails_with_data_set_____7_999_______offline______null______7_999____offline___null_.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/...ls_with_data_set_____7_999_______php_net_______full_______7_999____php_net____full__.snap b/...ls_with_data_set_____7_999_______php_net_______full_______7_999____php_net____full__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/..._set_____7_999_______php_net_______minor_only_______7_999____php_net____minor_only__.snap b/..._set_____7_999_______php_net_______minor_only_______7_999____php_net____minor_only__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 116:
+In Command.php line 117:
 
   Error! No PHP versions could satisfy the constraint '^7.999'.  
 

diff --git a/..._set_____7_999_______php_net_______not_a_mode_______7_999____php_net____not_a_mode__.snap b/..._set_____7_999_______php_net_______not_a_mode_______7_999____php_net____not_a_mode__.snap
@@ -1,5 +1,5 @@
 
-In Command.php line 99:
+In Command.php line 100:
 
   Error! Invalid mode 'not-a-mode'. Available modes: [full, minor-only]