chore: Upgrade to Laravel 11

Signed-off-by: Bruno Gaspar <[email protected]>
cartalyst · Jul 4, 2024 · b7cc4a4 · b7cc4a4
1 parent a4221b5
commit b7cc4a4
Show file tree

Hide file tree

Showing 96 changed files with 241 additions and 226 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,15 @@
 language: php
 
 php:
-  - 8.1
+  - 8.2
+  - 8.3
+
+dist: focal
+
+addons:
+  apt:
+    packages:
+      - libonig5
 
 cache:
   directories:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### v8.0.0 - TBA
+
+- Add Laravel 11 support
+
 ### v7.0.2 - 2023-08-10
 
 - Fix duplicated property

diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 The BSD 3-Clause License
-Copyright (c) 2011-2023, Cartalyst LLC
+Copyright (c) 2011-2024, Cartalyst LLC
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/README.md b/README.md
@@ -5,14 +5,15 @@
 [![Latest Version on Packagist][icon-version]][link-packagist]
 [![Total Downloads][icon-downloads]][link-packagist]
 
-Sentinel is a PHP 8.1+ framework agnostic fully-featured authentication & authorization system. It also provides additional features such as user roles and additional security features.
+Sentinel is a PHP 8.2+ framework agnostic fully-featured authentication & authorization system. It also provides additional features such as user roles and additional security features.
 
 An open source package by [Cartalyst](https://cartalyst.com), code well, rock on!
 
 ## Version Matrix
 
 Version | Laravel   | PHP Version
-------- | --------- | ------------
+------- |-----------| ------------
+8.x     | 11.0      | >= 8.2
 7.x     | 10.0      | >= 8.1
 6.x     | 9.0       | >= 8.0
 5.x     | 8.0       | >= 7.3
@@ -47,7 +48,7 @@ This software is released under the [BSD 3-Clause](LICENSE) License.
 [link-license]:   https://opensource.org/licenses/MIT
 [link-packagist]: https://packagist.org/packages/cartalyst/sentinel
 
-[icon-travis]:    https://travis-ci.com/cartalyst/sentinel.svg?branch=7.x
+[icon-travis]:    https://travis-ci.com/cartalyst/sentinel.svg?branch=8.x
 [icon-license]:   https://poser.pugx.org/cartalyst/sentinel/license
 [icon-version]:   https://poser.pugx.org/cartalyst/sentinel/version
 [icon-downloads]: https://poser.pugx.org/cartalyst/sentinel/downloads
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "cartalyst/sentinel",
-    "description": "PHP 7.3+ Fully-featured Authentication & Authorization System",
+    "description": "PHP 8.2+ Fully-featured Authentication & Authorization System",
     "keywords": [
         "php",
         "cartalyst",
@@ -17,19 +17,19 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "cartalyst/support": "^7.0",
-        "illuminate/support": "^10.0"
+        "php": "^8.2",
+        "cartalyst/support": "^8.0",
+        "illuminate/support": "^11.0"
     },
     "require-dev": {
         "cartalyst/php-cs-fixer-config": "^2.0",
-        "illuminate/cookie": "^10.0",
-        "illuminate/database": "^10.0",
-        "illuminate/events": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/session": "^10.0",
+        "illuminate/cookie": "^11.0",
+        "illuminate/database": "^11.0",
+        "illuminate/events": "^11.0",
+        "illuminate/http": "^11.0",
+        "illuminate/session": "^11.0",
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^10.0"
     },
     "suggest": {
         "illuminate/database": "By default, Sentinel utilizes the powerful Illuminate database layer.",
@@ -54,7 +54,7 @@
     "extra": {
         "component": "package",
         "branch-alias": {
-            "dev-master": "7.0.x-dev"
+            "dev-master": "8.0.x-dev"
         },
         "laravel": {
             "providers": [

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,35 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticProperties="false"
          beStrictAboutTestsThatDoNotTestAnything="true"
          beStrictAboutOutputDuringTests="true"
          bootstrap="vendor/autoload.php"
+         cacheResult="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          failOnRisky="true"
          failOnWarning="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
-         verbose="true"
 >
-    <testsuites>
-        <testsuite name="Sentinel Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="./build/report.tap" showUncoveredFiles="true"/>
-        <log type="junit" target="./build/report.junit.xml" showUncoveredFiles="true"/>
-        <log type="coverage-html" target="./build/coverage" showUncoveredFiles="true"/>
-        <log type="coverage-text" target="./build/coverage.txt" showUncoveredFiles="true"/>
-        <log type="coverage-clover" target="./build/logs/clover.xml" showUncoveredFiles="true"/>
-    </logging>
+  <testsuites>
+    <testsuite name="Sentinel Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="./build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Activations/ActivationInterface.php b/src/Activations/ActivationInterface.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Activations/ActivationRepositoryInterface.php b/src/Activations/ActivationRepositoryInterface.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Activations/EloquentActivation.php b/src/Activations/EloquentActivation.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Activations/IlluminateActivationRepository.php b/src/Activations/IlluminateActivationRepository.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Checkpoints/ActivationCheckpoint.php b/src/Checkpoints/ActivationCheckpoint.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Checkpoints/AuthenticatedCheckpoint.php b/src/Checkpoints/AuthenticatedCheckpoint.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Checkpoints/CheckpointInterface.php b/src/Checkpoints/CheckpointInterface.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Checkpoints/NotActivatedException.php b/src/Checkpoints/NotActivatedException.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Checkpoints/ThrottleCheckpoint.php b/src/Checkpoints/ThrottleCheckpoint.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Checkpoints/ThrottlingException.php b/src/Checkpoints/ThrottlingException.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Cookies/CookieInterface.php b/src/Cookies/CookieInterface.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Cookies/IlluminateCookie.php b/src/Cookies/IlluminateCookie.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Cookies/NativeCookie.php b/src/Cookies/NativeCookie.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Cookies/NullCookie.php b/src/Cookies/NullCookie.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Hashing/BcryptHasher.php b/src/Hashing/BcryptHasher.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Hashing/CallbackHasher.php b/src/Hashing/CallbackHasher.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Hashing/Hasher.php b/src/Hashing/Hasher.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */
 

diff --git a/src/Hashing/HasherInterface.php b/src/Hashing/HasherInterface.php
@@ -11,10 +11,10 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Sentinel
- * @version    7.0.0
+ * @version    8.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
- * @copyright  (c) 2011-2023, Cartalyst LLC
+ * @copyright  (c) 2011-2024, Cartalyst LLC
  * @link       https://cartalyst.com
  */