Enhancement: Extract concrete class

ergebnis · Nov 1, 2020 · 851b512 · 851b512
1 parent 733fdae
commit 851b512
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 114 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="3.18.2@19aa905f7c3c7350569999a93c40ae91ae4e1626">
-  <file src="test/Unit/FactoryTest.php">
-    <MixedPropertyTypeCoercion occurrences="2">
-      <code>$rules</code>
-      <code>$rules</code>
-    </MixedPropertyTypeCoercion>
-  </file>
   <file src="test/Unit/RuleSet/AbstractRuleSetTestCase.php">
     <InternalClass occurrences="2">
       <code>FixerFactory::create()</code>

diff --git a/test/Fixture/Config/RuleSet/DummyRuleSet.php b/test/Fixture/Config/RuleSet/DummyRuleSet.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2019-2020 Andreas Möller
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE.md file that was distributed with this source code.
+ *
+ * @see https://github.com/ergebnis/php-cs-fixer-config
+ */
+
+namespace Ergebnis\PhpCsFixer\Config\Test\Fixture\Config\RuleSet;
+
+use Ergebnis\PhpCsFixer\Config;
+
+final class DummyRuleSet implements Config\RuleSet
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var array<string, array|bool>
+     */
+    private $rules;
+
+    /**
+     * @var int
+     */
+    private $phpVersion;
+
+    /**
+     * @param array<string, array|bool> $rules
+     */
+    public function __construct(string $name, array $rules, int $phpVersion)
+    {
+        $this->name = $name;
+        $this->rules = $rules;
+        $this->phpVersion = $phpVersion;
+    }
+
+    public function name(): string
+    {
+        return $this->name;
+    }
+
+    public function rules(): array
+    {
+        return $this->rules;
+    }
+
+    public function targetPhpVersion(): int
+    {
+        return $this->phpVersion;
+    }
+}
diff --git a/test/Unit/FactoryTest.php b/test/Unit/FactoryTest.php
@@ -14,6 +14,8 @@
 namespace Ergebnis\PhpCsFixer\Config\Test\Unit;
 
 use Ergebnis\PhpCsFixer\Config;
+use Ergebnis\PhpCsFixer\Config\Test\Fixture;
+use Ergebnis\Test\Util;
 use PHPUnit\Framework;
 
 /**
@@ -23,36 +25,17 @@
  */
 final class FactoryTest extends Framework\TestCase
 {
+    use Util\Helper;
+
     public function testFromRuleSetThrowsRuntimeExceptionIfCurrentPhpVersionIsLessThanTargetPhpVersion(): void
     {
         $targetPhpVersion = \PHP_VERSION_ID + 1;
 
-        $ruleSet = new class($targetPhpVersion) implements Config\RuleSet {
-            /**
-             * @var int
-             */
-            private $phpVersion;
-
-            public function __construct(int $phpVersion)
-            {
-                $this->phpVersion = $phpVersion;
-            }
-
-            public function name(): string
-            {
-                return \spl_object_hash($this);
-            }
-
-            public function rules(): array
-            {
-                return [];
-            }
-
-            public function targetPhpVersion(): int
-            {
-                return $this->phpVersion;
-            }
-        };
+        $ruleSet = new Fixture\Config\RuleSet\DummyRuleSet(
+            self::faker()->word,
+            [],
+            $targetPhpVersion
+        );
 
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage(\sprintf(
@@ -69,53 +52,18 @@ public function targetPhpVersion(): int
      */
     public function testFromRuleSetCreatesConfig(int $targetPhpVersion): void
     {
-        $name = 'foobarbaz';
-
         $rules = [
             'foo' => true,
             'bar' => [
                 'baz',
             ],
         ];
 
-        $ruleSet = new class($name, $rules, $targetPhpVersion) implements Config\RuleSet {
-            /**
-             * @var string
-             */
-            private $name;
-
-            /**
-             * @var array<string, array|bool>
-             */
-            private $rules;
-
-            /**
-             * @var int
-             */
-            private $phpVersion;
-
-            public function __construct(string $name, array $rules, int $phpVersion)
-            {
-                $this->name = $name;
-                $this->rules = $rules;
-                $this->phpVersion = $phpVersion;
-            }
-
-            public function name(): string
-            {
-                return $this->name;
-            }
-
-            public function rules(): array
-            {
-                return $this->rules;
-            }
-
-            public function targetPhpVersion(): int
-            {
-                return $this->phpVersion;
-            }
-        };
+        $ruleSet = new Fixture\Config\RuleSet\DummyRuleSet(
+            self::faker()->word,
+            $rules,
+            $targetPhpVersion
+        );
 
         $config = Config\Factory::fromRuleSet($ruleSet);
 
@@ -143,55 +91,18 @@ public function provideTargetPhpVersion(): \Generator
 
     public function testFromRuleSetCreatesConfigWithOverrideRules(): void
     {
-        $name = 'foobarbaz';
-
         $rules = [
             'foo' => true,
             'bar' => [
                 'baz',
             ],
         ];
 
-        $targetPhpVersion = \PHP_VERSION_ID;
-
-        $ruleSet = new class($name, $rules, $targetPhpVersion) implements Config\RuleSet {
-            /**
-             * @var string
-             */
-            private $name;
-
-            /**
-             * @var array<string, array|bool>
-             */
-            private $rules;
-
-            /**
-             * @var int
-             */
-            private $phpVersion;
-
-            public function __construct(string $name, array $rules, int $phpVersion)
-            {
-                $this->name = $name;
-                $this->rules = $rules;
-                $this->phpVersion = $phpVersion;
-            }
-
-            public function name(): string
-            {
-                return $this->name;
-            }
-
-            public function rules(): array
-            {
-                return $this->rules;
-            }
-
-            public function targetPhpVersion(): int
-            {
-                return $this->phpVersion;
-            }
-        };
+        $ruleSet = new Fixture\Config\RuleSet\DummyRuleSet(
+            self::faker()->word,
+            $rules,
+            \PHP_VERSION_ID
+        );
 
         $overrideRules = [
             'foo' => false,