Merge pull request #90 from jolicode/upgrade

Add support for PHP 8.2 + Drop support for unmainted versions
jolicode · Dec 24, 2022 · 0b42555 · 0b42555
2 parents 8345365 + c2aefd9
commit 0b42555
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,11 +26,11 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['7.4', '8.0', '8.1']
+                php-version: ['8.1', '8.2']
                 composer-flags: ['']
                 name: ['']
                 include:
-                    - php-version: 7.4
+                    - php-version: 8.0
                       composer-flags: '--prefer-lowest'
                       name: '(prefer lowest dependencies)'
         steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changes between versions
 
+## 2.5.0 (not released yet)
+
+* Dropped support for PHP 7.4
+* Dropped support for Symfony 4.x
+* Added support for PHP 8.2
+
 ## 2.4.0 (2021-12-01)
 
 * Dropped support for PHP < 7.4

diff --git a/composer.json b/composer.json
@@ -21,13 +21,13 @@
         }
     },
     "require": {
-        "php": ">=7.4",
-        "symfony/process": "^4.0|^5.0|^6.0"
+        "php": ">=8.0",
+        "symfony/process": "^5.4 || ^6.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.3.2",
-        "symfony/finder": "^5.0",
-        "symfony/phpunit-bridge": "^5.0"
+        "friendsofphp/php-cs-fixer": "^3.13",
+        "symfony/finder": "^5.4 || ^6.0",
+        "symfony/phpunit-bridge": "^5.4 || ^6.0"
     },
     "bin": [
         "jolinotif"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-        >
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="JoliNotif Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="JoliNotif Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
 </phpunit>