Merge branch '2.18'

# Conflicts: # src/Tokenizer/Token.php
PHP-CS-Fixer · Apr 18, 2021 · 283e731 · 283e731
2 parents d29da4a + e89da2d
commit 283e731
Show file tree

Hide file tree

Showing 28 changed files with 49 additions and 88 deletions.
diff --git a/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
@@ -478,7 +478,7 @@ public function getProgress()
     public function getReporter()
     {
         if (null === $this->reporter) {
-            $reporterFactory = ReporterFactory::create();
+            $reporterFactory = new ReporterFactory();
             $reporterFactory->registerBuiltInReporters();
 
             $format = $this->getFormat();

diff --git a/src/FileReader.php b/src/FileReader.php
@@ -23,11 +23,6 @@
  */
 final class FileReader
 {
-    /**
-     * @var null|self
-     */
-    private static $instance;
-
     /**
      * @var null|string
      */
@@ -38,11 +33,13 @@ final class FileReader
      */
     public static function createSingleton()
     {
-        if (null === self::$instance) {
-            self::$instance = new self();
+        static $instance = null;
+
+        if (!$instance) {
+            $instance = new self();
         }
 
-        return self::$instance;
+        return $instance;
     }
 
     /**

diff --git a/src/FixerFactory.php b/src/FixerFactory.php
@@ -55,16 +55,6 @@ public function __construct()
         $this->nameValidator = new FixerNameValidator();
     }
 
-    /**
-     * Create instance.
-     *
-     * @return FixerFactory
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     public function setWhitespacesConfig(WhitespacesFixerConfig $config)
     {
         foreach ($this->fixers as $fixer) {

diff --git a/src/Report/ReporterFactory.php b/src/Report/ReporterFactory.php
@@ -25,11 +25,6 @@ final class ReporterFactory
     /** @var ReporterInterface[] */
     private $reporters = [];
 
-    public static function create()
-    {
-        return new self();
-    }
-
     public function registerBuiltInReporters()
     {
         /** @var null|string[] $builtInReporters */

diff --git a/src/RuleSet/Sets/PHPUnit30MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit30MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -23,7 +24,7 @@ public function getRules()
     {
         return [
             'php_unit_dedicate_assert' => [
-                'target' => '3.0',
+                'target' => PhpUnitTargetVersion::VERSION_3_0,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit32MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit32MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit30Migration:risky' => true,
             'php_unit_no_expectation_annotation' => [
-                'target' => '3.2',
+                'target' => PhpUnitTargetVersion::VERSION_3_2,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit35MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit35MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit32Migration:risky' => true,
             'php_unit_dedicate_assert' => [
-                'target' => '3.5',
+                'target' => PhpUnitTargetVersion::VERSION_3_5,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit43MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit43MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit35Migration:risky' => true,
             'php_unit_no_expectation_annotation' => [
-                'target' => '4.3',
+                'target' => PhpUnitTargetVersion::VERSION_4_3,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit48MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit48MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit43Migration:risky' => true,
             'php_unit_namespaced' => [
-                'target' => '4.8',
+                'target' => PhpUnitTargetVersion::VERSION_4_8,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit52MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit52MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit50Migration:risky' => true,
             'php_unit_expectation' => [
-                'target' => '5.2',
+                'target' => PhpUnitTargetVersion::VERSION_5_2,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit54MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit54MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit52Migration:risky' => true,
             'php_unit_mock' => [
-                'target' => '5.4',
+                'target' => PhpUnitTargetVersion::VERSION_5_4,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit55MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit55MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit54Migration:risky' => true,
             'php_unit_mock' => [
-                'target' => '5.5',
+                'target' => PhpUnitTargetVersion::VERSION_5_5,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit56MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit56MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,10 +25,10 @@ public function getRules()
         return [
             '@PHPUnit55Migration:risky' => true,
             'php_unit_dedicate_assert' => [
-                'target' => '5.6',
+                'target' => PhpUnitTargetVersion::VERSION_5_6,
             ],
             'php_unit_expectation' => [
-                'target' => '5.6',
+                'target' => PhpUnitTargetVersion::VERSION_5_6,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit57MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit57MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit56Migration:risky' => true,
             'php_unit_namespaced' => [
-                'target' => '5.7',
+                'target' => PhpUnitTargetVersion::VERSION_5_7,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit60MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit60MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit57Migration:risky' => true,
             'php_unit_namespaced' => [
-                'target' => '6.0',
+                'target' => PhpUnitTargetVersion::VERSION_6_0,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit75MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit75MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -24,7 +25,7 @@ public function getRules()
         return [
             '@PHPUnit60Migration:risky' => true,
             'php_unit_dedicate_assert_internal_type' => [
-                'target' => '7.5',
+                'target' => PhpUnitTargetVersion::VERSION_7_5,
             ],
         ];
     }

diff --git a/src/RuleSet/Sets/PHPUnit84MigrationRiskySet.php b/src/RuleSet/Sets/PHPUnit84MigrationRiskySet.php
@@ -12,6 +12,7 @@
 
 namespace PhpCsFixer\RuleSet\Sets;
 
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTargetVersion;
 use PhpCsFixer\RuleSet\AbstractRuleSetDescription;
 
 /**
@@ -25,7 +26,7 @@ public function getRules()
             '@PHPUnit60Migration:risky' => true,
             '@PHPUnit75Migration:risky' => true,
             'php_unit_expectation' => [
-                'target' => '8.4',
+                'target' => PhpUnitTargetVersion::VERSION_8_4,
             ],
         ];
     }

diff --git a/src/Tokenizer/Token.php b/src/Tokenizer/Token.php
@@ -619,18 +619,7 @@ public function toJson(array $options = null)
             Utils::triggerDeprecation(sprintf('Arguments of "%s()" is deprecated since 2.19 and will be removed in 3.0.', __METHOD__));
         }
 
-        static $defaultOptions = null;
-
-        if (null === $options) {
-            if (null === $defaultOptions) {
-                $defaultOptions = Utils::calculateBitmask(['JSON_PRETTY_PRINT', 'JSON_NUMERIC_CHECK']);
-            }
-
-            $options = $defaultOptions;
-        } else {
-            $options = Utils::calculateBitmask($options);
-        }
-
+        $options = $options ? Utils::calculateBitmask($options) : (JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK);
         $jsonResult = json_encode($this->toArray(), $options);
 
         if (JSON_ERROR_NONE !== json_last_error()) {

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -1135,12 +1135,6 @@ public function setCode($code)
 
     public function toJson()
     {
-        static $options = null;
-
-        if (null === $options) {
-            $options = Utils::calculateBitmask(['JSON_PRETTY_PRINT', 'JSON_NUMERIC_CHECK']);
-        }
-
         $output = new \SplFixedArray(\count($this));
 
         foreach ($this as $index => $token) {
@@ -1151,7 +1145,7 @@ public function toJson()
             $this->rewind();
         }
 
-        return json_encode($output, $options);
+        return json_encode($output, JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK);
     }
 
     /**
@@ -1389,7 +1383,7 @@ public function valid()
      */
     protected function applyTransformers()
     {
-        $transformers = Transformers::create();
+        $transformers = Transformers::createSingleton();
         $transformers->transform($this);
     }
 

diff --git a/src/Tokenizer/Transformers.php b/src/Tokenizer/Transformers.php
@@ -47,7 +47,7 @@ private function __construct()
     /**
      * @return Transformers
      */
-    public static function create()
+    public static function createSingleton()
     {
         static $instance = null;
 

diff --git a/tests/AutoReview/TransformerTest.php b/tests/AutoReview/TransformerTest.php
@@ -99,7 +99,7 @@ public function provideTransformerCases()
         static $transformersArray = null;
 
         if (null === $transformersArray) {
-            $transformers = Transformers::create();
+            $transformers = Transformers::createSingleton();
             $reflection = new \ReflectionObject($transformers);
             $builtInTransformers = $reflection->getMethod('findBuiltInTransformers');
             $builtInTransformers->setAccessible(true);