Merge pull request #531 from ergebnis/feature/php73

Enhancement: Use `Php73` rule set
ergebnis · Jan 3, 2022 · 98850fe · 98850fe
2 parents 75cf0f0 + 1dc38f2
commit 98850fe
Show file tree

Hide file tree

Showing 12 changed files with 139 additions and 139 deletions.
diff --git a/.php_cs b/.php_cs
@@ -18,15 +18,15 @@ $license = License\Type\MIT::markdown(
     __DIR__ . '/LICENSE.md',
     License\Range::since(
         License\Year::fromString('2017'),
-        new \DateTimeZone('UTC')
+        new \DateTimeZone('UTC'),
     ),
     License\Holder::fromString('Andreas Möller'),
-    License\Url::fromString('https://github.com/ergebnis/test-util')
+    License\Url::fromString('https://github.com/ergebnis/test-util'),
 );
 
 $license->save();
 
-$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php71($license->header()), [
+$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php73($license->header()), [
     'strict_comparison' => false,
 ]);
 

diff --git a/.php_cs.fixture b/.php_cs.fixture
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 use Ergebnis\PhpCsFixer;
 
-$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php71(''), [
+$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php73(''), [
     'final_class' => false,
 ]);
 

diff --git a/src/DataProvider/StringProvider.php b/src/DataProvider/StringProvider.php
@@ -104,10 +104,10 @@ private static function values(): array
             \array_map(static function (string $key): string {
                 return \sprintf(
                     'string-blank-%s',
-                    $key
+                    $key,
                 );
             }, \array_keys($whitespaceCharacters)),
-            $whitespaceCharacters
+            $whitespaceCharacters,
         );
 
         $emptyValues = [
@@ -119,31 +119,31 @@ private static function values(): array
             \array_map(static function (string $key): string {
                 return \sprintf(
                     'string-untrimmed-%s',
-                    $key
+                    $key,
                 );
             }, \array_keys($whitespaceCharacters)),
             \array_map(static function (string $whitespaceCharacter) use ($faker): string {
                 return \sprintf(
                     '%s%s%s',
                     \str_repeat(
                         $whitespaceCharacter,
-                        $faker->numberBetween(1, 5)
+                        $faker->numberBetween(1, 5),
                     ),
                     $faker->word(),
                     \str_repeat(
                         $whitespaceCharacter,
-                        $faker->numberBetween(1, 5)
-                    )
+                        $faker->numberBetween(1, 5),
+                    ),
                 );
-            }, $whitespaceCharacters)
+            }, $whitespaceCharacters),
         );
 
         /** @var array<string, string> $withWhitespaceValues */
         $withWhitespaceValues = \array_combine(
             \array_map(static function (string $key): string {
                 return \sprintf(
                     'string-with-whitespace-%s',
-                    $key
+                    $key,
                 );
             }, \array_keys($whitespaceCharacters)),
             \array_map(static function (string $whitespaceCharacter) use ($faker): string {
@@ -152,17 +152,17 @@ private static function values(): array
 
                 return \implode(
                     $whitespaceCharacter,
-                    $words
+                    $words,
                 );
-            }, $whitespaceCharacters)
+            }, $whitespaceCharacters),
         );
 
         return \array_merge(
             $arbitraryValues,
             $blankValues,
             $emptyValues,
             $untrimmedValues,
-            $withWhitespaceValues
+            $withWhitespaceValues,
         );
     }
 

diff --git a/src/Exception/InvalidExcludeClassName.php b/src/Exception/InvalidExcludeClassName.php
@@ -25,7 +25,7 @@ public static function fromClassName($className): self
     {
         return new self(\sprintf(
             'Exclude class name should be a string, got "%s" instead.',
-            \is_object($className) ? \get_class($className) : \gettype($className)
+            \is_object($className) ? \get_class($className) : \gettype($className),
         ));
     }
 }
diff --git a/src/Exception/NonExistentDirectory.php b/src/Exception/NonExistentDirectory.php
@@ -22,7 +22,7 @@ public static function fromDirectory(string $directory): self
     {
         return new self(\sprintf(
             'Directory "%s" does not exist.',
-            $directory
+            $directory,
         ));
     }
 }
diff --git a/src/Exception/NonExistentExcludeClass.php b/src/Exception/NonExistentExcludeClass.php
@@ -22,7 +22,7 @@ public static function fromClassName(string $className): self
     {
         return new self(\sprintf(
             'Exclude class "%s" does not exist.',
-            $className
+            $className,
         ));
     }
 }
diff --git a/src/Helper.php b/src/Helper.php
@@ -75,7 +75,7 @@ static function (string $className): bool {
             },
             $directory,
             $excludeClassNames,
-            "Failed asserting that the classes\n\n%s\n\nare abstract or final."
+            "Failed asserting that the classes\n\n%s\n\nare abstract or final.",
         );
     }
 
@@ -115,7 +115,7 @@ final protected static function assertClassesHaveTests(string $directory, string
             \array_map(static function (Classy\Construct $construct): string {
                 return $construct->name();
             }, $constructs),
-            $excludeClassyNames
+            $excludeClassyNames,
         );
 
         $namespace = \rtrim($namespace, '\\') . '\\';
@@ -125,7 +125,7 @@ final protected static function assertClassesHaveTests(string $directory, string
             return \str_replace(
                 $namespace,
                 $testNamespace,
-                $className
+                $className,
             ) . 'Test';
         };
 
@@ -166,16 +166,16 @@ final protected static function assertClassesHaveTests(string $directory, string
             \implode("\n", \array_map(static function (string $className): string {
                 return \sprintf(
                     ' - %s',
-                    $className
+                    $className,
                 );
             }, $classesWithoutTests)),
             \implode("\n", \array_map(static function (string $className) use ($testClassNameFrom): string {
                 return \sprintf(
                     ' - %s',
-                    $testClassNameFrom($className)
+                    $testClassNameFrom($className),
                 );
             }, $classesWithoutTests)),
-            Framework\TestCase::class
+            Framework\TestCase::class,
         ));
     }
 
@@ -217,7 +217,7 @@ final protected static function assertClassyConstructsSatisfySpecification(calla
 
         $classyNames = \array_diff(
             $constructs,
-            $excludeClassyNames
+            $excludeClassyNames,
         );
 
         $classyNamesNotSatisfyingSpecification = \array_filter($classyNames, static function (string $className) use ($specification): bool {
@@ -226,7 +226,7 @@ final protected static function assertClassyConstructsSatisfySpecification(calla
 
         self::assertEmpty($classyNamesNotSatisfyingSpecification, \sprintf(
             '' !== $message ? $message : "Failed asserting that the classy constructs\n\n%s\n\nsatisfy a specification.",
-            ' - ' . \implode("\n - ", $classyNamesNotSatisfyingSpecification)
+            ' - ' . \implode("\n - ", $classyNamesNotSatisfyingSpecification),
         ));
     }
 
@@ -237,7 +237,7 @@ final protected static function assertClassExists(string $className): void
     {
         self::assertTrue(\class_exists($className), \sprintf(
             'Failed asserting that a class "%s" exists.',
-            $className
+            $className,
         ));
     }
 
@@ -261,7 +261,7 @@ final protected static function assertClassExtends(string $parentClassName, stri
         self::assertTrue($reflection->isSubclassOf($parentClassName), \sprintf(
             'Failed asserting that class "%s" extends "%s".',
             $className,
-            $parentClassName
+            $parentClassName,
         ));
     }
 
@@ -285,7 +285,7 @@ final protected static function assertClassImplementsInterface(string $interface
         self::assertTrue($reflection->implementsInterface($interfaceName), \sprintf(
             'Failed asserting that class "%s" implements interface "%s".',
             $className,
-            $interfaceName
+            $interfaceName,
         ));
     }
 
@@ -305,7 +305,7 @@ final protected static function assertClassIsAbstract(string $className): void
 
         self::assertTrue($reflection->isAbstract(), \sprintf(
             'Failed asserting that class "%s" is abstract.',
-            $className
+            $className,
         ));
     }
 
@@ -327,7 +327,7 @@ final protected static function assertClassIsFinal(string $className): void
 
         self::assertTrue($reflection->isFinal(), \sprintf(
             'Failed asserting that class "%s" is final.',
-            $className
+            $className,
         ));
     }
 
@@ -347,7 +347,7 @@ final protected static function assertClassSatisfiesSpecification(callable $spec
 
         self::assertTrue($specification($className), \sprintf(
             '' !== $message ? $message : 'Failed asserting that class "%s" satisfies a specification.',
-            $className
+            $className,
         ));
     }
 
@@ -368,7 +368,7 @@ final protected static function assertClassUsesTrait(string $traitName, string $
         self::assertContains($traitName, \class_uses($className), \sprintf(
             'Failed asserting that class "%s" uses trait "%s".',
             $className,
-            $traitName
+            $traitName,
         ));
     }
 
@@ -379,7 +379,7 @@ final protected static function assertInterfaceExists(string $interfaceName): vo
     {
         self::assertTrue(\interface_exists($interfaceName), \sprintf(
             'Failed asserting that an interface "%s" exists.',
-            $interfaceName
+            $interfaceName,
         ));
     }
 
@@ -403,7 +403,7 @@ final protected static function assertInterfaceExtends(string $parentInterfaceNa
         self::assertTrue($reflection->isSubclassOf($parentInterfaceName), \sprintf(
             'Failed asserting that interface "%s" extends "%s".',
             $interfaceName,
-            $parentInterfaceName
+            $parentInterfaceName,
         ));
     }
 
@@ -423,7 +423,7 @@ final protected static function assertInterfaceSatisfiesSpecification(callable $
 
         self::assertTrue($specification($interfaceName), \sprintf(
             '' !== $message ? $message : 'Failed asserting that interface "%s" satisfies a specification.',
-            $interfaceName
+            $interfaceName,
         ));
     }
 
@@ -434,7 +434,7 @@ final protected static function assertTraitExists(string $traitName): void
     {
         self::assertTrue(\trait_exists($traitName), \sprintf(
             'Failed asserting that a trait "%s" exists.',
-            $traitName
+            $traitName,
         ));
     }
 
@@ -454,7 +454,7 @@ final protected static function assertTraitSatisfiesSpecification(callable $spec
 
         self::assertTrue($specification($traitName), \sprintf(
             '' !== $message ? $message : 'Failed asserting that trait "%s" satisfies a specification.',
-            $traitName
+            $traitName,
         ));
     }
 

diff --git a/test/Unit/DataProvider/AbstractProviderTestCase.php b/test/Unit/DataProvider/AbstractProviderTestCase.php
@@ -39,7 +39,7 @@ final protected static function assertProvidesDataSetsForValues(array $values, \
         self::assertEquals(
             $expectedDataSets,
             $actualDataSets,
-            'Failed asserting that a generator yields data sets for the expected values.'
+            'Failed asserting that a generator yields data sets for the expected values.',
         );
     }
 
@@ -53,7 +53,7 @@ final protected static function assertProvidesDataSetsForValuesSatisfyingSpecifi
             'string',
             \array_keys($specifications),
             true,
-            'Failed asserting that the keys of specifications are all strings.'
+            'Failed asserting that the keys of specifications are all strings.',
         );
 
         self::assertContainsOnly(
@@ -62,16 +62,16 @@ final protected static function assertProvidesDataSetsForValuesSatisfyingSpecifi
             false,
             \sprintf(
                 'Failed asserting that the values of specifications implement "%s".',
-                Util\Test\Util\DataProvider\Specification\Specification::class
-            )
+                Util\Test\Util\DataProvider\Specification\Specification::class,
+            ),
         );
 
         $dataSets = \iterator_to_array($provider);
 
         self::assertEquals(
             \array_keys($specifications),
             \array_keys($dataSets),
-            'Failed asserting that the provided data has the same keys as the specifications.'
+            'Failed asserting that the provided data has the same keys as the specifications.',
         );
 
         $keysForDataSetsWhereValueDoesNotSatisfySpecification = \array_filter(\array_keys($dataSets), static function (string $key) use ($dataSets, $specifications): bool {
@@ -82,12 +82,12 @@ final protected static function assertProvidesDataSetsForValuesSatisfyingSpecifi
 
             self::assertIsArray($dataSet, \sprintf(
                 'Failed asserting that the data set provided for key "%s" is an array.',
-                $key
+                $key,
             ));
 
             self::assertCount(1, $dataSet, \sprintf(
                 'Failed asserting that the data set provided for key "%s" contains only one value.',
-                $key
+                $key,
             ));
 
             $value = \array_shift($dataSet);
@@ -99,8 +99,8 @@ final protected static function assertProvidesDataSetsForValuesSatisfyingSpecifi
             'Failed asserting that the value for the data sets with the keys "%s" satisfy the corresponding requirements.',
             \implode(
                 '", "',
-                $keysForDataSetsWhereValueDoesNotSatisfySpecification
-            )
+                $keysForDataSetsWhereValueDoesNotSatisfySpecification,
+            ),
         ));
     }
 

diff --git a/test/Unit/Exception/InvalidExcludeClassNameTest.php b/test/Unit/Exception/InvalidExcludeClassNameTest.php
@@ -46,7 +46,7 @@ public function testFromClassNameReturnsException($className): void
 
         $message = \sprintf(
             'Exclude class name should be a string, got "%s" instead.',
-            \is_object($className) ? \get_class($className) : \gettype($className)
+            \is_object($className) ? \get_class($className) : \gettype($className),
         );
 
         self::assertSame($message, $exception->getMessage());

diff --git a/test/Unit/Exception/NonExistentDirectoryTest.php b/test/Unit/Exception/NonExistentDirectoryTest.php
@@ -43,7 +43,7 @@ public function testFromDirectoryReturnsException(): void
 
         $message = \sprintf(
             'Directory "%s" does not exist.',
-            $directory
+            $directory,
         );
 
         self::assertSame($message, $exception->getMessage());

diff --git a/test/Unit/Exception/NonExistentExcludeClassTest.php b/test/Unit/Exception/NonExistentExcludeClassTest.php
@@ -43,7 +43,7 @@ public function testFromClassNameReturnsException(): void
 
         $message = \sprintf(
             'Exclude class "%s" does not exist.',
-            $className
+            $className,
         );
 
         self::assertSame($message, $exception->getMessage());