Merge pull request #24 from creative-commoners/pulls/1.0/watea

FIX Add conditional before adding
silverstripe · Aug 28, 2023 · 8bc5884 · 8bc5884
2 parents e5ce291 + 46e9d90
commit 8bc5884
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/funcs.php b/funcs.php
@@ -60,7 +60,9 @@ function branches(
     }
     if (!$version) {
         $version = preg_replace('#[^0-9\.]#', '', $json->require->{'silverstripe/assets'} ?? '');
-        $matchedOnBranchThreeLess = true;
+        if ($version) {
+            $matchedOnBranchThreeLess = true;
+        }
     }
     if (!$version) {
         $version = preg_replace('#[^0-9\.]#', '', $json->require->{'cwp/starter-theme'} ?? '');

diff --git a/tests/BranchesTest.php b/tests/BranchesTest.php
@@ -357,6 +357,10 @@ public function provideBranches()
                 EOT,
                 'branchesJson' => <<<EOT
                 [
+                    {"name": "1"},
+                    {"name": "1.0"},
+                    {"name": "2"},
+                    {"name": "2.0"},
                     {"name": "3"},
                     {"name": "3.0"},
                     {"name": "3.1"},