further updates

PHP-CS-Fixer · Oct 29, 2023 · dd4f49f · dd4f49f
1 parent 92c69ab
commit dd4f49f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 27 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -22,15 +22,14 @@
     with this source code in the file LICENSE.
     EOF;
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->ignoreDotFiles(false)
     ->ignoreVCSIgnored(true)
     ->exclude(['dev-tools/phpstan', 'tests/Fixtures'])
     ->in(__DIR__)
 ;
 
-$config = new PhpCsFixer\Config();
-$config
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PHP74Migration' => true,
@@ -45,5 +44,3 @@
     ])
     ->setFinder($finder)
 ;
-
-return $config;
diff --git a/doc/config.rst b/doc/config.rst
@@ -30,13 +30,14 @@ The simplest config declares paths under control and rules to apply/check:
 
     <?php
 
-    $finder = new PhpCsFixer\Finder()
+    $finder = (new PhpCsFixer\Finder())
         ->in(__DIR__)
     ;
 
-    $config = new PhpCsFixer\Config();
-    return $config->setRules([
-            '@PSR12' => true,
+    return (new PhpCsFixer\Config())
+        ->setRules([
+            '@PER-CS' => true,
+            '@PHP82Migration' => true,
         ])
         ->setFinder($finder)
     ;
@@ -52,15 +53,21 @@ The example below will manipulate which paths to fix or not:
 
     <?php
 
-    $finder = new PhpCsFixer\Finder()
+    $finder = (new PhpCsFixer\Finder())
         ->in(__DIR__)
-        ->exclude(['autogenerated_content', 'tests/fixtures'])
-        ->notPath(['dump.php', 'src/exception_file.php'])
+        ->exclude([
+            'autogenerated_content',
+            'tests/fixtures',
+        ])
+        ->notPath([
+            'dump.php',
+            'src/exception_file.php',
+        ])
     ;
 
-    $config = new PhpCsFixer\Config();
-    return $config->setRules([
-            '@PSR12' => true,
+    return (new PhpCsFixer\Config())
+        ->setRules([
+            '@PhpCsFixer' => true,
         ])
         ->setFinder($finder)
     ;
@@ -80,12 +87,12 @@ The example below will add two rules to the default list of PSR12 set rules:
 
     <?php
 
-    $finder = new PhpCsFixer\Finder()
+    $finder = (new PhpCsFixer\Finder())
         ->in(__DIR__)
     ;
 
-    $config = new PhpCsFixer\Config();
-    return $config->setRules([
+    return (new PhpCsFixer\Config())
+        ->setRules([
             '@PSR12' => true,
             'strict_param' => true,
             'array_syntax' => ['syntax' => 'short'],
@@ -94,21 +101,20 @@ The example below will add two rules to the default list of PSR12 set rules:
     ;
 
 You may also use an exclude list for the rules instead of the above shown include approach.
-The following example shows how to use all ``Symfony`` rules but the ``full_opening_tag`` rule.
+The following example shows how to use all ``PhpCsFixer`` rules but without the ``align_multiline_comment`` rule.
 
 .. code-block:: php
 
     <?php
 
-    $finder = new PhpCsFixer\Finder()
+    $finder = (new PhpCsFixer\Finder())
         ->in(__DIR__)
-        ->exclude('somedir')
     ;
 
-    $config = new PhpCsFixer\Config();
-    return $config->setRules([
-            '@Symfony' => true,
-            'full_opening_tag' => false,
+    return (new PhpCsFixer\Config())
+        ->setRules([
+            '@PhpCsFixer' => true,
+            'comment_type' => false,
         ])
         ->setFinder($finder)
     ;
@@ -123,8 +129,15 @@ configure them in your config file.
 
     <?php
 
-    $config = new PhpCsFixer\Config();
-    return $config
+    $finder = (new PhpCsFixer\Finder())
+        ->in(__DIR__)
+    ;
+
+    return (new PhpCsFixer\Config())
+        ->setRules([
+            '@Symfony' => true,
+        ])
+        ->setFinder($finder)
         ->setIndent("\t")
         ->setLineEnding("\r\n")
     ;