Drop PHP 7 support

nucleos · Dec 14, 2021 · 1a64ba6 · 1a64ba6
1 parent f16080e
commit 1a64ba6
Show file tree

Hide file tree

Showing 8 changed files with 323 additions and 342 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -14,19 +14,18 @@ branches:
       enforce_admins: false
       required_status_checks:
         contexts:
-          - "Coding Standards (7.4)"
-          - "Static Code Analysis (7.4)"
-          - "Test (PHP 7.3, symfony 4.4, lowest)"
-          - "Test (PHP 7.3, symfony 5.1, lowest)"
-          - "Test (PHP 7.3, symfony 4.4, highest)"
-          - "Test (PHP 7.3, symfony 5.1, highest)"
-          - "Test (PHP 7.4, symfony 4.4, lowest)"
-          - "Test (PHP 7.4, symfony 5.1, lowest)"
-          - "Test (PHP 7.4, symfony 4.4, highest)"
-          - "Test (PHP 7.4, symfony 5.1, highest)"
-          - "Code Coverage (7.4)"
-          - "Mutation Tests (7.4)"
-          - "Mutation Tests (7.4)"
+          - "Coding Standards (8.1)"
+          - "Static Code Analysis (8.1)"
+          - "Test (PHP 8.0, symfony 4.4, lowest)"
+          - "Test (PHP 8.0, symfony 5.1, lowest)"
+          - "Test (PHP 8.0, symfony 4.4, highest)"
+          - "Test (PHP 8.0, symfony 5.1, highest)"
+          - "Test (PHP 8.1, symfony 4.4, lowest)"
+          - "Test (PHP 8.1, symfony 5.1, lowest)"
+          - "Test (PHP 8.1, symfony 4.4, highest)"
+          - "Test (PHP 8.1, symfony 5.1, highest)"
+          - "Code Coverage (8.1)"
+          - "Mutation Tests (8.1)"
         strict: true
 
       required_pull_request_reviews: null

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.4
+          - 8.1
 
     steps:
       - name: "Checkout"
@@ -69,7 +69,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.4
+          - 8.1
 
     steps:
       - name: "Checkout"
@@ -110,9 +110,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.3
-          - 7.4
           - 8.0
+          - 8.1
 
         dependencies:
           - lowest
@@ -167,7 +166,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.4
+          - 8.1
 
     steps:
       - name: "Checkout"
@@ -207,7 +206,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.4
+          - 8.1
 
     steps:
       - name: "Checkout"

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     ],
     "homepage": "https://nucleos.rocks",
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "ext-mbstring": "*",
         "doctrine/collections": "^1.6",

diff --git a/src/Model/User.php b/src/Model/User.php
@@ -22,6 +22,8 @@
 /**
  * @phpstan-template GroupTemplate of \Nucleos\UserBundle\Model\GroupInterface
  * @phpstan-implements \Nucleos\UserBundle\Model\GroupableInterface<GroupTemplate>
+ *
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
 abstract class User implements UserInterface, GroupableInterface, LocaleAwareInterface
 {

diff --git a/src/Util/Canonicalizer.php b/src/Util/Canonicalizer.php
@@ -21,7 +21,13 @@ public function canonicalize(?string $string): string
             return '';
         }
 
-        $encoding = mb_detect_encoding($string, mb_detect_order(), true);
+        $encodings = mb_detect_order();
+
+        if (!\is_array($encodings)) {
+            return $string;
+        }
+
+        $encoding  = mb_detect_encoding($string, $encodings, true);
 
         if (false !== $encoding) {
             return mb_convert_case($string, MB_CASE_LOWER, $encoding);

diff --git a/src/Validator/Constraints/PatternValidator.php b/src/Validator/Constraints/PatternValidator.php
@@ -105,6 +105,6 @@ private function countMatches(string $pattern, string $text): int
     {
         $result = preg_match_all($pattern, $text);
 
-        return false === $result ? 0 : $result;
+        return \is_int($result) ? $result : 0;
     }
 }
diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -21,7 +21,7 @@
     "config": {
         "bin-dir": "../../vendor/bin",
         "platform": {
-            "php": "7.4"
+            "php": "8.0.2"
         }
     }
 }