Merge pull request #5 from protonemedia/php-83

Support for PHP 8.3. Dropped support for Laravel 9
protonemedia · Jan 2, 2024 · 9c00549 · 9c00549
2 parents a571dd3 + 8c4e85d
commit 9c00549
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,14 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*, 9.*]
+        php: [8.3, 8.2, 8.1]
+        laravel: [10.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: ^8.0
-          - laravel: 9.*
-            testbench: ^7.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@
 
 Laravel Middleware to protect your app against Cross-site scripting (XSS). It sanitizes request input by utilising the [Laravel Security](https://github.com/GrahamCampbell/Laravel-Security) package, and it can sanatize [Blade echo statements](https://laravel.com/docs/8.x/blade#displaying-data) as well.
 
-* Support for PHP 8.0 and higher
-* Support for Laravel 9 and higher
+* PHP 8.1 and higher
+* Laravel 10
 
 ## Sponsor this package!
 

diff --git a/composer.json b/composer.json
@@ -16,18 +16,17 @@
         }
     ],
     "require": {
-        "php": "^8.1|^8.2",
+        "php": "^8.1|^8.2|^8.3",
         "graham-campbell/security": "^11.0",
-        "illuminate/contracts": "^9.0|^10.0",
+        "illuminate/contracts": "^10.0",
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "require-dev": {
-        "nesbot/carbon": "^2.66",
         "nunomaduro/collision": "^6.0",
-        "orchestra/testbench": "^7.0|^8.0",
+        "orchestra/testbench": "^8.0",
         "pestphp/pest": "^1.21",
         "pestphp/pest-plugin-laravel": "^1.1",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" verbose="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" backupGlobals="false"
+    bootstrap="vendor/autoload.php" colors="true"
+    processIsolation="false" stopOnFailure="false"
+    executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
+    beStrictAboutOutputDuringTests="true">
     <testsuites>
         <testsuite name="Protone Media Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
-</phpunit>
+</phpunit>