Merge pull request #7913 from kenjis/test-refactor-PHP_VERSION

test: use PHP_VERSION_ID instead of PHP_VERSION
codeigniter4 · Sep 8, 2023 · 64c9a70 · 64c9a70
2 parents 63032a1 + 56d89ec
commit 64c9a70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
@@ -172,7 +172,7 @@ public function testRecordThrowsException(): void
 
     public function testRecordThrowsErrorOnCallableWithParams(): void
     {
-        if (version_compare(PHP_VERSION, '8.0.0') >= 0) {
+        if (PHP_VERSION_ID >= 80000) {
             $this->expectException(ArgumentCountError::class);
         } else {
             $this->expectException(ErrorException::class);

diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
@@ -304,10 +304,10 @@ public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, arra
     public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data): void
     {
         // PHP 8 changes this error type
-        if (version_compare(PHP_VERSION, '8.0', '<')) {
-            $this->expectException(ErrorException::class);
-        } else {
+        if (PHP_VERSION_ID >= 80000) {
             $this->expectException(ValueError::class);
+        } else {
+            $this->expectException(ErrorException::class);
         }
 
         $this->expectExceptionMessage('Array sizes are inconsistent');