diff --git a/.php_cs b/.php_cs index 99b25c41..e0c65d5a 100644 --- a/.php_cs +++ b/.php_cs @@ -11,7 +11,7 @@ the LICENSE file that was distributed with this source code. @see https://github.com/localheinz/composer-normalize EOF; -$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php70($header)); +$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php71($header)); $config->getFinder()->in(__DIR__); diff --git a/.travis.yml b/.travis.yml index a8398fff..beccd3c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ jobs: include: - stage: Style - php: 7.0 + php: 7.1 before_install: - source .travis/xdebug.sh @@ -40,7 +40,7 @@ jobs: stage: Test - php: 7.0 + php: 7.1 env: WITH_LOWEST=true @@ -63,24 +63,6 @@ jobs: after_success: - if [[ "$WITH_COVERAGE" == "true" ]]; then bash <(curl -s https://codecov.io/bash); fi - - <<: *TEST - - php: 7.0 - - env: WITH_LOCKED=true - - - <<: *TEST - - php: 7.0 - - env: WITH_HIGHEST=true - - - <<: *TEST - - php: 7.1 - - env: WITH_LOWEST=true - - <<: *TEST php: 7.1 diff --git a/composer.json b/composer.json index 3c5e57e6..0eec2ae2 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": "^7.0", + "php": "^7.1", "composer-plugin-api": "^1.1.0", "localheinz/json-normalizer": "0.2.0" }, diff --git a/composer.lock b/composer.lock index 6b3f4ca4..a83619ae 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c19a78fe1c706f680e1fa93b776e2082", + "content-hash": "60d0b9397d33bd97fa027c0348f518a5", "packages": [ { "name": "justinrainbow/json-schema", @@ -3651,7 +3651,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.0" + "php": "^7.1" }, "platform-dev": [] } diff --git a/src/Command/NormalizeCommand.php b/src/Command/NormalizeCommand.php index 75d58e57..06aca168 100644 --- a/src/Command/NormalizeCommand.php +++ b/src/Command/NormalizeCommand.php @@ -32,7 +32,7 @@ public function __construct(Normalizer\NormalizerInterface $normalizer) $this->normalizer = $normalizer; } - protected function configure() + protected function configure(): void { $this->setDescription('Normalizes composer.json according to its JSON schema (https://getcomposer.org/schema.json).'); $this->setDefinition([ diff --git a/src/Normalizer/VersionConstraintNormalizer.php b/src/Normalizer/VersionConstraintNormalizer.php index e227919b..21b9c72e 100644 --- a/src/Normalizer/VersionConstraintNormalizer.php +++ b/src/Normalizer/VersionConstraintNormalizer.php @@ -85,7 +85,7 @@ private function normalizeVersionConstraint(string $versionConstraint): string { $normalized = $versionConstraint; - foreach (self::$map as list($pattern, $glue)) { + foreach (self::$map as [$pattern, $glue]) { $split = \preg_split( $pattern, $normalized diff --git a/test/Unit/Command/NormalizeCommandTest.php b/test/Unit/Command/NormalizeCommandTest.php index 3ebcba50..aafc0418 100644 --- a/test/Unit/Command/NormalizeCommandTest.php +++ b/test/Unit/Command/NormalizeCommandTest.php @@ -46,12 +46,12 @@ protected function tearDown() $this->clearComposerFile(); } - public function testExtendsBaseCommand() + public function testExtendsBaseCommand(): void { $this->assertClassExtends(Command\BaseCommand::class, NormalizeCommand::class); } - public function testHasNameAndDescription() + public function testHasNameAndDescription(): void { $command = new NormalizeCommand($this->prophesize(Normalizer\NormalizerInterface::class)->reveal()); @@ -59,7 +59,7 @@ public function testHasNameAndDescription() $this->assertSame('Normalizes composer.json according to its JSON schema (https://getcomposer.org/schema.json).', $command->getDescription()); } - public function testHasNoArguments() + public function testHasNoArguments(): void { $command = new NormalizeCommand($this->prophesize(Normalizer\NormalizerInterface::class)->reveal()); @@ -68,7 +68,7 @@ public function testHasNoArguments() $this->assertCount(0, $definition->getArguments()); } - public function testHasNoUpdateLockOption() + public function testHasNoUpdateLockOption(): void { $command = new NormalizeCommand($this->prophesize(Normalizer\NormalizerInterface::class)->reveal()); @@ -84,7 +84,7 @@ public function testHasNoUpdateLockOption() $this->assertSame('Do not update lock file if it exists', $option->getDescription()); } - public function testExecuteFailsIfComposerFileDoesNotExist() + public function testExecuteFailsIfComposerFileDoesNotExist(): void { $composerFile = $this->pathToNonExistentComposerFile(); @@ -109,7 +109,7 @@ public function testExecuteFailsIfComposerFileDoesNotExist() $this->assertFileNotExists($composerFile); } - public function testExecuteFailsIfComposerFileIsNotReadable() + public function testExecuteFailsIfComposerFileIsNotReadable(): void { $original = $this->composerFileContent(); @@ -141,7 +141,7 @@ public function testExecuteFailsIfComposerFileIsNotReadable() $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteFailsIfComposerFileIsNotWritable() + public function testExecuteFailsIfComposerFileIsNotWritable(): void { $original = $this->composerFileContent(); @@ -173,7 +173,7 @@ public function testExecuteFailsIfComposerFileIsNotWritable() $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteFailsIfLockerIsLockedButNotFresh() + public function testExecuteFailsIfLockerIsLockedButNotFresh(): void { $original = $this->composerFileContent(); @@ -218,7 +218,7 @@ public function testExecuteFailsIfLockerIsLockedButNotFresh() $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteFailsIfNormalizerThrowsInvalidArgumentException() + public function testExecuteFailsIfNormalizerThrowsInvalidArgumentException(): void { $faker = $this->faker(); @@ -305,7 +305,7 @@ public function testExecuteFailsIfNormalizerThrowsInvalidArgumentException() $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteFailsIfNormalizerThrowsRuntimeException() + public function testExecuteFailsIfNormalizerThrowsRuntimeException(): void { $exception = new \RuntimeException($this->faker()->sentence); @@ -362,7 +362,7 @@ public function testExecuteFailsIfNormalizerThrowsRuntimeException() $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteSucceedsIfLockerIsNotLockedAndComposerFileIsAlreadyNormalized() + public function testExecuteSucceedsIfLockerIsNotLockedAndComposerFileIsAlreadyNormalized(): void { $original = $this->composerFileContent(); @@ -412,7 +412,7 @@ public function testExecuteSucceedsIfLockerIsNotLockedAndComposerFileIsAlreadyNo $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteSucceedsIfLockerIsLockedAndFreshButComposerFileIsAlreadyNormalized() + public function testExecuteSucceedsIfLockerIsLockedAndFreshButComposerFileIsAlreadyNormalized(): void { $original = $this->composerFileContent(); @@ -467,7 +467,7 @@ public function testExecuteSucceedsIfLockerIsLockedAndFreshButComposerFileIsAlre $this->assertStringEqualsFile($composerFile, $original); } - public function testExecuteSucceedsIfLockerIsNotLockedAndComposerFileWasNormalizedSuccessfully() + public function testExecuteSucceedsIfLockerIsNotLockedAndComposerFileWasNormalizedSuccessfully(): void { $original = $this->composerFileContent(); @@ -522,7 +522,7 @@ public function testExecuteSucceedsIfLockerIsNotLockedAndComposerFileWasNormaliz $this->assertStringEqualsFile($composerFile, $normalized); } - public function testExecuteSucceedsIfLockerIsLockedAndLockerCouldBeUpdatedAfterNormalization() + public function testExecuteSucceedsIfLockerIsLockedAndLockerCouldBeUpdatedAfterNormalization(): void { $original = $this->composerFileContent(); @@ -612,7 +612,7 @@ public function testExecuteSucceedsIfLockerIsLockedAndLockerCouldBeUpdatedAfterN $this->assertStringEqualsFile($composerFile, $normalized); } - public function testExecuteSucceedsIfLockerIsLockedButSkipsUpdatingLockerIfNoUpdateLockOptionIsUsed() + public function testExecuteSucceedsIfLockerIsLockedButSkipsUpdatingLockerIfNoUpdateLockOptionIsUsed(): void { $original = $this->composerFileContent(); @@ -760,7 +760,7 @@ private function useComposerFile(string $composerFile) /** * @see Factory::getComposerFile() */ - private function clearComposerFile() + private function clearComposerFile(): void { \putenv('COMPOSER'); } diff --git a/test/Unit/NormalizePluginTest.php b/test/Unit/NormalizePluginTest.php index 66089ef7..79570303 100644 --- a/test/Unit/NormalizePluginTest.php +++ b/test/Unit/NormalizePluginTest.php @@ -51,7 +51,7 @@ public function providerInterfaceName(): \Generator } } - public function testGetCapabilitiesReturnsCapabilities() + public function testGetCapabilitiesReturnsCapabilities(): void { $plugin = new NormalizePlugin(); @@ -67,7 +67,7 @@ public function testGetCapabilitiesReturnsCapabilities() $this->assertSame($expected, $plugin->getCapabilities()); } - public function testProvidesNormalizeCommand() + public function testProvidesNormalizeCommand(): void { $plugin = new NormalizePlugin(); diff --git a/test/Unit/Normalizer/AbstractNormalizerTestCase.php b/test/Unit/Normalizer/AbstractNormalizerTestCase.php index dc707626..f9c69048 100644 --- a/test/Unit/Normalizer/AbstractNormalizerTestCase.php +++ b/test/Unit/Normalizer/AbstractNormalizerTestCase.php @@ -21,12 +21,12 @@ abstract class AbstractNormalizerTestCase extends Framework\TestCase { use Helper; - final public function testImplementsNormalizerInterface() + final public function testImplementsNormalizerInterface(): void { $this->assertClassImplementsInterface(NormalizerInterface::class, $this->className()); } - final public function testNormalizeRejectsInvalidJson() + final public function testNormalizeRejectsInvalidJson(): void { $json = $this->faker()->realText(); diff --git a/test/Unit/Normalizer/BinNormalizerTest.php b/test/Unit/Normalizer/BinNormalizerTest.php index ba54f39b..1f22ca01 100644 --- a/test/Unit/Normalizer/BinNormalizerTest.php +++ b/test/Unit/Normalizer/BinNormalizerTest.php @@ -17,7 +17,7 @@ final class BinNormalizerTest extends AbstractNormalizerTestCase { - public function testNormalizeDoesNotModifyOtherProperty() + public function testNormalizeDoesNotModifyOtherProperty(): void { $json = <<<'JSON' { @@ -33,7 +33,7 @@ public function testNormalizeDoesNotModifyOtherProperty() $this->assertSame($json, $normalizer->normalize($json)); } - public function testNormalizeDoesNotModifyBinIfPropertyExistsAsString() + public function testNormalizeDoesNotModifyBinIfPropertyExistsAsString(): void { $json = <<<'JSON' { @@ -50,7 +50,7 @@ public function testNormalizeDoesNotModifyBinIfPropertyExistsAsString() $this->assertSame($json, $normalizer->normalize($json)); } - public function testNormalizeSortsBinIfPropertyExistsAsArray() + public function testNormalizeSortsBinIfPropertyExistsAsArray(): void { $json = <<<'JSON' { diff --git a/test/Unit/Normalizer/ComposerJsonNormalizerTest.php b/test/Unit/Normalizer/ComposerJsonNormalizerTest.php index 15e6505f..8f89dcd0 100644 --- a/test/Unit/Normalizer/ComposerJsonNormalizerTest.php +++ b/test/Unit/Normalizer/ComposerJsonNormalizerTest.php @@ -25,7 +25,7 @@ final class ComposerJsonNormalizerTest extends AbstractNormalizerTestCase { - public function testComposesNormalizers() + public function testComposesNormalizers(): void { $normalizer = new ComposerJsonNormalizer(); @@ -55,7 +55,7 @@ public function testComposesNormalizers() $this->assertAttributeSame('https://getcomposer.org/schema.json', 'schemaUri', $schemaNormalizer); } - public function testNormalizeNormalizes() + public function testNormalizeNormalizes(): void { $json = <<<'JSON' { @@ -90,6 +90,7 @@ public function testNormalizeNormalizes() }, "autoload": { "psr-4": { + "": "/foo", "Helmut\\Foo\\Bar\\": "src/" } }, @@ -147,6 +148,7 @@ public function testNormalizeNormalizes() }, "autoload": { "psr-4": { + "": "/foo", "Helmut\\Foo\\Bar\\": "src/" } }, @@ -179,7 +181,7 @@ public function testNormalizeNormalizes() $this->assertSame($normalized, $normalizer->normalize($json)); } - private function assertComposesNormalizer(string $className, NormalizerInterface $normalizer) + private function assertComposesNormalizer(string $className, NormalizerInterface $normalizer): void { $this->assertClassExists($className); $this->assertClassImplementsInterface(NormalizerInterface::class, $className); @@ -199,7 +201,7 @@ private function assertComposesNormalizer(string $className, NormalizerInterface )); } - private function assertComposesNormalizers(array $classNames, NormalizerInterface $normalizer) + private function assertComposesNormalizers(array $classNames, NormalizerInterface $normalizer): void { foreach ($classNames as $className) { $this->assertClassExists($className); diff --git a/test/Unit/Normalizer/ConfigHashNormalizerTest.php b/test/Unit/Normalizer/ConfigHashNormalizerTest.php index cf6eef12..6eb8c873 100644 --- a/test/Unit/Normalizer/ConfigHashNormalizerTest.php +++ b/test/Unit/Normalizer/ConfigHashNormalizerTest.php @@ -17,7 +17,7 @@ final class ConfigHashNormalizerTest extends AbstractNormalizerTestCase { - public function testNormalizeDoesNotModifyOtherProperty() + public function testNormalizeDoesNotModifyOtherProperty(): void { $json = <<<'JSON' { @@ -33,7 +33,7 @@ public function testNormalizeDoesNotModifyOtherProperty() $this->assertSame($json, $normalizer->normalize($json)); } - public function testNormalizeIgnoresEmptyConfigHash() + public function testNormalizeIgnoresEmptyConfigHash(): void { $json = <<<'JSON' { @@ -46,7 +46,7 @@ public function testNormalizeIgnoresEmptyConfigHash() $this->assertSame($json, $normalizer->normalize($json)); } - public function testNormalizeSortsConfigHashIfPropertyExists() + public function testNormalizeSortsConfigHashIfPropertyExists(): void { $json = <<<'JSON' { diff --git a/test/Unit/Normalizer/PackageHashNormalizerTest.php b/test/Unit/Normalizer/PackageHashNormalizerTest.php index c7812678..d872513b 100644 --- a/test/Unit/Normalizer/PackageHashNormalizerTest.php +++ b/test/Unit/Normalizer/PackageHashNormalizerTest.php @@ -17,7 +17,7 @@ final class PackageHashNormalizerTest extends AbstractNormalizerTestCase { - public function testNormalizeDoesNotModifyOtherProperty() + public function testNormalizeDoesNotModifyOtherProperty(): void { $json = <<<'JSON' { @@ -38,7 +38,7 @@ public function testNormalizeDoesNotModifyOtherProperty() * * @param string $property */ - public function testNormalizeIgnoresEmptyPackageHash(string $property) + public function testNormalizeIgnoresEmptyPackageHash(string $property): void { $json = <<assertClassesAreAbstractOrFinal(__DIR__ . '/../../src'); } - public function testProductionClassesHaveTests() + public function testProductionClassesHaveTests(): void { $this->assertClassesHaveTests( __DIR__ . '/../../src', @@ -34,7 +34,7 @@ public function testProductionClassesHaveTests() ); } - public function testTestClassesAreAbstractOrFinal() + public function testTestClassesAreAbstractOrFinal(): void { $this->assertClassesAreAbstractOrFinal(__DIR__ . '/..'); }