diff --git a/src/Composer/ComposerPackage.php b/src/Composer/ComposerPackage.php index 5912451f5e81a0ceb955174338fbd242f0051477..fc3bddda0be021a382455c9cce5a0de2716143c7 100644 --- a/src/Composer/ComposerPackage.php +++ b/src/Composer/ComposerPackage.php @@ -90,7 +90,7 @@ final class ComposerPackage implements ComposerPackageInterface $data = $this->getComposerJson(); - return \array_key_exists($key, $data) ? $data[$key] : $default; + return array_key_exists($key, $data) ? $data[$key] : $default; } private function getComposerJson(): array diff --git a/src/Config.php b/src/Config.php index 64998adaa5e3dd8dbe81f8702452392c0ad8da82..64cc023a78c35f86d74e8a0cfb90cd746c1c55e7 100644 --- a/src/Config.php +++ b/src/Config.php @@ -73,20 +73,31 @@ final class Config extends PhpCsFixerConfig ); } + /** + * @param float $phpVersion + * @param bool $risky + * + * @return array + */ private function ruleSets(float $phpVersion, bool $risky): array { - return [ + $sets = [ '@PSR2' => true, '@Symfony' => true, '@Symfony:risky' => $risky, - '@PHP56Migration' => $phpVersion >= 5.6, - '@PHP56Migration:risky' => $risky && $phpVersion >= 5.6, - '@PHP70Migration' => $phpVersion >= 7.0, - '@PHP70Migration:risky' => $risky && $phpVersion >= 7.0, - '@PHP71Migration' => $phpVersion >= 7.1, - '@PHP71Migration:risky' => $risky && $phpVersion >= 7.1, - '@PHP73Migration' => $phpVersion >= 7.3, + '@PHP56Migration' => true, + '@PHP56Migration:risky' => $risky, + '@PHP70Migration' => true, + '@PHP70Migration:risky' => $risky, + '@PHP71Migration' => true, + '@PHP71Migration:risky' => $risky, ]; + + if ($phpVersion >= 7.3) { + $sets['@PHP73Migration'] = true; + } + + return $sets; } public function baseRules(float $phpVersion, bool $risky): array @@ -169,10 +180,12 @@ final class Config extends PhpCsFixerConfig $gitRepository = new CachedGitRepository($backendGitRepository, $cache); $headerProvider = new FormattedHeaderProvider( - new ChainTemplateProvider([ - new UserDefinedTemplateProvider($fileLocator), - new LicenseTemplateProvider($composerPackage), - ]), + new ChainTemplateProvider( + [ + new UserDefinedTemplateProvider($fileLocator), + new LicenseTemplateProvider($composerPackage), + ] + ), new TemplateFormatter($gitRepository, $composerPackage) );