Update Symfony ruleset

PHP-CS-Fixer · Jan 18, 2021 · 3161ebf · 3161ebf
1 parent ef7dca1
commit 3161ebf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/doc/ruleSets/PhpCsFixerRisky.rst b/doc/ruleSets/PhpCsFixerRisky.rst
@@ -10,6 +10,9 @@ Rules
 - `@Symfony:risky <./SymfonyRisky.rst>`_
 - `comment_to_phpdoc <./../rules/comment/comment_to_phpdoc.rst>`_
 - `final_internal_class <./../rules/class_notation/final_internal_class.rst>`_
+- `native_constant_invocation <./../rules/constant_notation/native_constant_invocation.rst>`_
+  config:
+  ``['fix_built_in' => false, 'include' => ['DIRECTORY_SEPARATOR', 'PHP_INT_SIZE', 'PHP_SAPI', 'PHP_VERSION_ID'], 'scope' => 'namespaced', 'strict' => true]``
 - `no_alias_functions <./../rules/alias/no_alias_functions.rst>`_
   config:
   ``['sets' => ['@all']]``

diff --git a/doc/ruleSets/SymfonyRisky.rst b/doc/ruleSets/SymfonyRisky.rst
@@ -26,8 +26,6 @@ Rules
 - `logical_operators <./../rules/operator/logical_operators.rst>`_
 - `modernize_types_casting <./../rules/cast_notation/modernize_types_casting.rst>`_
 - `native_constant_invocation <./../rules/constant_notation/native_constant_invocation.rst>`_
-  config:
-  ``['fix_built_in' => false, 'include' => ['DIRECTORY_SEPARATOR', 'PHP_INT_SIZE', 'PHP_SAPI', 'PHP_VERSION_ID'], 'scope' => 'namespaced', 'strict' => true]``
 - `native_function_invocation <./../rules/function_notation/native_function_invocation.rst>`_
   config:
   ``['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true]``

diff --git a/doc/rules/constant_notation/native_constant_invocation.rst b/doc/rules/constant_notation/native_constant_invocation.rst
@@ -145,6 +145,4 @@ The rule is part of the following rule sets:
   ``['fix_built_in' => false, 'include' => ['DIRECTORY_SEPARATOR', 'PHP_INT_SIZE', 'PHP_SAPI', 'PHP_VERSION_ID'], 'scope' => 'namespaced', 'strict' => true]``
 
 @Symfony:risky
-  Using the `@Symfony:risky <./../../ruleSets/SymfonyRisky.rst>`_ rule set will enable the ``native_constant_invocation`` rule with the config below:
-
-  ``['fix_built_in' => false, 'include' => ['DIRECTORY_SEPARATOR', 'PHP_INT_SIZE', 'PHP_SAPI', 'PHP_VERSION_ID'], 'scope' => 'namespaced', 'strict' => true]``
+  Using the `@Symfony:risky <./../../ruleSets/SymfonyRisky.rst>`_ rule set will enable the ``native_constant_invocation`` rule with the default config.
diff --git a/src/RuleSet/Sets/PhpCsFixerRiskySet.php b/src/RuleSet/Sets/PhpCsFixerRiskySet.php
@@ -25,6 +25,18 @@ public function getRules()
             '@Symfony:risky' => true,
             'comment_to_phpdoc' => true,
             'final_internal_class' => true,
+            // @TODO: consider switching to `true`, like in @Symfony
+            'native_constant_invocation' => [
+                'fix_built_in' => false,
+                'include' => [
+                    'DIRECTORY_SEPARATOR',
+                    'PHP_INT_SIZE',
+                    'PHP_SAPI',
+                    'PHP_VERSION_ID',
+                ],
+                'scope' => 'namespaced',
+                'strict' => true,
+            ],
             'no_alias_functions' => [
                 'sets' => [
                     '@all',

diff --git a/src/RuleSet/Sets/SymfonyRiskySet.php b/src/RuleSet/Sets/SymfonyRiskySet.php
@@ -47,17 +47,7 @@ public function getRules()
             'is_null' => true,
             'logical_operators' => true,
             'modernize_types_casting' => true,
-            'native_constant_invocation' => [
-                'fix_built_in' => false,
-                'include' => [
-                    'DIRECTORY_SEPARATOR',
-                    'PHP_INT_SIZE',
-                    'PHP_SAPI',
-                    'PHP_VERSION_ID',
-                ],
-                'scope' => 'namespaced',
-                'strict' => true,
-            ],
+            'native_constant_invocation' => true,
             'native_function_invocation' => [
                 'include' => [
                     '@compiler_optimized',

diff --git a/tests/Fixtures/Integration/misc/PHP7_3.test b/tests/Fixtures/Integration/misc/PHP7_3.test
@@ -81,7 +81,7 @@ $a ** 1; // `pow_to_exponentiation` rule
 random_int($a, $b, ); // `random_api_migration` rule
 $foo = (int) $foo; // `set_type_to_cast` rule
 in_array($b, $c, true, ); // `strict_param` rule
-@trigger_error('Warning.', E_USER_DEPRECATED, ); // `error_suppression` rule
+@trigger_error('Warning.', \E_USER_DEPRECATED, ); // `error_suppression` rule
 foo(null === $a, ); // `yoda_style` rule
 $a = null; // `no_unset_cast` rule
 $foo->bar = null; // `no_unset_on_property` rule