From 334170bf27c2906aef79d099a21b4e917e73ad6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Wed, 11 Dec 2019 16:39:50 +0100
Subject: [PATCH] =?UTF-8?q?Pas=20de=20r=C3=A9f=C3=A9rence=20=C3=A0=20@PHP7?=
=?UTF-8?q?3Migration=20sur=20les=20versions=20minimales.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Composer/ComposerPackage.php | 2 +-
src/Config.php | 37 +++++++++++++++++++++-----------
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/Composer/ComposerPackage.php b/src/Composer/ComposerPackage.php
index 5912451..fc3bddd 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 64998ad..64cc023 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)
);
--
GitLab