Merge branch '2.17'

PHP-CS-Fixer · Dec 17, 2020 · 35db9e9 · 35db9e9
2 parents 39888ba + 302ba4a
commit 35db9e9
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 1 deletion.
diff --git a/doc/rules/php_unit/php_unit_dedicate_assert_internal_type.rst b/doc/rules/php_unit/php_unit_dedicate_assert_internal_type.rst
@@ -30,6 +30,26 @@ Example #1
 
 *Default* configuration.
 
+.. code-block:: diff
+
+   --- Original
+   +++ New
+   @@ -3,7 +3,7 @@
+    {
+        public function testMe()
+        {
+   -        $this->assertInternalType("array", $var);
+   -        $this->assertInternalType("boolean", $var);
+   +        $this->assertIsArray($var);
+   +        $this->assertIsBool($var);
+        }
+    }
+
+Example #2
+~~~~~~~~~~
+
+With configuration: ``['target' => '7.5']``.
+
 .. code-block:: diff
 
    --- Original

diff --git a/doc/usage.rst b/doc/usage.rst
@@ -184,6 +184,18 @@ Then, add the following command to your CI:
 
 Where ``$COMMIT_RANGE`` is your range of commits, e.g. ``$TRAVIS_COMMIT_RANGE`` or ``HEAD~..HEAD``.
 
+Environment options
+-------------------
+
+The ``PHP_CS_FIXER_IGNORE_ENV`` environment variable can be used to ignore any environment requirements.
+This includes requirements like missing PHP extensions, unsupported PHP versions or by using HHVM.
+
+NOTE: Execution may be unstable when used.
+
+.. code-block:: console
+
+    $ PHP_CS_FIXER_IGNORE_ENV=1 php php-cs-fixer.phar fix /path/to/dir
+
 Exit code
 ---------
 

diff --git a/php-cs-fixer b/php-cs-fixer
@@ -29,6 +29,10 @@ if (defined('HHVM_VERSION_ID')) {
     if (getenv('PHP_CS_FIXER_IGNORE_ENV')) {
         fwrite(STDERR, "Ignoring environment requirements because `PHP_CS_FIXER_IGNORE_ENV` is set. Execution may be unstable.\n");
     } else {
+        fwrite(STDERR, "To ignore this requirement please set `PHP_CS_FIXER_IGNORE_ENV`.\n");
+        fwrite(STDERR, "If you use PHP version higher than supported, you may experience code modified in a wrong way.\n");
+        fwrite(STDERR, "Please report such cases at https://github.com/FriendsOfPHP/PHP-CS-Fixer .\n");
+
         exit(1);
     }
 }

diff --git a/src/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixer.php b/src/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixer.php
@@ -69,6 +69,19 @@ public function testMe()
 }
 '
                 ),
+                new CodeSample(
+                    '<?php
+final class MyTest extends \PHPUnit\Framework\TestCase
+{
+    public function testMe()
+    {
+        $this->assertInternalType("array", $var);
+        $this->assertInternalType("boolean", $var);
+    }
+}
+',
+                    ['target' => PhpUnitTargetVersion::VERSION_7_5]
+                ),
             ],
             null,
             'Risky when PHPUnit methods are overridden or when project has PHPUnit incompatibilities.'

diff --git a/tests/Test/AbstractFixerTestCase.php b/tests/Test/AbstractFixerTestCase.php
@@ -196,7 +196,6 @@ final public function testFixerDefinitions()
             // It may only shrink, never add anything to it.
             $fixerNamesWithKnownMissingSamplesWithConfig = [ // @TODO 3.0 - remove this
                 'is_null', // has only one option which is deprecated
-                'php_unit_dedicate_assert_internal_type',
             ];
 
             if (\count($configSamplesProvided) < 2) {