From 0ba5bbae476000b1672ecf69ca8f8e23956c6cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 28 Dec 2021 11:45:42 +0100 Subject: [PATCH 1/2] Enhancement: Use Php73 rule set --- .php-cs-fixer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 07954fbd..6511cfff 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -26,7 +26,7 @@ $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())); $config->getFinder() ->exclude([ From c8a4ab280abcfb332e60f166ef04597b3fa4d6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 28 Dec 2021 11:46:47 +0100 Subject: [PATCH 2/2] Fix: Run 'make coding-standards' --- .php-cs-fixer.php | 4 +- bin/laxify-schema.php | 4 +- phar/composer-normalize.php | 4 +- src/Command/NormalizeCommand.php | 84 +++++++++---------- src/NormalizePlugin.php | 4 +- src/Version.php | 4 +- .../Command/NormalizeCommandProvider.php | 4 +- .../NormalizeCommand/AbstractTestCase.php | 26 +++--- .../Extra/NotValid/AdditionalKeys/Test.php | 4 +- .../NotValid/IndentSize/Missing/Test.php | 4 +- .../IndentSize/NotGreaterThanZero/Test.php | 4 +- .../NotValid/IndentSize/NotInteger/Test.php | 4 +- .../NotValid/IndentStyle/Missing/Test.php | 4 +- .../IndentStyle/NotSpaceOrTab/Test.php | 4 +- .../NotValid/IndentStyle/NotString/Test.php | 4 +- .../Extra/Valid/WithOptions/Test.php | 6 +- .../Extra/Valid/WithoutOptions/Test.php | 6 +- .../NormalizeCommand/Json/NotValid/Test.php | 4 +- .../Json/AlreadyNormalized/Test.php | 6 +- .../NotPresent/Json/NotYetNormalized/Test.php | 30 +++---- .../Json/AlreadyNormalized/Test.php | 6 +- .../NotYetNormalized/Lock/FreshAfter/Test.php | 12 +-- .../Lock/NotFreshAfter/Test.php | 12 +-- .../Json/AlreadyNormalized/Test.php | 6 +- .../Json/NotYetNormalized/Test.php | 6 +- .../WithoutNoCheckLock/Test.php | 4 +- .../Normalizer/Throws/Test.php | 6 +- .../Options/NotValid/Test.php | 20 ++--- test/Util/File.php | 2 +- test/Util/Scenario.php | 8 +- test/Util/State.php | 6 +- 31 files changed, 151 insertions(+), 151 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 6511cfff..acac9edc 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -18,10 +18,10 @@ __DIR__ . '/LICENSE.md', License\Range::since( License\Year::fromString('2018'), - new \DateTimeZone('UTC') + new \DateTimeZone('UTC'), ), License\Holder::fromString('Andreas Möller'), - License\Url::fromString('https://github.com/ergebnis/composer-normalize') + License\Url::fromString('https://github.com/ergebnis/composer-normalize'), ); $license->save(); diff --git a/bin/laxify-schema.php b/bin/laxify-schema.php index eb5ac699..dabce9b7 100644 --- a/bin/laxify-schema.php +++ b/bin/laxify-schema.php @@ -15,7 +15,7 @@ $schema = \json_decode( \file_get_contents($schemaFile), - false + false, ); $schema->additionalProperties = true; @@ -23,5 +23,5 @@ \file_put_contents($schemaFile, \json_encode( $schema, - \JSON_PRETTY_PRINT | \JSON_PRESERVE_ZERO_FRACTION | \JSON_UNESCAPED_SLASHES + \JSON_PRETTY_PRINT | \JSON_PRESERVE_ZERO_FRACTION | \JSON_UNESCAPED_SLASHES, )); diff --git a/phar/composer-normalize.php b/phar/composer-normalize.php index 7cfebea9..d840cde1 100644 --- a/phar/composer-normalize.php +++ b/phar/composer-normalize.php @@ -28,7 +28,7 @@ new Diff\Differ(new Diff\Output\StrictUnifiedDiffOutputBuilder([ 'fromFile' => 'original', 'toFile' => 'normalized', - ])) + ])), ); $application = new Application(); @@ -42,7 +42,7 @@ 0, [ 'normalize', - ] + ], ); } diff --git a/src/Command/NormalizeCommand.php b/src/Command/NormalizeCommand.php index 2acd8dae..cb9d89b5 100644 --- a/src/Command/NormalizeCommand.php +++ b/src/Command/NormalizeCommand.php @@ -58,25 +58,25 @@ protected function configure(): void new Console\Input\InputArgument( 'file', Console\Input\InputArgument::OPTIONAL, - 'Path to composer.json file' + 'Path to composer.json file', ), new Console\Input\InputOption( 'diff', null, Console\Input\InputOption::VALUE_NONE, - 'Show the results of normalizing' + 'Show the results of normalizing', ), new Console\Input\InputOption( 'dry-run', null, Console\Input\InputOption::VALUE_NONE, - 'Show the results of normalizing, but do not modify any files' + 'Show the results of normalizing, but do not modify any files', ), new Console\Input\InputOption( 'indent-size', null, Console\Input\InputOption::VALUE_REQUIRED, - 'Indent size (an integer greater than 0); should be used with the --indent-style option' + 'Indent size (an integer greater than 0); should be used with the --indent-style option', ), new Console\Input\InputOption( 'indent-style', @@ -84,20 +84,20 @@ protected function configure(): void Console\Input\InputOption::VALUE_REQUIRED, \sprintf( 'Indent style (one of "%s"); should be used with the --indent-size option', - \implode('", "', \array_keys(Normalizer\Format\Indent::CHARACTERS)) - ) + \implode('", "', \array_keys(Normalizer\Format\Indent::CHARACTERS)), + ), ), new Console\Input\InputOption( 'no-check-lock', null, Console\Input\InputOption::VALUE_NONE, - 'Do not check if lock file is up to date' + 'Do not check if lock file is up to date', ), new Console\Input\InputOption( 'no-update-lock', null, Console\Input\InputOption::VALUE_NONE, - 'Do not update lock file if it exists' + 'Do not update lock file if it exists', ), ]); } @@ -111,7 +111,7 @@ protected function execute( $io->write([ \sprintf( 'Running %s.', - Version::long() + Version::long(), ), '', ]); @@ -123,7 +123,7 @@ protected function execute( } catch (\RuntimeException $exception) { $io->writeError(\sprintf( '%s', - $exception->getMessage() + $exception->getMessage(), )); return 1; @@ -141,7 +141,7 @@ protected function execute( $composer = $this->factory->createComposer( $io, - $composerFile + $composerFile, ); try { @@ -149,7 +149,7 @@ protected function execute( } catch (\RuntimeException $exception) { $io->writeError(\sprintf( '%s', - $exception->getMessage() + $exception->getMessage(), )); return 1; @@ -172,7 +172,7 @@ protected function execute( ) { $io->writeError(\sprintf( '%s is not writable.', - $composerFile + $composerFile, )); return 1; @@ -203,7 +203,7 @@ protected function execute( self::showValidationErrors( $io, - ...$exception->errors() + ...$exception->errors(), ); return 1; @@ -212,14 +212,14 @@ protected function execute( self::showValidationErrors( $io, - ...$exception->errors() + ...$exception->errors(), ); return 1; } catch (\RuntimeException $exception) { $io->writeError(\sprintf( '%s', - $exception->getMessage() + $exception->getMessage(), )); return 1; @@ -233,13 +233,13 @@ protected function execute( $formatted = $this->formatter->format( $normalized, - $format + $format, ); if ($json->encoded() === $formatted->encoded()) { $io->write(\sprintf( '%s is already normalized.', - $composerFile + $composerFile, )); return 0; @@ -251,12 +251,12 @@ protected function execute( ) { $io->writeError(\sprintf( '%s is not normalized.', - $composerFile + $composerFile, )); $diff = $this->differ->diff( $json->encoded(), - $formatted->encoded() + $formatted->encoded(), ); $io->write([ @@ -274,12 +274,12 @@ protected function execute( \file_put_contents( $composerFile, - $formatted->encoded() + $formatted->encoded(), ); $io->write(\sprintf( 'Successfully normalized %s.', - $composerFile + $composerFile, )); if ( @@ -299,7 +299,7 @@ protected function execute( return self::updateLockerInWorkingDirectory( $application, $output, - \dirname($composerFile) + \dirname($composerFile), ); } @@ -328,7 +328,7 @@ private static function indentFromInput(Console\Input\InputInterface $input): ?N if (null === $indentStyle) { throw new \RuntimeException(\sprintf( 'When using the indent-size option, an indent style (one of "%s") needs to be specified using the indent-style option.', - \implode('", "', \array_keys(Normalizer\Format\Indent::CHARACTERS)) + \implode('", "', \array_keys(Normalizer\Format\Indent::CHARACTERS)), )); } @@ -338,7 +338,7 @@ private static function indentFromInput(Console\Input\InputInterface $input): ?N ) { throw new \RuntimeException(\sprintf( 'Indent size needs to be an integer greater than 0, but "%s" is not.', - $indentSize + $indentSize, )); } @@ -346,13 +346,13 @@ private static function indentFromInput(Console\Input\InputInterface $input): ?N throw new \RuntimeException(\sprintf( 'Indent style needs to be one of "%s", but "%s" is not.', \implode('", "', \array_keys(Normalizer\Format\Indent::CHARACTERS)), - $indentStyle + $indentStyle, )); } return Normalizer\Format\Indent::fromSizeAndStyle( (int) $indentSize, - $indentStyle + $indentStyle, ); } @@ -375,31 +375,31 @@ private static function indentFromExtra(array $extra): ?Normalizer\Format\Indent if (!\is_array($configuration)) { throw new \RuntimeException(\sprintf( 'Configuration in composer extra requires keys "%s" with corresponding values."', - \implode('", "', $requiredKeys) + \implode('", "', $requiredKeys), )); } $missingKeys = \array_diff( $requiredKeys, - \array_keys($configuration) + \array_keys($configuration), ); if ([] !== $missingKeys) { throw new \RuntimeException(\sprintf( 'Configuration in composer extra requires keys "%s" with corresponding values."', - \implode('", "', $requiredKeys) + \implode('", "', $requiredKeys), )); } $extraKeys = \array_diff( \array_keys($configuration), - $requiredKeys + $requiredKeys, ); if ([] !== $extraKeys) { throw new \RuntimeException(\sprintf( 'Configuration in composer extra does not allow extra keys "%s"."', - \implode('", "', $extraKeys) + \implode('", "', $extraKeys), )); } @@ -408,14 +408,14 @@ private static function indentFromExtra(array $extra): ?Normalizer\Format\Indent if (!\is_int($indentSize)) { throw new \RuntimeException(\sprintf( 'Indent size needs to be an integer, got %s instead.', - \gettype($indentSize) + \gettype($indentSize), )); } if (1 > $indentSize) { throw new \RuntimeException(\sprintf( 'Indent size needs to be an integer greater than 0, but %d is not.', - $indentSize + $indentSize, )); } @@ -424,7 +424,7 @@ private static function indentFromExtra(array $extra): ?Normalizer\Format\Indent if (!\is_string($indentStyle)) { throw new \RuntimeException(\sprintf( 'Indent style needs to be a string, got %s instead.', - \gettype($indentStyle) + \gettype($indentStyle), )); } @@ -432,13 +432,13 @@ private static function indentFromExtra(array $extra): ?Normalizer\Format\Indent throw new \RuntimeException(\sprintf( 'Indent style needs to be one of "%s", but "%s" is not.', \implode('", "', \array_keys(Normalizer\Format\Indent::CHARACTERS)), - $indentStyle + $indentStyle, )); } return Normalizer\Format\Indent::fromSizeAndStyle( $indentSize, - $indentStyle + $indentStyle, ); } @@ -449,7 +449,7 @@ private static function showValidationErrors( foreach ($errors as $error) { $io->writeError(\sprintf( '- %s', - $error + $error, )); } @@ -460,7 +460,7 @@ private static function formatDiff(string $diff): string { $lines = \explode( "\n", - $diff + $diff, ); $formatted = \array_map(static function (string $line): string { @@ -473,7 +473,7 @@ private static function formatDiff(string $diff): string '$1', '$1', ], - $line + $line, ); if (!\is_string($replaced)) { @@ -485,7 +485,7 @@ private static function formatDiff(string $diff): string return \implode( "\n", - $formatted + $formatted, ); } @@ -509,7 +509,7 @@ private static function updateLockerInWorkingDirectory( '--no-scripts' => true, '--working-dir' => $workingDirectory, ]), - $output + $output, ); } } diff --git a/src/NormalizePlugin.php b/src/NormalizePlugin.php index a02bc4c5..dc6b359f 100644 --- a/src/NormalizePlugin.php +++ b/src/NormalizePlugin.php @@ -55,13 +55,13 @@ public function getCommands(): array new Factory(), new Normalizer\Vendor\Composer\ComposerJsonNormalizer(\sprintf( 'file://%s', - \realpath(__DIR__ . '/../resource/schema.json') + \realpath(__DIR__ . '/../resource/schema.json'), )), new Normalizer\Format\Formatter(new Printer\Printer()), new Diff\Differ(new Diff\Output\StrictUnifiedDiffOutputBuilder([ 'fromFile' => 'original', 'toFile' => 'normalized', - ])) + ])), ), ]; } diff --git a/src/Version.php b/src/Version.php index 0c406b88..3eaf832d 100644 --- a/src/Version.php +++ b/src/Version.php @@ -36,7 +36,7 @@ public static function long(): string return \sprintf( '%s %s', $name, - $attribution + $attribution, ); } @@ -44,7 +44,7 @@ public static function long(): string '%s %s %s', $name, $version, - $attribution + $attribution, ); } } diff --git a/test/DataProvider/Command/NormalizeCommandProvider.php b/test/DataProvider/Command/NormalizeCommandProvider.php index f003d3f7..61cd9a5e 100644 --- a/test/DataProvider/Command/NormalizeCommandProvider.php +++ b/test/DataProvider/Command/NormalizeCommandProvider.php @@ -53,7 +53,7 @@ public function commandInvocationAndInvalidIndentSize(): \Generator $key = \sprintf( '%s-indent-size-%s', $commandInvocation->style(), - $indentSizeKey + $indentSizeKey, ); yield $key => [ @@ -82,7 +82,7 @@ public function commandInvocationIndentSizeAndIndentStyle(): \Generator '%s-indent-size-%d-indent-style-%s', $commandInvocation->style(), (string) $indentSize, - $indentStyle + $indentStyle, ); yield $key => [ diff --git a/test/Integration/Command/NormalizeCommand/AbstractTestCase.php b/test/Integration/Command/NormalizeCommand/AbstractTestCase.php index d9dddae0..ef3201b7 100644 --- a/test/Integration/Command/NormalizeCommand/AbstractTestCase.php +++ b/test/Integration/Command/NormalizeCommand/AbstractTestCase.php @@ -62,7 +62,7 @@ final protected static function createScenario( if (!\is_dir($fixtureDirectory)) { throw new \InvalidArgumentException(\sprintf( 'Fixture directory "%s" does not exist', - $fixtureDirectory + $fixtureDirectory, )); } @@ -72,12 +72,12 @@ final protected static function createScenario( $fileSystem->mirror( $fixtureDirectory, - self::temporaryDirectory() + self::temporaryDirectory(), ); $scenario = Test\Util\Scenario::fromCommandInvocationAndInitialState( $commandInvocation, - Test\Util\State::fromDirectory(Test\Util\Directory::fromPath(self::temporaryDirectory())) + Test\Util\State::fromDirectory(Test\Util\Directory::fromPath(self::temporaryDirectory())), ); if ($commandInvocation->is(Test\Util\CommandInvocation::inCurrentWorkingDirectory())) { @@ -109,7 +109,7 @@ final protected static function createApplicationWithNormalizeCommandAsProvidedB throw new \RuntimeException(\sprintf( 'Expected "%s" to provide an instance of "%s" as command.', NormalizePlugin::class, - NormalizeCommand::class + NormalizeCommand::class, )); } @@ -132,7 +132,7 @@ final protected static function assertComposerJsonFileModified( self::assertNotEquals( $expected->composerJsonFile()->contents(), $actual->composerJsonFile()->contents(), - 'Failed asserting that initial composer.json has been modified.' + 'Failed asserting that initial composer.json has been modified.', ); } @@ -155,7 +155,7 @@ final protected static function assertComposerLockFileFresh(Test\Util\State $sta self::assertSame(0, $exitCode, \sprintf( 'Failed asserting that composer.lock is fresh in %s.', - $state->directory()->path() + $state->directory()->path(), )); } @@ -168,7 +168,7 @@ final protected static function assertComposerLockFileNotFresh(Test\Util\State $ self::assertNotSame(0, $exitCode, \sprintf( 'Failed asserting that composer.lock is not fresh in %s.', - $state->directory()->path() + $state->directory()->path(), )); } @@ -179,7 +179,7 @@ final protected static function assertComposerLockFileModified(Test\Util\State $ self::assertJsonStringNotEqualsJsonString( self::normalizeLockFileContents($expected->composerLockFile()->contents()), self::normalizeLockFileContents($actual->composerLockFile()->contents()), - 'Failed asserting that initial composer.lock has been modified.' + 'Failed asserting that initial composer.lock has been modified.', ); } @@ -190,7 +190,7 @@ final protected static function assertComposerLockFileNotModified(Test\Util\Stat self::assertJsonStringEqualsJsonString( self::normalizeLockFileContents($expected->composerLockFile()->contents()), self::normalizeLockFileContents($actual->composerLockFile()->contents()), - 'Failed asserting that initial composer.lock has not been modified.' + 'Failed asserting that initial composer.lock has not been modified.', ); } @@ -199,7 +199,7 @@ final protected static function assertExitCodeSame(int $expected, int $actual): self::assertSame($expected, $actual, \sprintf( 'Failed asserting that exit code %d is identical to %d.', $actual, - $expected + $expected, )); } @@ -217,14 +217,14 @@ private static function normalizeLockFileContents(string $contents): string { $decoded = \json_decode( $contents, - true + true, ); unset($decoded['plugin-api-version']); $normalized = \json_encode( $decoded, - \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_PRESERVE_ZERO_FRACTION + \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_PRESERVE_ZERO_FRACTION, ); if (!\is_string($normalized)) { @@ -246,7 +246,7 @@ private static function validateComposer(Test\Util\State $state): int '--no-check-publish' => true, '--working-dir' => $state->directory()->path(), ]), - new Console\Output\BufferedOutput() + new Console\Output\BufferedOutput(), ); } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/Test.php index 43e03118..2a47b3af 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/Test.php index e4dff9b9..b196263f 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/Test.php index cced4122..6e7ef997 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/Test.php index 52f40e87..37201c25 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/Test.php index 045fba21..bb9b1389 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/Test.php index 43cd63d4..f2f21c13 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/Test.php b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/Test.php index ac0ba6b2..0659df3c 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/Test.php @@ -34,7 +34,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -45,7 +45,7 @@ public function testFails(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/Test.php b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/Test.php index c68cf233..4baeed75 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/Test.php @@ -37,7 +37,7 @@ public function testSucceeds( ): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -56,7 +56,7 @@ public function testSucceeds( $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); @@ -67,7 +67,7 @@ public function testSucceeds( $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $display); diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/Test.php b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/Test.php index 8b874630..b54fb19d 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/Test.php +++ b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -50,14 +50,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/NotValid/Test.php b/test/Integration/Command/NormalizeCommand/Json/NotValid/Test.php index bf4aaffe..0f7e46e8 100644 --- a/test/Integration/Command/NormalizeCommand/Json/NotValid/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/NotValid/Test.php @@ -34,7 +34,7 @@ public function testFailsWhenComposerJsonIsValidAccordingToLaxValidation(Util\Co { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -50,7 +50,7 @@ public function testFailsWhenComposerJsonIsValidAccordingToLaxValidation(Util\Co $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/Test.php index 6d169051..b0d6cce7 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -50,14 +50,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( '%s is already normalized.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/Test.php index b5316d6a..2c4fd2ed 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -50,14 +50,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); @@ -75,7 +75,7 @@ public function testSucceedsWhenDiffOptionIsUsed(Util\CommandInvocation $command { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -93,14 +93,14 @@ public function testSucceedsWhenDiffOptionIsUsed(Util\CommandInvocation $command $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); $renderedOutput = $output->fetch(); @@ -124,7 +124,7 @@ public function testFailsDryRunOptionIsUsed(Util\CommandInvocation $commandInvoc { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -142,7 +142,7 @@ public function testFailsDryRunOptionIsUsed(Util\CommandInvocation $commandInvoc $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); @@ -151,7 +151,7 @@ public function testFailsDryRunOptionIsUsed(Util\CommandInvocation $commandInvoc $expected = \sprintf( '%s is not normalized.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $renderedOutput); @@ -172,7 +172,7 @@ public function testSucceedsWhenIndentSizeAndIndentStyleOptionsAreUsed( ): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -191,14 +191,14 @@ public function testSucceedsWhenIndentSizeAndIndentStyleOptionsAreUsed( $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); @@ -216,7 +216,7 @@ public function testSucceedsNoUpdateLockOptionIsUsed(Util\CommandInvocation $com { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -234,14 +234,14 @@ public function testSucceedsNoUpdateLockOptionIsUsed(Util\CommandInvocation $com $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/Test.php index 43f8ae03..6541ebd1 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -51,14 +51,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( '%s is already normalized.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/Test.php index 7278e6f3..1f2131b8 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -51,14 +51,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); @@ -76,7 +76,7 @@ public function testFailsWhenDryRunOptionIsUsed(Util\CommandInvocation $commandI { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -94,7 +94,7 @@ public function testFailsWhenDryRunOptionIsUsed(Util\CommandInvocation $commandI $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); @@ -103,7 +103,7 @@ public function testFailsWhenDryRunOptionIsUsed(Util\CommandInvocation $commandI $expected = \sprintf( '%s is not normalized.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $renderedOutput); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/Test.php index 2e6fbff5..83cba01f 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -51,7 +51,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); @@ -62,7 +62,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $display); @@ -81,7 +81,7 @@ public function testSucceedsWhenNoUpdateLockOptionIsUsed(Util\CommandInvocation { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -100,14 +100,14 @@ public function testSucceedsWhenNoUpdateLockOptionIsUsed(Util\CommandInvocation $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/Test.php index b87029db..0cf275a2 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -53,14 +53,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( '%s is already normalized.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/Test.php index 036c719d..54891418 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/Test.php @@ -34,7 +34,7 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -53,14 +53,14 @@ public function testSucceeds(Util\CommandInvocation $commandInvocation): void $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(0, $exitCode); $expected = \sprintf( 'Successfully normalized %s.', - $scenario->composerJsonFileReference() + $scenario->composerJsonFileReference(), ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/Test.php b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/Test.php index e8c2ba66..57470de8 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/Test.php +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/Test.php @@ -34,7 +34,7 @@ public function testFailsWhenComposerJsonIsPresentAndValidAccordingToLaxValidati { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -51,7 +51,7 @@ public function testFailsWhenComposerJsonIsPresentAndValidAccordingToLaxValidati $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/Test.php b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/Test.php index 5ec7e9db..8d40952a 100644 --- a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/Test.php +++ b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/Test.php @@ -39,7 +39,7 @@ public function testFailsWhenNormalizerThrowsRuntimeExceptionDuringNormalization { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $initialState = $scenario->initialState(); @@ -71,7 +71,7 @@ public function normalize(Normalizer\Json $json): Normalizer\Json new Diff\Differ(new Diff\Output\StrictUnifiedDiffOutputBuilder([ 'fromFile' => 'original', 'toFile' => 'normalized', - ])) + ])), )); $input = new Console\Input\ArrayInput($scenario->consoleParameters()); @@ -80,7 +80,7 @@ public function normalize(Normalizer\Json $json): Normalizer\Json $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); diff --git a/test/Integration/Command/NormalizeCommand/Options/NotValid/Test.php b/test/Integration/Command/NormalizeCommand/Options/NotValid/Test.php index 40567736..9f95ed9c 100644 --- a/test/Integration/Command/NormalizeCommand/Options/NotValid/Test.php +++ b/test/Integration/Command/NormalizeCommand/Options/NotValid/Test.php @@ -38,7 +38,7 @@ public function testFailsWhenIndentStyleOptionIsUsedWithoutIndentSizeOption(Util $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -51,7 +51,7 @@ public function testFailsWhenIndentStyleOptionIsUsedWithoutIndentSizeOption(Util $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); @@ -66,7 +66,7 @@ public function testFailsWhenIndentSizeOptionIsUsedWithoutIndentStyleOption(Util { $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -79,7 +79,7 @@ public function testFailsWhenIndentSizeOptionIsUsedWithoutIndentStyleOption(Util $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); @@ -98,7 +98,7 @@ public function testFailsWhenIndentStyleOptionIsInvalid(Util\CommandInvocation $ $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -112,14 +112,14 @@ public function testFailsWhenIndentStyleOptionIsInvalid(Util\CommandInvocation $ $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); $expected = \sprintf( 'Indent style needs to be one of "space", "tab", but "%s" is not.', - $indentStyle + $indentStyle, ); self::assertStringContainsString($expected, $output->fetch()); @@ -136,7 +136,7 @@ public function testFailsWhenIndentSizeOptionIsInvalid(Util\CommandInvocation $c $scenario = self::createScenario( $commandInvocation, - __DIR__ . '/fixture' + __DIR__ . '/fixture', ); $application = self::createApplicationWithNormalizeCommandAsProvidedByNormalizePlugin(); @@ -150,14 +150,14 @@ public function testFailsWhenIndentSizeOptionIsInvalid(Util\CommandInvocation $c $exitCode = $application->run( $input, - $output + $output, ); self::assertExitCodeSame(1, $exitCode); $expected = \sprintf( 'Indent size needs to be an integer greater than 0, but "%s" is not.', - $indentSize + $indentSize, ); self::assertStringContainsString($expected, $output->fetch()); diff --git a/test/Util/File.php b/test/Util/File.php index 771b20a7..39fa5304 100644 --- a/test/Util/File.php +++ b/test/Util/File.php @@ -68,7 +68,7 @@ public function contents(): string if (false === $this->exists || null === $this->contents) { throw new \BadMethodCallException(\sprintf( 'File at "%s" did not exist or was not readable at the time of creation.', - $this->path + $this->path, )); } diff --git a/test/Util/Scenario.php b/test/Util/Scenario.php index 602b2fc5..667ca91b 100644 --- a/test/Util/Scenario.php +++ b/test/Util/Scenario.php @@ -35,7 +35,7 @@ public static function fromCommandInvocationAndInitialState(CommandInvocation $c { return new self( $commandInvocation, - $initialState + $initialState, ); } @@ -68,7 +68,7 @@ public function consoleParametersWith(array $parameters): array { return \array_merge( $this->consoleParameters(), - $parameters + $parameters, ); } @@ -85,7 +85,7 @@ public function consoleParameters(): array return \array_merge($parameters, [ 'file' => \sprintf( '%s/composer.json', - $this->initialState->directory()->path() + $this->initialState->directory()->path(), ), ]); } @@ -104,7 +104,7 @@ public function composerJsonFileReference(): string if ($this->commandInvocation->is(CommandInvocation::usingFileArgument())) { return \sprintf( '%s/composer.json', - $this->initialState->directory()->path() + $this->initialState->directory()->path(), ); } diff --git a/test/Util/State.php b/test/Util/State.php index 01968666..6adf69e1 100644 --- a/test/Util/State.php +++ b/test/Util/State.php @@ -41,17 +41,17 @@ private function __construct(Directory $directory) $this->composerJsonFile = File::fromPath(\sprintf( '%s/composer.json', - $directory->path() + $directory->path(), )); $this->composerLockFile = File::fromPath(\sprintf( '%s/composer.lock', - $directory->path() + $directory->path(), )); $this->vendorDirectory = Directory::fromPath(\sprintf( '%s/vendor', - $directory->path() + $directory->path(), )); }