Merge pull request #346 from asgrim/dep-updates

Dep updates and bump composer versions

Author: asgrim

.github/workflows/continuous-integration.yml

@@ -54,9 +54,9 @@ jobs:
         php-versions:
           - '8.1.33'
           - '8.2.29'
-          - '8.3.23'
-          - '8.4.10'
-          - '8.5.0alpha2'
+          - '8.3.25'
+          - '8.4.12'
+          - '8.5.0beta2'
     steps:
       - name: "Purge built-in PHP version"
         run: |
@@ -97,7 +97,7 @@ jobs:
         run: echo "php_src_download_url=https://www.php.net/distributions/php-${{ matrix.php-versions }}.tar.gz" >> $GITHUB_ENV
       - name: "Set php-src download URL (8.5 pre-release)"
         if: ${{ startsWith(matrix.php-versions, '8.5.') }}
-        run: echo "php_src_download_url=https://downloads.php.net/~edorian/php-${{ matrix.php-versions }}.tar.gz" >> $GITHUB_ENV
+        run: echo "php_src_download_url=https://downloads.php.net/~daniels/php-${{ matrix.php-versions }}.tar.gz" >> $GITHUB_ENV
       - name: "Install PHP ${{ matrix.php-versions }}"
         run: |
           mkdir -p /tmp/php

composer.json

@@ -28,15 +28,15 @@
     ],
     "require": {
         "php": "8.1.*||8.2.*||8.3.*||8.4.*||8.5.*",
-        "composer/composer": "^2.8.10",
+        "composer/composer": "^2.8.11",
         "composer/pcre": "^3.3.2",
-        "composer/semver": "^3.4.3",
-        "fidry/cpu-core-counter": "^1.2",
+        "composer/semver": "^3.4.4",
+        "fidry/cpu-core-counter": "^1.3.0",
         "illuminate/container": "^10.48.28",
         "psr/container": "^2.0.2",
-        "symfony/console": "^6.4.24",
+        "symfony/console": "^6.4.25",
         "symfony/event-dispatcher": "^6.4.24",
-        "symfony/process": "^6.4.24",
+        "symfony/process": "^6.4.25",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
@@ -45,7 +45,7 @@
         "doctrine/coding-standard": "^13.0.1",
         "phpunit/phpunit": "^10.5.48",
         "psalm/plugin-phpunit": "^0.19.5",
-        "vimeo/psalm": "^6.13.0"
+        "vimeo/psalm": "^6.13.1"
     },
     "replace": {
         "symfony/polyfill-php81": "*",

composer.lock

@@ -96,7 +96,7 @@ class BundledPhpExtensionsRepository extends ArrayRepository
         [
             'name' => 'opcache',
             'type' => ExtensionType::ZendExtension,
-            'require' => ['php' => '>= 5.5.0'],
+            'require' => ['php' => '>= 5.5.0, < 8.5.0'],
         ],
 //        ['name' => 'openssl'], // Not building in CI
         ['name' => 'pcntl'],

src/ComposerIntegration/BundledPhpExtensionsRepository.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Composer\Package\PackageInterface;
+use Composer\Package\Version\VersionParser;
 use Php\Pie\ComposerIntegration\BundledPhpExtensionsRepository;
 use Php\Pie\Platform\TargetPhp\PhpBinaryPath;
 use Php\Pie\Platform\TargetPlatform;
@@ -17,17 +18,26 @@
     exit(1);
 }
 
-$phpBinaryPath = PhpBinaryPath::fromPhpConfigExecutable($phpConfigPath);
+$phpBinaryPath        = PhpBinaryPath::fromPhpConfigExecutable($phpConfigPath);
+$phpVersionConstraint = (new VersionParser())->parseConstraints($phpBinaryPath->version());
 
 $packageNames = array_map(
     static fn (PackageInterface $package): string => $package->getName(),
-    BundledPhpExtensionsRepository::forTargetPlatform(
-        TargetPlatform::fromPhpBinaryPath(
-            $phpBinaryPath,
-            null,
-        ),
-    )
-        ->getPackages(),
+    array_filter(
+        BundledPhpExtensionsRepository::forTargetPlatform(
+            TargetPlatform::fromPhpBinaryPath(
+                $phpBinaryPath,
+                null,
+            ),
+        )
+            ->getPackages(),
+        static function (PackageInterface $package) use ($phpVersionConstraint): bool {
+            $requires = $package->getRequires();
+
+            return ! array_key_exists('php', $requires)
+                || $requires['php']->getConstraint()->matches($phpVersionConstraint);
+        },
+    ),
 );
 
 $anyFailures = false;