merger 4.7.x

maglnet · Sep 18, 2023 · d522c01 · d522c01
2 parents ba557f2 + 6ec1c84
commit d522c01
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -28,7 +28,7 @@ jobs:
               uses: "actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac" # v4
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.24.0"
+              uses: "shivammathur/setup-php@2.26.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@3df4ab11eba7bda6032a0b82a6bb43b11571feac" # v4
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.24.0"
+        uses: "shivammathur/setup-php@2.26.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@3df4ab11eba7bda6032a0b82a6bb43b11571feac" # v4
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.24.0"
+              uses: "shivammathur/setup-php@2.26.0"
               with:
                   coverage: "none"
                   php-version: "8.1"

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

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -33,7 +33,7 @@ jobs:
               uses: "actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac" # v4
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.24.0"
+              uses: "shivammathur/setup-php@2.26.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -30,7 +30,7 @@ jobs:
               uses: "actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac" # v4
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.24.0"
+              uses: "shivammathur/setup-php@2.26.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@3df4ab11eba7bda6032a0b82a6bb43b11571feac" # v4
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.24.0"
+              uses: "shivammathur/setup-php@2.26.0"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"

diff --git a/composer.lock b/composer.lock
diff --git a/test/ComposerRequireCheckerTest/JsonLoaderTest.php b/test/ComposerRequireCheckerTest/JsonLoaderTest.php
@@ -9,7 +9,9 @@
 use ComposerRequireChecker\JsonLoader;
 use PHPUnit\Framework\TestCase;
 
-use function file_exists;
+use function is_readable;
+
+use const PHP_OS_FAMILY;
 
 /** @covers \ComposerRequireChecker\JsonLoader */
 final class JsonLoaderTest extends TestCase
@@ -35,8 +37,8 @@ public function testHasErrorWithInvalidFile(): void
     public function testHasErrorWithUnreadableFile(): void
     {
         $path = '/etc/shadow';
-        if (! file_exists($path)) {
-            $this->markTestSkipped('This system does not have ' . $path);
+        if (PHP_OS_FAMILY !== 'Linux' || is_readable($path)) {
+            $this->markTestSkipped('This test relies on ' . $path . ' existing, but being unreadable.');
         }
 
         $this->expectException(NotReadable::class);