Fix: Remove Php74 rule set

ergebnis · Nov 28, 2022 · e0ce46f · e0ce46f
1 parent a31f722
commit e0ce46f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1,629 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ For a full diff see [`4.11.0...main`][4.11.0...main].
 
 - Dropped support for PHP 7.4 ([#672]), by [@localheinz]
 
+### Removed
+
+- Removed `Php74` rule set ([#673]), by [@localheinz]
+
 ## [`4.11.0`][4.11.0]
 
 For a full diff see [`4.10.0...4.11.0`][4.10.0...4.11.0].
@@ -783,6 +787,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#662]: https://github.com/ergebnis/php-cs-fixer-config/pull/662
 [#667]: https://github.com/ergebnis/php-cs-fixer-config/pull/667
 [#672]: https://github.com/ergebnis/php-cs-fixer-config/pull/672
+[#673]: https://github.com/ergebnis/php-cs-fixer-config/pull/673
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/README.md b/README.md
@@ -27,7 +27,6 @@ $ composer require --dev ergebnis/php-cs-fixer-config
 
 Pick one of the rule sets:
 
-- [`Ergebnis\PhpCsFixer\RuleSet\Php74`](src/RuleSet/Php74.php)
 - [`Ergebnis\PhpCsFixer\RuleSet\Php80`](src/RuleSet/Php80.php)
 - [`Ergebnis\PhpCsFixer\RuleSet\Php81`](src/RuleSet/Php81.php)
 
@@ -38,7 +37,7 @@ Create a configuration file `.php-cs-fixer.php` in the root of your project:
 
 use Ergebnis\PhpCsFixer\Config;
 
-$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php74());
+$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php80());
 
 $config->getFinder()->in(__DIR__);
 $config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');
@@ -75,8 +74,8 @@ All configuration examples use the caching feature, and if you want to use it as
 +@see https://github.com/ergebnis/php-cs-fixer-config
 +EOF;
 
--$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php74());
-+$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php74($header));
+-$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php80());
++$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php80($header));
 
  $config->getFinder()->in(__DIR__);
  $config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');
@@ -109,8 +108,8 @@ file headers will be added to PHP files, for example:
 
  use Ergebnis\PhpCsFixer\Config;
 
--$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php74());
-+$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php74(), [
+-$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php80());
++$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php80(), [
 +    'mb_str_functions' => false,
 +    'strict_comparison' => false,
 +]);

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
-  <file src="src/RuleSet/Php74.php">
-    <NonInvariantDocblockPropertyType occurrences="1">
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
   <file src="src/RuleSet/Php80.php">
     <NonInvariantDocblockPropertyType occurrences="1">
       <code>$rules</code>