Remove PHP version specific code sample constraint when not needed

doc/rules/class_notation/class_definition.rst

@@ -64,21 +64,10 @@ Example #1
     {
     }
 
-Example #2
-~~~~~~~~~~
-
-*Default* configuration.
-
-.. code-block:: diff
-
-   --- Original
-   +++ New
-    <?php
-
    -$foo = new  class  extends  Bar  implements  Baz,  BarBaz {};
    +$foo = new class extends Bar implements Baz, BarBaz {};
 
-Example #3
+Example #2
 ~~~~~~~~~~
 
 With configuration: ``['single_line' => true]``.
@@ -95,7 +84,7 @@ With configuration: ``['single_line' => true]``.
    +class Foo extends Bar implements Baz, BarBaz
     {}
 
-Example #4
+Example #3
 ~~~~~~~~~~
 
 With configuration: ``['single_item_single_line' => true]``.
@@ -112,7 +101,7 @@ With configuration: ``['single_item_single_line' => true]``.
    +class Foo extends Bar implements Baz
     {}
 
-Example #5
+Example #4
 ~~~~~~~~~~
 
 With configuration: ``['multi_line_extends_each_single_line' => true]``.

doc/rules/function_notation/phpdoc_to_param_type.rst

@@ -40,30 +40,17 @@ Example #1
    +++ New
     <?php
 
-    /** @param string $bar */
-   -function my_foo($bar)
-   +function my_foo(string $bar)
+    /**
+     * @param string $foo
+     * @param string|null $bar
+     */
+   -function f($foo, $bar)
+   +function f(string $foo, ?string $bar)
     {}
 
 Example #2
 ~~~~~~~~~~
 
-*Default* configuration.
-
-.. code-block:: diff
-
-   --- Original
-   +++ New
-    <?php
-
-    /** @param string|null $bar */
-   -function my_foo($bar)
-   +function my_foo(?string $bar)
-    {}
-
-Example #3
-~~~~~~~~~~
-
 With configuration: ``['scalar_types' => false]``.
 
 .. code-block:: diff

doc/rules/function_notation/phpdoc_to_return_type.rst

@@ -41,27 +41,16 @@ Example #1
     <?php
 
     /** @return \My\Bar */
-   -function my_foo()
-   +function my_foo(): \My\Bar
+   -function f1()
+   +function f1(): \My\Bar
     {}
 
-Example #2
-~~~~~~~~~~
-
-*Default* configuration.
-
-.. code-block:: diff
-
-   --- Original
-   +++ New
-    <?php
-
     /** @return void */
-   -function my_foo()
-   +function my_foo(): void
+   -function f2()
+   +function f2(): void
     {}
 
-Example #3
+Example #2
 ~~~~~~~~~~
 
 *Default* configuration.
@@ -77,7 +66,7 @@ Example #3
    +function my_foo(): object
     {}
 
-Example #4
+Example #3
 ~~~~~~~~~~
 
 With configuration: ``['scalar_types' => false]``.
@@ -94,7 +83,7 @@ With configuration: ``['scalar_types' => false]``.
     /** @return string */
     function bar() {}
 
-Example #5
+Example #4
 ~~~~~~~~~~
 
 *Default* configuration.

doc/rules/import/ordered_imports.rst

@@ -39,8 +39,11 @@ Example #1
    --- Original
    +++ New
     <?php
-   -use Z; use A;
-   +use A; use Z;
+   +use AAA;
+   +use const AAB;
+    use function AAC;
+   -use const AAB;
+   -use AAA;
 
 Example #2
 ~~~~~~~~~~
@@ -63,22 +66,6 @@ With configuration: ``['sort_algorithm' => 'length']``.
 Example #3
 ~~~~~~~~~~
 
-*Default* configuration.
-
-.. code-block:: diff
-
-   --- Original
-   +++ New
-    <?php
-   +use AAA;
-   +use const AAB;
-    use function AAC;
-   -use const AAB;
-   -use AAA;
-
-Example #4
-~~~~~~~~~~
-
 With configuration: ``['sort_algorithm' => 'length', 'imports_order' => ['const', 'class', 'function']]``.
 
 .. code-block:: diff
@@ -99,7 +86,7 @@ With configuration: ``['sort_algorithm' => 'length', 'imports_order' => ['const'
     use function CCC\AA;
    -use function DDD;
 
-Example #5
+Example #4
 ~~~~~~~~~~
 
 With configuration: ``['sort_algorithm' => 'alpha', 'imports_order' => ['const', 'class', 'function']]``.
@@ -122,7 +109,7 @@ With configuration: ``['sort_algorithm' => 'alpha', 'imports_order' => ['const',
     use function DDD;
    -use function CCC\AA;
 
-Example #6
+Example #5
 ~~~~~~~~~~
 
 With configuration: ``['sort_algorithm' => 'none', 'imports_order' => ['const', 'class', 'function']]``.

doc/rules/phpdoc/no_superfluous_phpdoc_tags.rst

@@ -54,8 +54,10 @@ Example #1
         /**
    -     * @param Bar $bar
    -     * @param mixed $baz
+         *
+   -     * @return Baz
          */
-        public function doFoo(Bar $bar, $baz) {}
+        public function doFoo(Bar $bar, $baz): Baz {}
     }
 
 Example #2
@@ -79,26 +81,6 @@ With configuration: ``['allow_mixed' => true]``.
 Example #3
 ~~~~~~~~~~
 
-*Default* configuration.
-
-.. code-block:: diff
-
-   --- Original
-   +++ New
-    <?php
-    class Foo {
-        /**
-   -     * @param Bar $bar
-   -     * @param mixed $baz
-         *
-   -     * @return Baz
-         */
-        public function doFoo(Bar $bar, $baz): Baz {}
-    }
-
-Example #4
-~~~~~~~~~~
-
 With configuration: ``['remove_inheritdoc' => true]``.
 
 .. code-block:: diff
@@ -114,7 +96,7 @@ With configuration: ``['remove_inheritdoc' => true]``.
         public function doFoo(Bar $bar, $baz) {}
     }
 
-Example #5
+Example #4
 ~~~~~~~~~~
 
 With configuration: ``['allow_unused_params' => true]``.

src/Fixer/Alias/ArrayPushFixer.php

@@ -15,10 +15,9 @@ declare(strict_types=1);
 namespace PhpCsFixer\Fixer\Alias;
 
 use PhpCsFixer\AbstractFixer;
+use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\FixerDefinition\VersionSpecification;
-use PhpCsFixer\FixerDefinition\VersionSpecificCodeSample;
 use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
 use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Token;
@@ -36,7 +35,7 @@ final class ArrayPushFixer extends AbstractFixer
     {
         return new FixerDefinition(
             'Converts simple usages of `array_push($x, $y);` to `$x[] = $y;`.',
-            [new VersionSpecificCodeSample("<?php\narray_push(\$x, \$y);\n", new VersionSpecification(70000))],
+            [new CodeSample("<?php\narray_push(\$x, \$y);\n")],
             null,
             'Risky when the function `array_push` is overridden.'
         );

src/Fixer/ArrayNotation/ArraySyntaxFixer.php

@@ -22,8 +22,6 @@ use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\FixerDefinition\VersionSpecification;
-use PhpCsFixer\FixerDefinition\VersionSpecificCodeSample;
 use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
@@ -65,9 +63,8 @@ final class ArraySyntaxFixer extends AbstractFixer implements ConfigurableFixerI
         return new FixerDefinition(
             'PHP arrays should be declared using the configured syntax.',
             [
-                new VersionSpecificCodeSample(
-                    "<?php\narray(1,2);\n",
-                    new VersionSpecification(50400)
+                new CodeSample(
+                    "<?php\narray(1,2);\n"
                 ),
                 new CodeSample(
                     "<?php\n[1,2];\n",

src/Fixer/Basic/NonPrintableCharacterFixer.php

@@ -23,8 +23,6 @@ use PhpCsFixer\FixerConfiguration\InvalidOptionsForEnvException;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\FixerDefinition\VersionSpecification;
-use PhpCsFixer\FixerDefinition\VersionSpecificCodeSample;
 use PhpCsFixer\Preg;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
@@ -73,9 +71,8 @@ final class NonPrintableCharacterFixer extends AbstractFixer implements Configur
                 new CodeSample(
                     '<?php echo "'.pack('H*', 'e2808b').'Hello'.pack('H*', 'e28087').'World'.pack('H*', 'c2a0')."!\";\n"
                 ),
-                new VersionSpecificCodeSample(
+                new CodeSample(
                     '<?php echo "'.pack('H*', 'e2808b').'Hello'.pack('H*', 'e28087').'World'.pack('H*', 'c2a0')."!\";\n",
-                    new VersionSpecification(70000),
                     ['use_escape_sequences_in_strings' => false]
                 ),
             ],

src/Fixer/Casing/LowercaseStaticReferenceFixer.php

@@ -18,8 +18,6 @@ use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\FixerDefinition\VersionSpecification;
-use PhpCsFixer\FixerDefinition\VersionSpecificCodeSample;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 
@@ -55,7 +53,7 @@ class Foo extends Bar
     }
 }
 '),
-                new VersionSpecificCodeSample(
+                new CodeSample(
                     '<?php
 class Foo extends Bar
 {
@@ -64,8 +62,7 @@ class Foo extends Bar
         return false;
     }
 }
-',
-                    new VersionSpecification(70100)
+'
                 ),
             ]
         );

src/Fixer/Casing/NativeFunctionTypeDeclarationCasingFixer.php

@@ -108,13 +108,11 @@ final class NativeFunctionTypeDeclarationCasingFixer extends AbstractFixer
             'Native type hints for functions should use the correct case.',
             [
                 new CodeSample("<?php\nclass Bar {\n    public function Foo(CALLABLE \$bar)\n    {\n        return 1;\n    }\n}\n"),
-                new VersionSpecificCodeSample(
-                    "<?php\nfunction Foo(INT \$a): Bool\n{\n    return true;\n}\n",
-                    new VersionSpecification(70000)
+                new CodeSample(
+                    "<?php\nfunction Foo(INT \$a): Bool\n{\n    return true;\n}\n"
                 ),
-                new VersionSpecificCodeSample(
-                    "<?php\nfunction Foo(Iterable \$a): VOID\n{\n    echo 'Hello world';\n}\n",
-                    new VersionSpecification(70100)
+                new CodeSample(
+                    "<?php\nfunction Foo(Iterable \$a): VOID\n{\n    echo 'Hello world';\n}\n"
                 ),
                 new VersionSpecificCodeSample(
                     "<?php\nfunction Foo(Object \$a)\n{\n    return 'hi!';\n}\n",