Merge remote-tracking branch 'upstream/4.9.x' into tests/vfs-tmp

maglnet · Mar 5, 2024 · cf8fe01 · cf8fe01
2 parents e97821a + 0a6f7ba
commit cf8fe01
Show file tree

Hide file tree

Showing 19 changed files with 273 additions and 54 deletions.
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -28,7 +28,7 @@ jobs:
               uses: "actions/checkout@v4"
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.29.0"
+              uses: "shivammathur/setup-php@2.30.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"

diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml
@@ -29,7 +29,7 @@ jobs:
         uses: "actions/checkout@v4"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.29.0"
+        uses: "shivammathur/setup-php@2.30.0"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"

diff --git a/.github/workflows/phar-creation.yml b/.github/workflows/phar-creation.yml
@@ -17,7 +17,7 @@ jobs:
               uses: "actions/checkout@v4"
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.29.0"
+              uses: "shivammathur/setup-php@2.30.0"
               with:
                   coverage: "none"
                   php-version: "8.2"

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -28,7 +28,7 @@ jobs:
               uses: "actions/checkout@v4"
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.29.0"
+              uses: "shivammathur/setup-php@2.30.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -32,7 +32,7 @@ jobs:
               uses: "actions/checkout@v4"
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.29.0"
+              uses: "shivammathur/setup-php@2.30.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
@@ -65,5 +65,12 @@ jobs:
               if: ${{ matrix.dependencies == 'locked' }}
               run: "composer install --no-interaction --no-progress --no-suggest"
 
+            - name: "Compile PHAR"
+              run: |
+                php -d phar.readonly=0 vendor/bin/phing phar-build
+                # We re-run 'composer install' here as phing runs 'composer install --no-dev'.
+                # Using 'install' (not 'update' with flags) here is correct as the previous update re-wrote wrote the lock file.
+                composer --no-interaction install --no-progress
+
             - name: "Tests"
               run: "vendor/bin/phpunit --coverage-clover=clover.xml --coverage-text"
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -30,7 +30,7 @@ jobs:
               uses: "actions/checkout@v4"
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.29.0"
+              uses: "shivammathur/setup-php@2.30.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"

diff --git a/.github/workflows/require-checker.yml b/.github/workflows/require-checker.yml
@@ -28,7 +28,7 @@ jobs:
               uses: "actions/checkout@v4"
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.29.0"
+              uses: "shivammathur/setup-php@2.30.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"

diff --git a/composer.lock b/composer.lock