DX: remove 'create' method in internal classes

PHP-CS-Fixer · Apr 18, 2021 · 3cc28f8 · 3cc28f8
1 parent c990a13
commit 3cc28f8
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 52 deletions.
diff --git a/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
@@ -470,7 +470,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/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -1389,7 +1389,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);

diff --git a/tests/FixerFactoryTest.php b/tests/FixerFactoryTest.php
@@ -53,16 +53,6 @@ public function testInterfaceIsFluent()
         static::assertSame($factory, $testInstance);
     }
 
-    /**
-     * @covers \PhpCsFixer\FixerFactory::create
-     */
-    public function testCreate()
-    {
-        $factory = FixerFactory::create();
-
-        static::assertInstanceOf(\PhpCsFixer\FixerFactory::class, $factory);
-    }
-
     /**
      * @covers \PhpCsFixer\FixerFactory::registerBuiltInFixers
      */
@@ -137,13 +127,13 @@ public function testRegisterFixerWithOccupiedName()
      */
     public function testUseRuleSet()
     {
-        $factory = FixerFactory::create()
+        $factory = (new FixerFactory())
             ->registerBuiltInFixers()
             ->useRuleSet(new RuleSet([]))
         ;
         static::assertCount(0, $factory->getFixers());
 
-        $factory = FixerFactory::create()
+        $factory = (new FixerFactory())
             ->registerBuiltInFixers()
             ->useRuleSet(new RuleSet(['strict_comparison' => true, 'blank_line_before_statement' => false]))
         ;
@@ -160,7 +150,7 @@ public function testUseRuleSetWithNonExistingRule()
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage('Rule "non_existing_rule" does not exist.');
 
-        $factory = FixerFactory::create()
+        $factory = (new FixerFactory())
             ->registerBuiltInFixers()
             ->useRuleSet(new RuleSet(['non_existing_rule' => true]))
         ;
@@ -210,7 +200,8 @@ public function testConflictingFixers(RuleSet $ruleSet)
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessageMatches('#^Rule contains conflicting fixers:\n#');
 
-        FixerFactory::create()->registerBuiltInFixers()->useRuleSet($ruleSet);
+        (new FixerFactory())
+            ->registerBuiltInFixers()->useRuleSet($ruleSet);
     }
 
     public function provideConflictingFixersCases()

diff --git a/tests/Report/ReporterFactoryTest.php b/tests/Report/ReporterFactoryTest.php
@@ -24,13 +24,6 @@
  */
 final class ReporterFactoryTest extends TestCase
 {
-    public function testCreate()
-    {
-        $factory = ReporterFactory::create();
-
-        static::assertInstanceOf(\PhpCsFixer\Report\ReporterFactory::class, $factory);
-    }
-
     public function testInterfaceIsFluent()
     {
         $builder = new ReporterFactory();

diff --git a/tests/RuleSet/RuleSetTest.php b/tests/RuleSet/RuleSetTest.php
@@ -269,7 +269,7 @@ public function testResolveRulesWithDisabledSet()
     public function testRiskyRulesInSet(array $set, $safe)
     {
         try {
-            $fixers = FixerFactory::create()
+            $fixers = (new FixerFactory())
                 ->registerBuiltInFixers()
                 ->useRuleSet(new RuleSet($set))
                 ->getFixers()

diff --git a/tests/Test/AbstractIntegrationTestCase.php b/tests/Test/AbstractIntegrationTestCase.php
@@ -346,7 +346,7 @@ private static function createFixers(IntegrationCase $case)
     {
         $config = $case->getConfig();
 
-        return FixerFactory::create()
+        return (new FixerFactory())
             ->registerBuiltInFixers()
             ->useRuleSet($case->getRuleset())
             ->setWhitespacesConfig(

diff --git a/tests/Test/TokensWithObservedTransformers.php b/tests/Test/TokensWithObservedTransformers.php
@@ -40,7 +40,7 @@ protected function applyTransformers()
     {
         $this->observedModificationsPerTransformer = [];
 
-        $transformers = Transformers::create();
+        $transformers = Transformers::createSingleton();
         foreach (AccessibleObject::create($transformers)->items as $transformer) {
             $this->currentTransformer = $transformer->getName();
             $this->observedModificationsPerTransformer[$this->currentTransformer] = [];

diff --git a/tests/TextDiffTest.php b/tests/TextDiffTest.php
@@ -92,7 +92,7 @@ public function provideDiffReportingCases()
      */
     public function testAllFormatsCovered()
     {
-        $factory = ReporterFactory::create();
+        $factory = new ReporterFactory();
         $formats = $factory->registerBuiltInReporters()->getFormats();
         sort($formats);