Merge pull request #395 from asgrim/dep-update-php85rc2

Housekeeping and dep update

Author: asgrim

.github/workflows/continuous-integration.yml

@@ -55,11 +55,11 @@ jobs:
         operating-system:
           - ubuntu-latest
         php-versions:
-          - '8.1.33'
-          - '8.2.29'
-          - '8.3.25'
-          - '8.4.12'
-          - '8.5.0beta2'
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+          - '8.5'
     steps:
       - name: "Purge built-in PHP version"
         run: |
@@ -98,10 +98,15 @@ jobs:
             libbz2-dev \
             libzip-dev
       - name: "Set php-src download URL"
-        run: echo "php_src_download_url=https://www.php.net/distributions/php-${{ matrix.php-versions }}.tar.gz" >> $GITHUB_ENV
+        if: ${{ !startsWith(matrix.php-versions, '8.5') }}
+        run: |
+          DIST_URL=`curl -fsSL "https://www.php.net/releases/index.php?json&max=1&version=${{ matrix.php-versions }}" | jq -r '.[].source[]|select(.filename|endswith(".gz")).filename'`
+          echo "php_src_download_url=https://www.php.net/distributions/$DIST_URL" >> $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/~daniels/php-${{ matrix.php-versions }}.tar.gz" >> $GITHUB_ENV
+        if: ${{ startsWith(matrix.php-versions, '8.5') }}
+        run: |
+          RC_URL=`curl -fsSL "https://www.php.net/release-candidates.php?format=json" | jq -r '.releases[]|select(.version|startswith("${{ matrix.php-versions }}")).files.gz.path'`
+          echo "php_src_download_url=$RC_URL" >> $GITHUB_ENV
       - name: "Install PHP ${{ matrix.php-versions }}"
         run: |
           mkdir -p /tmp/php

composer.json

@@ -38,14 +38,14 @@
         "symfony/event-dispatcher": "^6.4.25",
         "symfony/process": "^6.4.26",
         "thephpf/attestation": "^0.0.2",
-        "webmozart/assert": "^1.11"
+        "webmozart/assert": "^1.12"
     },
     "require-dev": {
         "ext-openssl": "*",
-        "behat/behat": "^3.24.1",
+        "behat/behat": "^3.25.0",
         "bnf/phpstan-psr-container": "^1.1",
         "doctrine/coding-standard": "^14.0.0",
-        "phpstan/phpstan": "^2.1.29",
+        "phpstan/phpstan": "^2.1.31",
         "phpunit/phpunit": "^10.5.58"
     },
     "replace": {

composer.lock

@@ -96,12 +96,6 @@ parameters:
 			count: 1
 			path: src/ComposerIntegration/Listeners/RemoveUnrelatedInstallOperations.php
 
-		-
-			message: '#^Offset ''question'' on array\{question\: Symfony\\Component\\Console\\Helper\\QuestionHelper\} on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.offset
-			count: 1
-			path: src/ComposerIntegration/MinimalHelperSet.php
-
 		-
 			message: '#^Parameter \#3 \$package of class Php\\Pie\\ComposerIntegration\\PieComposerInstaller constructor expects Composer\\Package\\BasePackage&Composer\\Package\\RootPackageInterface, Composer\\Package\\RootPackageInterface given\.$#'
 			identifier: argument.type

phpstan-baseline.neon

@@ -27,6 +27,7 @@
 use function realpath;
 use function sprintf;
 
+/** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
 class BundledPhpExtensionsRepository extends ArrayRepository
 {
     /**

src/ComposerIntegration/BundledPhpExtensionsRepository.php

@@ -11,7 +11,7 @@
 /** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
 class MinimalHelperSet extends HelperSet
 {
-    /** @param array{question: QuestionHelper} $helpers */
+    /** @param array{question?: QuestionHelper|mixed} $helpers */
     public function __construct(array $helpers)
     {
         Assert::isInstanceOf(

src/ComposerIntegration/MinimalHelperSet.php

@@ -17,6 +17,7 @@
 use function strlen;
 use function substr;
 
+/** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
 class DetermineExtensionsRequired
 {
     public static function linkFilter(Link $link): bool

src/Installing/InstallForPhpProject/DetermineExtensionsRequired.php

@@ -4,6 +4,7 @@
 
 namespace Php\Pie\SelfManage\Update;
 
+/** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
 enum Channel: string
 {
     case Stable  = 'stable';

src/SelfManage/Update/Channel.php

@@ -9,7 +9,6 @@
 /** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
 interface FetchPieRelease
 {
-    /** @throws PiePharMissingFromLatestRelease */
     public function latestReleaseMetadata(Channel $updateChannel): ReleaseMetadata;
 
     /** Download the given pie.phar and return the filename (should be a temp file) */

src/SelfManage/Update/FetchPieRelease.php

@@ -56,7 +56,6 @@ public static function fromAttestationBundleWithDsseEnvelope(array $attestation)
         $decoratedCertificate = "-----BEGIN CERTIFICATE-----\n"
             . wordwrap($attestation['bundle']['verificationMaterial']['certificate']['rawBytes'], 67, "\n", true) . "\n"
             . "-----END CERTIFICATE-----\n";
-        Assert::stringNotEmpty($decoratedCertificate);
 
         $decodedPayload = base64_decode($attestation['bundle']['dsseEnvelope']['payload']);
         Assert::stringNotEmpty($decodedPayload);