feat: drop support of php 7.4 and introduce php 8.1

PedroTroller · Jan 5, 2023 · 8376adf · 8376adf
1 parent 6dd15c6
commit 8376adf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,13 +25,13 @@ tests: &tests
   run: |
       composer test -vvv
       bin/doc
-      composer run php-cs-fixer || (echo "Coding standards are not respected. Run 'composer run php-cs-fixer'" && exit 1)
+      PHP_CS_FIXER_IGNORE_ENV=1 composer run php-cs-fixer || (echo "Coding standards are not respected. Run 'composer run php-cs-fixer'" && exit 1)
 
 tests_with_future_mode: &tests_with_future_mode
   run: |
       PHP_CS_FIXER_FUTURE_MODE=1 composer test -vvv
       bin/doc
-      composer run php-cs-fixer || (echo "Coding standards are not respected. Run 'composer run php-cs-fixer'" && exit 1)
+      PHP_CS_FIXER_IGNORE_ENV=1 composer run php-cs-fixer || (echo "Coding standards are not respected. Run 'composer run php-cs-fixer'" && exit 1)
 
 jobs:
   tests:
@@ -106,19 +106,19 @@ workflows:
       - documentation:
           matrix:
             parameters:
-              php-version: ["8.1"]
+              php-version: ["8.2"]
       - tests:
           matrix:
             parameters:
-              php-version: ["7.4", "8.0", "8.1"]
+              php-version: ["8.0", "8.1", "8.2"]
       - tests-with-future-mode:
           matrix:
             parameters:
-              php-version: ["7.4", "8.0", "8.1"]
+              php-version: ["8.0", "8.1", "8.2"]
       - tests-with-lowest-dependencies:
           matrix:
             parameters:
-              php-version: ["7.4", "8.0", "8.1"]
+              php-version: ["8.0", "8.1", "8.2"]
       - release-test
       - release:
           requires:

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,7 +10,7 @@
     ->setRules(
         RuleSetFactory::create()
             ->phpCsFixer(true)
-            ->php(7.4, true)
+            ->php(8.0, true)
             ->pedrotroller(true)
             ->enable('align_multiline_comment')
             ->enable('array_indentation')

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "PHP-CS-FIXER : my custom fixers",
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "friendsofphp/php-cs-fixer": "^3.13.1"
     },
     "require-dev": {

diff --git a/src/PedroTroller/CS/Fixer/PhpspecFixer.php b/src/PedroTroller/CS/Fixer/PhpspecFixer.php
@@ -214,7 +214,7 @@ private function removeReturn(SplFileInfo $file, Tokens $tokens): void
 
             $tokens->clearRange($closeBraceIndex + 1, $openCurlyBracket - 1);
 
-            if ($tokens[$closeBraceIndex - 1]->isWhitespace() && false !== strpos($tokens[$closeBraceIndex - 1]->getContent(), "\n")) {
+            if ($tokens[$closeBraceIndex - 1]->isWhitespace() && str_contains($tokens[$closeBraceIndex - 1]->getContent(), "\n")) {
                 $tokens->ensureWhitespaceAtIndex($openCurlyBracket, 0, ' ');
             } else {
                 $tokens->ensureWhitespaceAtIndex($openCurlyBracket, 0, "\n".$this->analyze($tokens)->getLineIndentation($openBraceIndex));