Skip to content

Commit

Permalink
Fix: Remove Php74 rule set
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Nov 28, 2022
1 parent a31f722 commit e0ce46f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 1,629 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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');
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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,
+]);
Expand Down
5 changes: 0 additions & 5 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading

0 comments on commit e0ce46f

Please sign in to comment.