Merge pull request #32 from asgrim/php84-support

PHP 8.4 support
php · Oct 9, 2024 · 51f0d50 · 51f0d50
2 parents bbb9b6b + 1dd4e7e
commit 51f0d50
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 44 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -16,6 +16,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -25,6 +26,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v4
+      # temporarily remove Psalm until ready for PHP 8.4
+      - name: remove psalm
+        if: matrix.php-versions == '8.4'
+        run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit php-standard-library/psalm-plugin
       - uses: ramsey/composer-install@v3
       - name: Run PHPUnit on Windows
         if: matrix.operating-system == 'windows-latest'
@@ -44,6 +49,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -53,6 +59,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v4
+      # temporarily remove Psalm until ready for PHP 8.4
+      - name: remove psalm
+        if: matrix.php-versions == '8.4'
+        run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit php-standard-library/psalm-plugin
       - uses: ramsey/composer-install@v3
       - name: Run Behat on Windows
         if: matrix.operating-system == 'windows-latest'

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         }
     ],
     "require": {
-        "php": "8.1.*||8.2.*||8.3.*",
+        "php": "8.1.*||8.2.*||8.3.*||8.4.*",
         "ext-zip": "*",
         "composer/composer": "dev-main@dev",
         "guzzlehttp/guzzle": "^7.8",

diff --git a/composer.lock b/composer.lock
diff --git a/features/install-extensions.feature b/features/install-extensions.feature
@@ -10,8 +10,8 @@ Feature: Extensions can be installed with Behat
 
     Examples:
       | constraint | version  |
-      | 2.0.0      | 2.0.0    |
-      | ^2.0       | 2.0.0    |
+      | 2.0.2      | 2.0.2    |
+      | ^2.0       | 2.0.2    |
 
   @non-windows
   Example: An in-development version can be downloaded on non-Windows systems

diff --git a/src/Platform/TargetPlatform.php b/src/Platform/TargetPlatform.php
@@ -115,6 +115,9 @@ public static function fromPhpBinaryPath(PhpBinaryPath $phpBinaryPath): self
                     case 'VS16':
                         $windowsCompiler = WindowsCompiler::VS16;
                         break;
+                    case 'VS17':
+                        $windowsCompiler = WindowsCompiler::VS17;
+                        break;
                 }
             }
         }

diff --git a/src/Platform/WindowsCompiler.php b/src/Platform/WindowsCompiler.php
@@ -14,4 +14,5 @@ enum WindowsCompiler
     case VC14;
     case VC15;
     case VS16;
+    case VS17;
 }
diff --git a/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.4-ts-vs16-x86_64.dll b/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.4-ts-vs16-x86_64.dll
@@ -0,0 +1 @@
+only a test file
diff --git a/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.4-ts-vs16-x86_64.pdb b/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.4-ts-vs16-x86_64.pdb
@@ -0,0 +1 @@
+only a test file
diff --git a/test/integration/Command/DownloadCommandTest.php b/test/integration/Command/DownloadCommandTest.php
@@ -46,12 +46,12 @@ public function setUp(): void
     public static function validVersionsList(): array
     {
         $versionsAndExpected = [
-            [self::TEST_PACKAGE, self::TEST_PACKAGE . ':2.0.0'],
-            [self::TEST_PACKAGE . ':*', self::TEST_PACKAGE . ':2.0.0'],
-            [self::TEST_PACKAGE . ':^2.0', self::TEST_PACKAGE . ':2.0.0'],
+            [self::TEST_PACKAGE, self::TEST_PACKAGE . ':2.0.2'],
+            [self::TEST_PACKAGE . ':*', self::TEST_PACKAGE . ':2.0.2'],
+            [self::TEST_PACKAGE . ':^2.0', self::TEST_PACKAGE . ':2.0.2'],
         ];
 
-        if (PHP_VERSION_ID >= 80300 && PHP_VERSION_ID <= 80400) {
+        if (PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400) {
             $versionsAndExpected[] = [self::TEST_PACKAGE . ':^1.0', self::TEST_PACKAGE . ':1.0.1'];
             $versionsAndExpected[] = [self::TEST_PACKAGE . ':1.0.1-alpha.3@alpha', self::TEST_PACKAGE . ':1.0.1-alpha.3'];
             $versionsAndExpected[] = [self::TEST_PACKAGE . ':~1.0.0@alpha', self::TEST_PACKAGE . ':1.0.1'];

diff --git a/test/integration/DependencyResolver/ResolveDependencyWithComposerTest.php b/test/integration/DependencyResolver/ResolveDependencyWithComposerTest.php
@@ -34,13 +34,13 @@ final class ResolveDependencyWithComposerTest extends TestCase
     public static function validVersionsList(): array
     {
         $versionsAndExpected = [
-            [null, '2.0.0', self::DOWNLOAD_URL_ANY],
-            ['*', '2.0.0', self::DOWNLOAD_URL_ANY],
+            [null, '2.0.2', self::DOWNLOAD_URL_ANY],
+            ['*', '2.0.2', self::DOWNLOAD_URL_ANY],
             ['dev-main', 'dev-main', self::DOWNLOAD_URL_ANY],
             ['dev-main#769f906413d6d1e12152f6d34134cbcd347ca253', 'dev-main', self::DOWNLOAD_URL_1_0_1],
         ];
 
-        if (PHP_VERSION_ID >= 80300 && PHP_VERSION_ID <= 80400) {
+        if (PHP_VERSION_ID >= 80300 && PHP_VERSION_ID <= 80300) {
             $versionsAndExpected[] = ['1.0.1-alpha.3@alpha', '1.0.1-alpha.3', self::DOWNLOAD_URL_1_0_1_ALPHA_3];
             $versionsAndExpected[] = ['^1.0', '1.0.1', self::DOWNLOAD_URL_1_0_1];
             $versionsAndExpected[] = ['^1.1.0@alpha', '1.1.0-beta.1', self::DOWNLOAD_URL_1_1_0_BETA_1];