Merge pull request #1391 from hydephp/fix-wrong-version-constant

emmadesilva · web-flow · commit 9e6fa3edb123 · 2023-10-19T16:22:51.000+02:00
Fix wrong version constant
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
@@ -49,7 +49,7 @@ class HydeKernel implements SerializableContract
     use Serializable;
     use Macroable;
 
-    final public const VERSION = '1.1.0';
+    final public const VERSION = '1.2.0';
 
     protected static self $instance;
 
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Throwable;
 use Composer\InstalledVersions;
 use Hyde\Facades\Features;
 use Hyde\Foundation\Facades\Pages;
@@ -294,11 +295,30 @@ public function test_version_constant_is_a_valid_semver_string()
         );
     }
 
-    public function test_version_constant_is_up_to_date()
+    public function test_version_constant_is_up_to_date_with_composer()
     {
-        $this->assertTrue(version_compare(
-            HydeKernel::VERSION, InstalledVersions::getPrettyVersion('hyde/framework')
-        ) >= 0);
+        $version = InstalledVersions::getPrettyVersion('hyde/framework');
+
+        if (str_starts_with($version, 'dev-')) {
+            $this->markTestSkipped('Installed version is for development');
+        }
+
+        $this->assertSame(HydeKernel::VERSION, $version);
+    }
+
+    public function test_version_constant_is_up_to_date_with_git()
+    {
+        try {
+            $version = trim(shell_exec('git describe --abbrev=0 --tags'));
+        } catch (Throwable) {
+            $this->markTestSkipped('Could not get version from Git');
+        }
+
+        if ('v'.HydeKernel::VERSION === $version) {
+            $this->assertSame('v'.HydeKernel::VERSION, $version);
+        } else {
+            $this->markTestSkipped('Version constant does not match Git version!');
+        }
     }
 
     public function test_version_method_returns_version_constant()
