Merge pull request #5 from jolicode/windows-10

Add a new helper to detect Windows >= 10

Author: pyrech

.github/workflows/ci.yml

@@ -6,8 +6,8 @@ name: Continuous Integration
     pull_request: ~
 
 jobs:
-    ci:
-        name: Run the test suite
+    ci_linux:
+        name: Run the test suite on Linux
         runs-on: ubuntu-latest
         strategy:
             matrix:
@@ -17,7 +17,7 @@ jobs:
                     - '8.4'
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -33,12 +33,52 @@ jobs:
             - name: Run tests
               run: composer test
 
+    ci_macos:
+        name: Run the test suite on macOS
+        runs-on: macos-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.4'
+
+            - name: Validate composer.json and composer.lock
+              run: composer validate --strict
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+
+            - name: Run tests
+              run: composer test
+
+    ci_windows:
+        name: Run the test suite on Windows
+        runs-on: windows-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.4'
+
+            - name: Validate composer.json and composer.lock
+              run: composer validate --strict
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+
+            - name: Run tests
+              run: composer test
+
     php-cs-fixer:
         name: Run PHP CS Fixer
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -56,7 +96,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Drop support of PHP 8.1
 * Add support of PHP 8.4
+* Add new helper `OsHelper::isWindowsTenOrHigher()`
 
 ## 0.2.0 (2024-10-02)
 

README.md

@@ -19,6 +19,7 @@ OsHelper::isUnix(); // true or false
 OsHelper::isWindows(); // true or false
 OsHelper::isWindowsSeven(); // true or false
 OsHelper::isWindowsEightOrHigher(); // true or false
+OsHelper::isWindowsTenOrHigher(); // true or false
 OsHelper::isWindowsSubsystemForLinux(); // true or false
 OsHelper::isMacOs(); // true or false
 OsHelper::isDocker(); // true or false

src/OsHelper.php

@@ -41,6 +41,15 @@ public static function isWindowsEightOrHigher(): bool
         return version_compare(self::$kernelVersion, '6.2', '>=');
     }
 
+    public static function isWindowsTenOrHigher(): bool
+    {
+        if (!isset(self::$kernelVersion)) {
+            self::$kernelVersion = php_uname('r');
+        }
+
+        return version_compare(self::$kernelVersion, '6.4', '>=');
+    }
+
     public static function isMacOS(): bool
     {
         if (!isset(self::$kernelName)) {

tests/OsHelperTest.php

@@ -50,13 +50,28 @@ public function testIsWindowsEightOrHigher()
             '6.2', // 8
             '6.3', // 8.1
             '6.4', // 10
-            '10', // 10 or 11, yeah microsoft is doing weird things
+            '10.0', // 10 or 11, yeah microsoft is doing weird things
         ];
         $isEightOrHigher = \in_array(php_uname('r'), $eightOrHigher, true);
 
         $this->assertSame($isEightOrHigher, OsHelper::isWindowsEightOrHigher());
     }
 
+    public function testIsWindowsTenOrHigher()
+    {
+        if (!OsHelper::isWindows()) {
+            $this->markTestSkipped('Can only be run on Windows');
+        }
+
+        $tenOrHigher = [
+            '6.4', // 10
+            '10.0', // 10 or 11, yeah microsoft is doing weird things
+        ];
+        $isTenOrHigher = \in_array(php_uname('r'), $tenOrHigher, true);
+
+        $this->assertSame($isTenOrHigher, OsHelper::isWindowsTenOrHigher());
+    }
+
     public function testIsMacOS()
     {
         $uname = php_uname();
@@ -82,7 +97,7 @@ public function testGetMacOSVersion()
 
         $macOsVersion = OsHelper::getMacOSVersion();
 
-        $this->assertRegExp('#\d{1,2}\.\d{1,2}(\.\d{1,2})?#', $macOsVersion);
+        $this->assertMatchesRegularExpression('#\d{1,2}\.\d{1,2}(\.\d{1,2})?#', $macOsVersion);
         $this->assertSame($expectedMacOsVersion, $macOsVersion);
     }
 }