Merge remote-tracking branch 'upstream/4.x' into issue-1082/exit-code-when-fixing-stdin

Author: fredden

.github/workflows/test.yml

@@ -191,7 +191,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php == '8.5' && '8.4' || matrix.php }}
+          php-version: ${{ matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
           extensions: ${{ matrix.extensions }}
           coverage: none
@@ -207,14 +207,6 @@ jobs:
           composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
           custom-cache-suffix: $(date -u "+%Y-%m")
 
-      - name: "Install PHP again (PHP 8.5)"
-        if: ${{ matrix.php == '8.5' }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
-          coverage: none
-
       - name: Grab PHPUnit version
         id: phpunit_version
         shell: bash

tests/Core/Config/IniSetTest.php

@@ -300,10 +300,10 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
         return [
             // Using Core directives available PHP cross-version to prevent the tests failing
             // on an unavailable directive or due to an extension not being available.
-            'php.ini only option: disable_classes'     => [
-                'option'           => 'disable_classes',
-                'newValue'         => 'DateTime,DOMComment',
-                'alternativeValue' => 'DOMComment,DateTime',
+            'php.ini only option: expose_php'          => [
+                'option'           => 'expose_php',
+                'newValue'         => '0',
+                'alternativeValue' => '1',
             ],
             'INI_PERDIR option: short_open_tag (bool)' => [
                 'option'           => 'short_open_tag',

tests/Core/Ruleset/IniSetFailIniOnlyTest.xml

@@ -2,7 +2,7 @@
 <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="IniSetTest" xsi:noNamespaceSchemaLocation="phpcs.xsd">
     <description>Ruleset to test ini values which can not be changed at runtime will be reported as such when set from the ruleset.</description>
 
-    <ini name="disable_classes" value="DateTime,DOMComment"/>
+    <ini name="expose_php" value="0"/>
 
     <!-- Prevent a "no sniff were registered" error. -->
     <rule ref="Generic.PHP.BacktickOperator"/>

tests/Core/Ruleset/ProcessRulesetIniSetTest.php

@@ -116,10 +116,10 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
         return [
             // Using Core directives available PHP cross-version to prevent the tests failing
             // on an unavailable directive or due to an extension not being available.
-            'php.ini only option: disable_classes'  => [
+            'php.ini only option: expose_php'       => [
                 'standard' => __DIR__.'/IniSetFailIniOnlyTest.xml',
-                'option'   => 'disable_classes',
-                'expected' => 'DateTime,DOMComment',
+                'option'   => 'expose_php',
+                'expected' => '0',
             ],
             'INI_PERDIR option: short_open_tag'     => [
                 'standard' => __DIR__.'/IniSetFailIniPerDirTest.xml',