From a8f8f8f09da676775272e932105077c4e5764500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 27 Aug 2021 10:35:56 +0200 Subject: [PATCH] Fix: Run 'php-cs-fixer fix' --- .../MockObject/Builder/InvocationMocker.php | 3 ++- src/Framework/MockObject/Generator.php | 3 ++- src/Framework/MockObject/Invocation.php | 6 ++++-- src/Framework/TestCase.php | 3 ++- src/Runner/TestSuiteSorter.php | 18 ++++++++++++------ src/TextUI/Help.php | 3 ++- src/Util/Annotation/DocBlock.php | 3 ++- src/Util/Color.php | 6 ++++-- src/Util/ErrorHandler.php | 3 ++- src/Util/PHP/AbstractPhpProcess.php | 3 ++- src/Util/RegularExpression.php | 3 ++- src/Util/TestDox/CliTestDoxPrinter.php | 3 ++- src/Util/TestDox/NamePrettifier.php | 6 ++++-- src/Util/TestDox/TestDoxPrinter.php | 3 ++- src/Util/TestDox/XmlResultPrinter.php | 3 ++- src/Util/XdebugFilterScriptGenerator.php | 3 ++- tests/unit/Framework/Assert/FunctionsTest.php | 3 ++- tests/unit/Framework/AssertTest.php | 9 ++++++--- .../unit/Framework/Constraint/CallbackTest.php | 9 ++++++--- .../Framework/Constraint/LogicalAndTest.php | 9 ++++++--- .../Framework/Constraint/LogicalOrTest.php | 9 ++++++--- .../Framework/Constraint/LogicalXorTest.php | 3 ++- .../Framework/MockObject/MockObjectTest.php | 12 ++++++++---- tests/unit/Util/TestDox/NamePrettifierTest.php | 12 ++++++++---- 24 files changed, 92 insertions(+), 46 deletions(-) diff --git a/src/Framework/MockObject/Builder/InvocationMocker.php b/src/Framework/MockObject/Builder/InvocationMocker.php index ee4dd20a667..974ca87ba64 100644 --- a/src/Framework/MockObject/Builder/InvocationMocker.php +++ b/src/Framework/MockObject/Builder/InvocationMocker.php @@ -217,7 +217,8 @@ public function method($constraint): self } $configurableMethodNames = array_map( - static function (ConfigurableMethod $configurable) { + static function (ConfigurableMethod $configurable) + { return strtolower($configurable->getName()); }, $this->configurableMethods diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php index e0e1d5bc360..9ece81eadf5 100644 --- a/src/Framework/MockObject/Generator.php +++ b/src/Framework/MockObject/Generator.php @@ -114,7 +114,8 @@ public function getMock($type, $methods = [], array $arguments = [], string $moc if (is_array($type)) { $type = array_unique( array_map( - static function ($type) { + static function ($type) + { if ($type === 'Traversable' || $type === '\\Traversable' || $type === '\\Iterator') { diff --git a/src/Framework/MockObject/Invocation.php b/src/Framework/MockObject/Invocation.php index 4151dc15f38..098b4fc942d 100644 --- a/src/Framework/MockObject/Invocation.php +++ b/src/Framework/MockObject/Invocation.php @@ -145,13 +145,15 @@ public function generateReturnValue() case 'callable': case 'closure': - return static function (): void { + return static function (): void + { }; case 'traversable': case 'generator': case 'iterable': - $generator = static function () { + $generator = static function () + { yield from []; }; diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php index 1223ca0c857..e8bd488ac17 100644 --- a/src/Framework/TestCase.php +++ b/src/Framework/TestCase.php @@ -1708,7 +1708,8 @@ protected function createPartialMock($originalClassName, array $methods): MockOb $mockedMethodsThatDontExist = array_filter( $methods, - static function (string $method) use ($reflection) { + static function (string $method) use ($reflection) + { return !$reflection->hasMethod($method); } ); diff --git a/src/Runner/TestSuiteSorter.php b/src/Runner/TestSuiteSorter.php index f44b92ced28..0d7d641c65b 100644 --- a/src/Runner/TestSuiteSorter.php +++ b/src/Runner/TestSuiteSorter.php @@ -246,7 +246,8 @@ private function suiteOnlyContainsTests(TestSuite $suite): bool { return array_reduce( $suite->tests(), - static function ($carry, $test) { + static function ($carry, $test) + { return $carry && ($test instanceof TestCase || $test instanceof DataProviderTestSuite); }, true @@ -272,7 +273,8 @@ private function sortDefectsFirst(array $tests): array /** * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */ - function ($left, $right) { + function ($left, $right) + { return $this->cmpDefectPriorityAndTime($left, $right); } ); @@ -287,7 +289,8 @@ private function sortByDuration(array $tests): array /** * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */ - function ($left, $right) { + function ($left, $right) + { return $this->cmpDuration($left, $right); } ); @@ -302,7 +305,8 @@ private function sortBySize(array $tests): array /** * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */ - function ($left, $right) { + function ($left, $right) + { return $this->cmpSize($left, $right); } ); @@ -386,7 +390,8 @@ private function resolveDependencies(array $tests): array /** * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */ - static function ($test) { + static function ($test) + { return self::getTestSorterUID($test); }, $tests @@ -417,7 +422,8 @@ private function getNormalizedDependencyNames($test): array } $names = array_map( - static function ($name) use ($testClass) { + static function ($name) use ($testClass) + { return strpos($name, '::') === false ? $testClass . '::' . $name : $name; }, $test->getDependencies() diff --git a/src/TextUI/Help.php b/src/TextUI/Help.php index f5af31147fa..2dd895604c8 100644 --- a/src/TextUI/Help.php +++ b/src/TextUI/Help.php @@ -234,7 +234,8 @@ private function writeWithColor(): void $arg = Color::colorize('fg-green', str_pad($option['arg'], $this->maxArgLength)); $arg = preg_replace_callback( '/(<[^>]+>)/', - static function ($matches) { + static function ($matches) + { return Color::colorize('fg-cyan', $matches[0]); }, $arg diff --git a/src/Util/Annotation/DocBlock.php b/src/Util/Annotation/DocBlock.php index 55be1ba315a..22d33130f91 100644 --- a/src/Util/Annotation/DocBlock.php +++ b/src/Util/Annotation/DocBlock.php @@ -604,7 +604,8 @@ private static function extractAnnotationsFromReflector(Reflector $reflector): a $annotations = array_merge( $annotations, ...array_map( - static function (ReflectionClass $trait): array { + static function (ReflectionClass $trait): array + { return self::parseDocBlock((string) $trait->getDocComment()); }, array_values($reflector->getTraits()) diff --git a/src/Util/Color.php b/src/Util/Color.php index a756953b66e..b96eb4747b5 100644 --- a/src/Util/Color.php +++ b/src/Util/Color.php @@ -116,7 +116,8 @@ public static function colorizePath(string $path, ?string $prevPath = null, bool $last = count($path) - 1; $path[$last] = preg_replace_callback( '/([\-_\.]+|phpt$)/', - static function ($matches) { + static function ($matches) + { return self::dim($matches[0]); }, $path[$last] @@ -139,7 +140,8 @@ public static function visualizeWhitespace(string $buffer, bool $visualizeEOL = { $replaceMap = $visualizeEOL ? self::WHITESPACE_EOL_MAP : self::WHITESPACE_MAP; - return preg_replace_callback('/\s+/', static function ($matches) use ($replaceMap) { + return preg_replace_callback('/\s+/', static function ($matches) use ($replaceMap) + { return self::dim(strtr($matches[0], $replaceMap)); }, $buffer); } diff --git a/src/Util/ErrorHandler.php b/src/Util/ErrorHandler.php index 61dbbbc1377..f8566347e84 100644 --- a/src/Util/ErrorHandler.php +++ b/src/Util/ErrorHandler.php @@ -57,7 +57,8 @@ final class ErrorHandler public static function invokeIgnoringWarnings(callable $callable) { set_error_handler( - static function ($errorNumber, $errorString) { + static function ($errorNumber, $errorString) + { if ($errorNumber === E_WARNING) { return; } diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php index b5de7144fe2..8706ae1a118 100644 --- a/src/Util/PHP/AbstractPhpProcess.php +++ b/src/Util/PHP/AbstractPhpProcess.php @@ -275,7 +275,8 @@ private function processChildResult(Test $test, TestResult $result, string $stdo /** * @throws ErrorException */ - static function ($errno, $errstr, $errfile, $errline): void { + static function ($errno, $errstr, $errfile, $errline): void + { throw new ErrorException($errstr, $errno, $errno, $errfile, $errline); } ); diff --git a/src/Util/RegularExpression.php b/src/Util/RegularExpression.php index 167b9215c2c..db1dae922e4 100644 --- a/src/Util/RegularExpression.php +++ b/src/Util/RegularExpression.php @@ -22,7 +22,8 @@ final class RegularExpression public static function safeMatch(string $pattern, string $subject) { return ErrorHandler::invokeIgnoringWarnings( - static function () use ($pattern, $subject) { + static function () use ($pattern, $subject) + { return preg_match($pattern, $subject); } ); diff --git a/src/Util/TestDox/CliTestDoxPrinter.php b/src/Util/TestDox/CliTestDoxPrinter.php index 49badb8be1e..5c66211907f 100644 --- a/src/Util/TestDox/CliTestDoxPrinter.php +++ b/src/Util/TestDox/CliTestDoxPrinter.php @@ -286,7 +286,8 @@ protected function formatTestResultMessage(Throwable $t, array $result, ?string if ($this->colors) { $color = self::STATUS_STYLES[$result['status']]['color'] ?? ''; - $prefix = array_map(static function ($p) use ($color) { + $prefix = array_map(static function ($p) use ($color) + { return Color::colorize($color, $p); }, self::PREFIX_DECORATED); } diff --git a/src/Util/TestDox/NamePrettifier.php b/src/Util/TestDox/NamePrettifier.php index b7da1c2daaa..c746d3159d4 100644 --- a/src/Util/TestDox/NamePrettifier.php +++ b/src/Util/TestDox/NamePrettifier.php @@ -143,7 +143,8 @@ public function prettifyTestCase(TestCase $test): string $annotations = $test->getAnnotations(); $annotationWithPlaceholders = false; - $callback = static function (string $variable): string { + $callback = static function (string $variable): string + { return sprintf('/%s(?=\b)/', preg_quote($variable, '/')); }; @@ -314,7 +315,8 @@ private function mapTestMethodParameterNamesToProvidedDataValues(TestCase $test) } if ($this->useColor) { - $providedData = array_map(static function ($value) { + $providedData = array_map(static function ($value) + { return Color::colorize('fg-cyan', Color::visualizeWhitespace((string) $value, true)); }, $providedData); } diff --git a/src/Util/TestDox/TestDoxPrinter.php b/src/Util/TestDox/TestDoxPrinter.php index c19ba2699d4..41d60670b96 100644 --- a/src/Util/TestDox/TestDoxPrinter.php +++ b/src/Util/TestDox/TestDoxPrinter.php @@ -374,7 +374,8 @@ protected function prefixLines(string $prefix, string $message): string return implode( PHP_EOL, array_map( - static function (string $text) use ($prefix) { + static function (string $text) use ($prefix) + { return ' ' . $prefix . ($text ? ' ' . $text : ''); }, preg_split('/\r\n|\r|\n/', $message) diff --git a/src/Util/TestDox/XmlResultPrinter.php b/src/Util/TestDox/XmlResultPrinter.php index 7a8d7d76920..fc511edd487 100644 --- a/src/Util/TestDox/XmlResultPrinter.php +++ b/src/Util/TestDox/XmlResultPrinter.php @@ -158,7 +158,8 @@ public function endTest(Test $test, float $time): void $groups = array_filter( $test->getGroups(), - static function ($group) { + static function ($group) + { return !($group === 'small' || $group === 'medium' || $group === 'large'); } ); diff --git a/src/Util/XdebugFilterScriptGenerator.php b/src/Util/XdebugFilterScriptGenerator.php index fc351019296..df495a19bbb 100644 --- a/src/Util/XdebugFilterScriptGenerator.php +++ b/src/Util/XdebugFilterScriptGenerator.php @@ -27,7 +27,8 @@ public function generate(array $filterData): string $items = $this->getWhitelistItems($filterData); $files = array_map( - static function ($item) { + static function ($item) + { return sprintf( " '%s'", $item diff --git a/tests/unit/Framework/Assert/FunctionsTest.php b/tests/unit/Framework/Assert/FunctionsTest.php index 12d03e75a8a..a98a20afb01 100644 --- a/tests/unit/Framework/Assert/FunctionsTest.php +++ b/tests/unit/Framework/Assert/FunctionsTest.php @@ -54,7 +54,8 @@ public function provideStaticAssertionMethodNames(): array return array_reduce( $matches[1], - static function (array $functionNames, string $functionName) { + static function (array $functionNames, string $functionName) + { $functionNames[$functionName] = [$functionName]; return $functionNames; diff --git a/tests/unit/Framework/AssertTest.php b/tests/unit/Framework/AssertTest.php index 1e9fc1af9cb..e4f95769d90 100644 --- a/tests/unit/Framework/AssertTest.php +++ b/tests/unit/Framework/AssertTest.php @@ -1368,7 +1368,8 @@ public function testAssertThatCallback(): void { $this->assertThat( null, - $this->callback(static function ($other) { + $this->callback(static function ($other) + { return true; }) ); @@ -2041,7 +2042,8 @@ public function testScalarTypeCanBeAsserted(): void public function testCallableTypeCanBeAsserted(): void { - $this->assertIsCallable(static function (): void { + $this->assertIsCallable(static function (): void + { }); try { @@ -2188,7 +2190,8 @@ public function testNotCallableTypeCanBeAsserted(): void $this->assertIsNotCallable(null); try { - $this->assertIsNotCallable(static function (): void { + $this->assertIsNotCallable(static function (): void + { }); } catch (AssertionFailedError $e) { return; diff --git a/tests/unit/Framework/Constraint/CallbackTest.php b/tests/unit/Framework/Constraint/CallbackTest.php index 0e100cee8c8..3be84ae577d 100644 --- a/tests/unit/Framework/Constraint/CallbackTest.php +++ b/tests/unit/Framework/Constraint/CallbackTest.php @@ -28,11 +28,13 @@ public function callbackReturningTrue() public function testConstraintCallback(): void { - $closureReflect = static function ($parameter) { + $closureReflect = static function ($parameter) + { return $parameter; }; - $closureWithoutParameter = static function () { + $closureWithoutParameter = static function () + { return true; }; @@ -56,7 +58,8 @@ public function testConstraintCallback(): void public function testConstraintCallbackFailure(): void { - $constraint = new Callback(static function () { + $constraint = new Callback(static function () + { return false; }); diff --git a/tests/unit/Framework/Constraint/LogicalAndTest.php b/tests/unit/Framework/Constraint/LogicalAndTest.php index 22da86ec13d..4ca5bf58e48 100644 --- a/tests/unit/Framework/Constraint/LogicalAndTest.php +++ b/tests/unit/Framework/Constraint/LogicalAndTest.php @@ -55,7 +55,8 @@ public function testCountReturnsCountOfComposedConstraints(): void 8, ]; - $constraints = array_map(static function (int $count) { + $constraints = array_map(static function (int $count) + { return CountConstraint::fromCount($count); }, $counts); @@ -76,7 +77,8 @@ public function testToStringReturnsImplodedStringRepresentationOfComposedConstra 'is rich in unsaturated fats', ]; - $constraints = array_map(static function (string $name) { + $constraints = array_map(static function (string $name) + { return NamedConstraint::fromName($name); }, $names); @@ -240,7 +242,8 @@ private function stringify(array $constraints): string { return implode( ' and ', - array_map(static function (Constraint $constraint) { + array_map(static function (Constraint $constraint) + { return $constraint->toString(); }, $constraints) ); diff --git a/tests/unit/Framework/Constraint/LogicalOrTest.php b/tests/unit/Framework/Constraint/LogicalOrTest.php index dec716d53c2..aefade91f09 100644 --- a/tests/unit/Framework/Constraint/LogicalOrTest.php +++ b/tests/unit/Framework/Constraint/LogicalOrTest.php @@ -47,7 +47,8 @@ public function testCountReturnsCountOfComposedConstraints(): void 8, ]; - $constraints = array_map(static function (int $count) { + $constraints = array_map(static function (int $count) + { return CountConstraint::fromCount($count); }, $counts); @@ -68,7 +69,8 @@ public function testToStringReturnsImplodedStringRepresentationOfComposedConstra 'is rich in unsaturated fats', ]; - $constraints = array_map(static function (string $name) { + $constraints = array_map(static function (string $name) + { return NamedConstraint::fromName($name); }, $names); @@ -234,7 +236,8 @@ private function stringify(array $constraints): string { return implode( ' or ', - array_map(static function (Constraint $constraint) { + array_map(static function (Constraint $constraint) + { return $constraint->toString(); }, $constraints) ); diff --git a/tests/unit/Framework/Constraint/LogicalXorTest.php b/tests/unit/Framework/Constraint/LogicalXorTest.php index 6d13c4feb80..25f2d3a04d4 100644 --- a/tests/unit/Framework/Constraint/LogicalXorTest.php +++ b/tests/unit/Framework/Constraint/LogicalXorTest.php @@ -25,7 +25,8 @@ public function testFromConstraintsReturnsConstraint(): void $other = 'Foo'; $count = 5; - $constraints = array_map(function () use ($other) { + $constraints = array_map(function () use ($other) + { static $count = 0; $constraint = $this->getMockBuilder(Constraint::class)->getMock(); diff --git a/tests/unit/Framework/MockObject/MockObjectTest.php b/tests/unit/Framework/MockObject/MockObjectTest.php index 1868dbc4c28..36246543b2f 100644 --- a/tests/unit/Framework/MockObject/MockObjectTest.php +++ b/tests/unit/Framework/MockObject/MockObjectTest.php @@ -589,7 +589,8 @@ public function testObjectMethodCallWithArgumentCloningEnabled(): void ->method('doSomethingElse') ->will( $this->returnCallback( - static function () use (&$actualArguments): void { + static function () use (&$actualArguments): void + { $actualArguments = \func_get_args(); } ) @@ -617,7 +618,8 @@ public function testObjectMethodCallWithArgumentCloningDisabled(): void ->method('doSomethingElse') ->will( $this->returnCallback( - static function () use (&$actualArguments): void { + static function () use (&$actualArguments): void + { $actualArguments = \func_get_args(); } ) @@ -846,7 +848,8 @@ public function testMockArgumentsPassedByReference2(): void $foo->expects($this->any()) ->method('bar') ->will($this->returnCallback( - static function (&$a, &$b, $c): void { + static function (&$a, &$b, $c): void + { $b = 1; } )); @@ -1030,7 +1033,8 @@ public function testParameterCallbackConstraintOnlyEvaluatedOnce(): void $callCount = 0; $mock->expects($this->exactly($expectedNumberOfCalls))->method('bar') - ->with($this->callback(static function ($argument) use (&$callCount) { + ->with($this->callback(static function ($argument) use (&$callCount) + { return $argument === 'call_' . $callCount++; })); diff --git a/tests/unit/Util/TestDox/NamePrettifierTest.php b/tests/unit/Util/TestDox/NamePrettifierTest.php index 9f9ee1fbed3..ec81c1ca322 100644 --- a/tests/unit/Util/TestDox/NamePrettifierTest.php +++ b/tests/unit/Util/TestDox/NamePrettifierTest.php @@ -65,7 +65,8 @@ public function testTestNameIsNotGroupedWhenNotInSequence(): void public function testPhpDoxIgnoreDataKeys(): void { - $test = new class extends TestCase { + $test = new class extends TestCase + { public function __construct() { parent::__construct('testAddition', [ @@ -94,7 +95,8 @@ public function getAnnotations(): array public function testPhpDoxUsesDefaultValue(): void { - $test = new class extends TestCase { + $test = new class extends TestCase + { public function __construct() { parent::__construct('testAddition', []); @@ -119,7 +121,8 @@ public function getAnnotations(): array public function testPhpDoxArgumentExporting(): void { - $test = new class extends TestCase { + $test = new class extends TestCase + { public function __construct() { parent::__construct('testExport', [ @@ -152,7 +155,8 @@ public function getAnnotations(): array public function testPhpDoxReplacesLongerVariablesFirst(): void { - $test = new class extends TestCase { + $test = new class extends TestCase + { public function __construct() { parent::__construct('testFoo', []);