diff --git a/.travis.yml b/.travis.yml index d131d00c..40c522d4 100644 --- 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 index 5951b646..76e41866 100644 --- 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 index 43773dab..477554e7 100644 --- 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 index ea6b7f52..91b76bfc 100644 --- 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 index 781d4392..a2caebd1 100644 --- 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 index f3bda486..a898c6de 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,35 +1,30 @@ - - - - ./tests/ - - - - - ./src/ - - - - - - - - - + + + ./tests/ + + + + + + + + ./src/ + + diff --git a/src/Activations/ActivationInterface.php b/src/Activations/ActivationInterface.php index b84c766c..800acb4e 100644 --- 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 index cf353a1b..6f32c9c8 100644 --- 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 index b60182e6..56c50e75 100644 --- 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 index 91521ead..0bb6a00c 100644 --- 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 index f5ad86a7..b8189f50 100644 --- 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 index da21b009..84ca783e 100644 --- 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 index dcfda076..9a7bccde 100644 --- 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 index 5a62f7f7..2ab94056 100644 --- 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 index cee4d81c..2dcbb444 100644 --- 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 index f0951145..9eb424b8 100644 --- 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 index e18796a1..b21b03ca 100644 --- 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 index 770aeb76..d3733abd 100644 --- 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 index 60dee371..14abe3f5 100644 --- 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 index faae1d54..90b1ff71 100644 --- 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 index 076b30ab..16b8b863 100644 --- 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 index 7b005d87..64430539 100644 --- 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 index bfd2c442..7dde7164 100644 --- 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 index 1fbf8576..3a91152d 100644 --- 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 */ diff --git a/src/Hashing/NativeHasher.php b/src/Hashing/NativeHasher.php index 529a4505..489f05f3 100644 --- a/src/Hashing/NativeHasher.php +++ b/src/Hashing/NativeHasher.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/Sha256Hasher.php b/src/Hashing/Sha256Hasher.php index 570751e1..459be919 100644 --- a/src/Hashing/Sha256Hasher.php +++ b/src/Hashing/Sha256Hasher.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/WhirlpoolHasher.php b/src/Hashing/WhirlpoolHasher.php index 173b1f5f..323b7591 100644 --- a/src/Hashing/WhirlpoolHasher.php +++ b/src/Hashing/WhirlpoolHasher.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/Laravel/Facades/Activation.php b/src/Laravel/Facades/Activation.php index 03c2935b..7f632618 100644 --- a/src/Laravel/Facades/Activation.php +++ b/src/Laravel/Facades/Activation.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/Laravel/Facades/Reminder.php b/src/Laravel/Facades/Reminder.php index da800332..5df454ec 100644 --- a/src/Laravel/Facades/Reminder.php +++ b/src/Laravel/Facades/Reminder.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/Laravel/Facades/Sentinel.php b/src/Laravel/Facades/Sentinel.php index f900595d..f4fe7df9 100644 --- a/src/Laravel/Facades/Sentinel.php +++ b/src/Laravel/Facades/Sentinel.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/Laravel/SentinelServiceProvider.php b/src/Laravel/SentinelServiceProvider.php index d9664760..82605145 100644 --- a/src/Laravel/SentinelServiceProvider.php +++ b/src/Laravel/SentinelServiceProvider.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/Native/ConfigRepository.php b/src/Native/ConfigRepository.php index d99b1087..d7113296 100644 --- a/src/Native/ConfigRepository.php +++ b/src/Native/ConfigRepository.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/Native/Facades/Sentinel.php b/src/Native/Facades/Sentinel.php index cd594f52..c5dba857 100644 --- a/src/Native/Facades/Sentinel.php +++ b/src/Native/Facades/Sentinel.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/Native/SentinelBootstrapper.php b/src/Native/SentinelBootstrapper.php index 018d19b3..27f11703 100644 --- a/src/Native/SentinelBootstrapper.php +++ b/src/Native/SentinelBootstrapper.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/Permissions/PermissibleInterface.php b/src/Permissions/PermissibleInterface.php index 30ac1e6f..89a73290 100644 --- a/src/Permissions/PermissibleInterface.php +++ b/src/Permissions/PermissibleInterface.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/Permissions/PermissibleTrait.php b/src/Permissions/PermissibleTrait.php index 2a4e55a0..3f64d159 100644 --- a/src/Permissions/PermissibleTrait.php +++ b/src/Permissions/PermissibleTrait.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/Permissions/PermissionsInterface.php b/src/Permissions/PermissionsInterface.php index 9a30e7fb..7631f89d 100644 --- a/src/Permissions/PermissionsInterface.php +++ b/src/Permissions/PermissionsInterface.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/Permissions/PermissionsTrait.php b/src/Permissions/PermissionsTrait.php index 3a74ef7c..00b22607 100644 --- a/src/Permissions/PermissionsTrait.php +++ b/src/Permissions/PermissionsTrait.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/Permissions/StandardPermissions.php b/src/Permissions/StandardPermissions.php index 9adf1739..984c6e3f 100644 --- a/src/Permissions/StandardPermissions.php +++ b/src/Permissions/StandardPermissions.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/Permissions/StrictPermissions.php b/src/Permissions/StrictPermissions.php index 6a6a8727..86cef89c 100644 --- a/src/Permissions/StrictPermissions.php +++ b/src/Permissions/StrictPermissions.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/Persistences/EloquentPersistence.php b/src/Persistences/EloquentPersistence.php index f4a7b7eb..59cab211 100644 --- a/src/Persistences/EloquentPersistence.php +++ b/src/Persistences/EloquentPersistence.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/Persistences/IlluminatePersistenceRepository.php b/src/Persistences/IlluminatePersistenceRepository.php index 41c66aba..10ae4802 100644 --- a/src/Persistences/IlluminatePersistenceRepository.php +++ b/src/Persistences/IlluminatePersistenceRepository.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/Persistences/PersistableInterface.php b/src/Persistences/PersistableInterface.php index 3a255b10..d6569deb 100644 --- a/src/Persistences/PersistableInterface.php +++ b/src/Persistences/PersistableInterface.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/Persistences/PersistenceInterface.php b/src/Persistences/PersistenceInterface.php index 9a66eb99..532d1e7e 100644 --- a/src/Persistences/PersistenceInterface.php +++ b/src/Persistences/PersistenceInterface.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/Persistences/PersistenceRepositoryInterface.php b/src/Persistences/PersistenceRepositoryInterface.php index a7f7c93a..26b7c284 100644 --- a/src/Persistences/PersistenceRepositoryInterface.php +++ b/src/Persistences/PersistenceRepositoryInterface.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/Reminders/EloquentReminder.php b/src/Reminders/EloquentReminder.php index 7ca9fa3d..1453e146 100644 --- a/src/Reminders/EloquentReminder.php +++ b/src/Reminders/EloquentReminder.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/Reminders/IlluminateReminderRepository.php b/src/Reminders/IlluminateReminderRepository.php index 1b714dcd..6d49e488 100644 --- a/src/Reminders/IlluminateReminderRepository.php +++ b/src/Reminders/IlluminateReminderRepository.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/Reminders/ReminderRepositoryInterface.php b/src/Reminders/ReminderRepositoryInterface.php index 9989b16b..d999d4a9 100644 --- a/src/Reminders/ReminderRepositoryInterface.php +++ b/src/Reminders/ReminderRepositoryInterface.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/Roles/EloquentRole.php b/src/Roles/EloquentRole.php index 6ad73961..3a098a81 100644 --- a/src/Roles/EloquentRole.php +++ b/src/Roles/EloquentRole.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/Roles/IlluminateRoleRepository.php b/src/Roles/IlluminateRoleRepository.php index 604250ea..2abfb930 100644 --- a/src/Roles/IlluminateRoleRepository.php +++ b/src/Roles/IlluminateRoleRepository.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/Roles/RoleInterface.php b/src/Roles/RoleInterface.php index b9a71faa..0562e535 100644 --- a/src/Roles/RoleInterface.php +++ b/src/Roles/RoleInterface.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/Roles/RoleRepositoryInterface.php b/src/Roles/RoleRepositoryInterface.php index 8ab2c4b4..b03a7724 100644 --- a/src/Roles/RoleRepositoryInterface.php +++ b/src/Roles/RoleRepositoryInterface.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/Roles/RoleableInterface.php b/src/Roles/RoleableInterface.php index ab50dd58..a9f6085a 100644 --- a/src/Roles/RoleableInterface.php +++ b/src/Roles/RoleableInterface.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/Sentinel.php b/src/Sentinel.php index eda97002..0c56faf3 100644 --- a/src/Sentinel.php +++ b/src/Sentinel.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/Sessions/IlluminateSession.php b/src/Sessions/IlluminateSession.php index c51d86be..dad22a33 100644 --- a/src/Sessions/IlluminateSession.php +++ b/src/Sessions/IlluminateSession.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/Sessions/NativeSession.php b/src/Sessions/NativeSession.php index 5aa2f909..ba9fef77 100644 --- a/src/Sessions/NativeSession.php +++ b/src/Sessions/NativeSession.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/Sessions/SessionInterface.php b/src/Sessions/SessionInterface.php index 6abb7aab..f46ba135 100644 --- a/src/Sessions/SessionInterface.php +++ b/src/Sessions/SessionInterface.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/Throttling/EloquentThrottle.php b/src/Throttling/EloquentThrottle.php index f75db273..c662f0c8 100644 --- a/src/Throttling/EloquentThrottle.php +++ b/src/Throttling/EloquentThrottle.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/Throttling/IlluminateThrottleRepository.php b/src/Throttling/IlluminateThrottleRepository.php index 04cf5d10..435e3caa 100644 --- a/src/Throttling/IlluminateThrottleRepository.php +++ b/src/Throttling/IlluminateThrottleRepository.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 */ @@ -383,7 +383,7 @@ protected function delay($type, $argument = null) continue; } - if ($last->created_at->diffInSeconds() < $delay) { + if ((int) $last->created_at->diffInSeconds() < $delay) { return $this->secondsToFree($last, $delay); } } @@ -522,6 +522,6 @@ protected function loadUserThrottles(UserInterface $user) */ protected function secondsToFree(EloquentThrottle $throttle, $interval) { - return $throttle->created_at->addSeconds($interval)->diffInSeconds(); + return (int) $throttle->created_at->subSeconds($interval)->diffInSeconds(); } } diff --git a/src/Throttling/ThrottleRepositoryInterface.php b/src/Throttling/ThrottleRepositoryInterface.php index 0e399068..68aba347 100644 --- a/src/Throttling/ThrottleRepositoryInterface.php +++ b/src/Throttling/ThrottleRepositoryInterface.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/Users/EloquentUser.php b/src/Users/EloquentUser.php index 1dfd381f..dffeebdd 100644 --- a/src/Users/EloquentUser.php +++ b/src/Users/EloquentUser.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 */ @@ -246,7 +246,7 @@ public function generatePersistenceCode(): string /** * {@inheritdoc} */ - public function getUserId(): int + public function getUserId() { return $this->getKey(); } diff --git a/src/Users/IlluminateUserRepository.php b/src/Users/IlluminateUserRepository.php index 1c70730b..fb21c55b 100644 --- a/src/Users/IlluminateUserRepository.php +++ b/src/Users/IlluminateUserRepository.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/Users/UserInterface.php b/src/Users/UserInterface.php index 2ced2596..d40a1fc3 100644 --- a/src/Users/UserInterface.php +++ b/src/Users/UserInterface.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 */ @@ -25,9 +25,9 @@ interface UserInterface /** * Returns the user primary key. * - * @return int + * @return int|string */ - public function getUserId(): int; + public function getUserId(); /** * Returns the user login. diff --git a/src/Users/UserRepositoryInterface.php b/src/Users/UserRepositoryInterface.php index 616d1b93..e0df4277 100644 --- a/src/Users/UserRepositoryInterface.php +++ b/src/Users/UserRepositoryInterface.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/config/config.php b/src/config/config.php index 56444e66..7cb1d5c3 100644 --- a/src/config/config.php +++ b/src/config/config.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/migrations/2014_07_02_230147_migration_cartalyst_sentinel.php b/src/migrations/2014_07_02_230147_migration_cartalyst_sentinel.php index fde1215f..2df51d22 100644 --- a/src/migrations/2014_07_02_230147_migration_cartalyst_sentinel.php +++ b/src/migrations/2014_07_02_230147_migration_cartalyst_sentinel.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/tests/Activations/EloquentActivationTest.php b/tests/Activations/EloquentActivationTest.php index af39c7f2..1ce6eec5 100644 --- a/tests/Activations/EloquentActivationTest.php +++ b/tests/Activations/EloquentActivationTest.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/tests/Activations/IlluminateActivationRepositoryTest.php b/tests/Activations/IlluminateActivationRepositoryTest.php index 3d757ad3..2eee2f81 100644 --- a/tests/Activations/IlluminateActivationRepositoryTest.php +++ b/tests/Activations/IlluminateActivationRepositoryTest.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/tests/Checkpoints/ActivationCheckpointTest.php b/tests/Checkpoints/ActivationCheckpointTest.php index c5b82663..e25a4736 100644 --- a/tests/Checkpoints/ActivationCheckpointTest.php +++ b/tests/Checkpoints/ActivationCheckpointTest.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/tests/Checkpoints/ThrottleCheckpointTest.php b/tests/Checkpoints/ThrottleCheckpointTest.php index 179b83fb..a2266242 100644 --- a/tests/Checkpoints/ThrottleCheckpointTest.php +++ b/tests/Checkpoints/ThrottleCheckpointTest.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/tests/Cookies/IlluminateCookieTest.php b/tests/Cookies/IlluminateCookieTest.php index a198ae8c..b4ac957a 100644 --- a/tests/Cookies/IlluminateCookieTest.php +++ b/tests/Cookies/IlluminateCookieTest.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/tests/Cookies/NativeCookieTest.php b/tests/Cookies/NativeCookieTest.php index 2af8d0f0..48844d77 100644 --- a/tests/Cookies/NativeCookieTest.php +++ b/tests/Cookies/NativeCookieTest.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/tests/Cookies/NullCookieTest.php b/tests/Cookies/NullCookieTest.php index 038df90e..7ccb0f47 100644 --- a/tests/Cookies/NullCookieTest.php +++ b/tests/Cookies/NullCookieTest.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/tests/Hashing/BaseHashing.php b/tests/Hashing/BaseHashing.php index 66c24081..e047fe61 100644 --- a/tests/Hashing/BaseHashing.php +++ b/tests/Hashing/BaseHashing.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/tests/Hashing/BcryptHasherTest.php b/tests/Hashing/BcryptHasherTest.php index 67fa158f..e0e8d5a8 100644 --- a/tests/Hashing/BcryptHasherTest.php +++ b/tests/Hashing/BcryptHasherTest.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/tests/Hashing/CallbackHasherTest.php b/tests/Hashing/CallbackHasherTest.php index 84bb476a..8c2d250d 100644 --- a/tests/Hashing/CallbackHasherTest.php +++ b/tests/Hashing/CallbackHasherTest.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/tests/Hashing/NativeHasherTest.php b/tests/Hashing/NativeHasherTest.php index 0c1b9282..3920d428 100644 --- a/tests/Hashing/NativeHasherTest.php +++ b/tests/Hashing/NativeHasherTest.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/tests/Hashing/Sha256HasherTest.php b/tests/Hashing/Sha256HasherTest.php index e3320607..5a098f22 100644 --- a/tests/Hashing/Sha256HasherTest.php +++ b/tests/Hashing/Sha256HasherTest.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/tests/Hashing/WhirlpoolHasherTest.php b/tests/Hashing/WhirlpoolHasherTest.php index 1f09fcd9..fd103b9c 100644 --- a/tests/Hashing/WhirlpoolHasherTest.php +++ b/tests/Hashing/WhirlpoolHasherTest.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/tests/Native/SentinelBootstrapperTest.php b/tests/Native/SentinelBootstrapperTest.php index 3f346e38..9eb28440 100644 --- a/tests/Native/SentinelBootstrapperTest.php +++ b/tests/Native/SentinelBootstrapperTest.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/tests/Permissions/PermissibleTraitTest.php b/tests/Permissions/PermissibleTraitTest.php index 33cbefe2..4808acc8 100644 --- a/tests/Permissions/PermissibleTraitTest.php +++ b/tests/Permissions/PermissibleTraitTest.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/tests/Permissions/PermissionsTraitTest.php b/tests/Permissions/PermissionsTraitTest.php index fd2935a2..6c130761 100644 --- a/tests/Permissions/PermissionsTraitTest.php +++ b/tests/Permissions/PermissionsTraitTest.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/tests/Permissions/StandardPermissionsTest.php b/tests/Permissions/StandardPermissionsTest.php index 5b72a09a..cad59400 100644 --- a/tests/Permissions/StandardPermissionsTest.php +++ b/tests/Permissions/StandardPermissionsTest.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/tests/Permissions/StrictPermissionsTest.php b/tests/Permissions/StrictPermissionsTest.php index 85b6e541..5dd8b7a2 100644 --- a/tests/Permissions/StrictPermissionsTest.php +++ b/tests/Permissions/StrictPermissionsTest.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/tests/Persistences/EloquentPersistenceTest.php b/tests/Persistences/EloquentPersistenceTest.php index e40396ea..08f6da46 100644 --- a/tests/Persistences/EloquentPersistenceTest.php +++ b/tests/Persistences/EloquentPersistenceTest.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/tests/Persistences/IlluminatePersistenceRepositoryTest.php b/tests/Persistences/IlluminatePersistenceRepositoryTest.php index f59d5832..94f816ca 100644 --- a/tests/Persistences/IlluminatePersistenceRepositoryTest.php +++ b/tests/Persistences/IlluminatePersistenceRepositoryTest.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/tests/Reminders/EloquentReminderTest.php b/tests/Reminders/EloquentReminderTest.php index 76af2d2c..153b4117 100644 --- a/tests/Reminders/EloquentReminderTest.php +++ b/tests/Reminders/EloquentReminderTest.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/tests/Reminders/IlluminateReminderRepositoryTest.php b/tests/Reminders/IlluminateReminderRepositoryTest.php index 8f2ad5bd..26bd4fd5 100644 --- a/tests/Reminders/IlluminateReminderRepositoryTest.php +++ b/tests/Reminders/IlluminateReminderRepositoryTest.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/tests/Roles/EloquentRoleTest.php b/tests/Roles/EloquentRoleTest.php index fc220448..11c3a2fe 100644 --- a/tests/Roles/EloquentRoleTest.php +++ b/tests/Roles/EloquentRoleTest.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 */ @@ -125,7 +125,10 @@ protected function addMockConnection($model) $model->setConnectionResolver($resolver); - $model->getConnection()->shouldReceive('getQueryGrammar')->andReturn(m::mock(Grammar::class)); + $grammar = m::mock(Grammar::class); + $grammar->shouldReceive('isExpression'); + + $model->getConnection()->shouldReceive('getQueryGrammar')->andReturn($grammar); $model->getConnection()->shouldReceive('getPostProcessor')->andReturn(m::mock(Processor::class)); } } diff --git a/tests/Roles/IlluminateRoleRepositoryTest.php b/tests/Roles/IlluminateRoleRepositoryTest.php index 671532ba..c16fff57 100644 --- a/tests/Roles/IlluminateRoleRepositoryTest.php +++ b/tests/Roles/IlluminateRoleRepositoryTest.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/tests/SentinelTest.php b/tests/SentinelTest.php index 2f9c91ca..07d34489 100644 --- a/tests/SentinelTest.php +++ b/tests/SentinelTest.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/tests/Sessions/IlluminateSessionTest.php b/tests/Sessions/IlluminateSessionTest.php index c53fcb07..2707fd1f 100644 --- a/tests/Sessions/IlluminateSessionTest.php +++ b/tests/Sessions/IlluminateSessionTest.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/tests/Sessions/NativeSessionTest.php b/tests/Sessions/NativeSessionTest.php index 500b8a5f..de73c073 100644 --- a/tests/Sessions/NativeSessionTest.php +++ b/tests/Sessions/NativeSessionTest.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/tests/Throttling/IlluminateThrottleRepositoryTest.php b/tests/Throttling/IlluminateThrottleRepositoryTest.php index 6ce24665..522b2311 100644 --- a/tests/Throttling/IlluminateThrottleRepositoryTest.php +++ b/tests/Throttling/IlluminateThrottleRepositoryTest.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/tests/Users/EloquentUserTest.php b/tests/Users/EloquentUserTest.php index 4e19b498..53ace6c4 100644 --- a/tests/Users/EloquentUserTest.php +++ b/tests/Users/EloquentUserTest.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 */ @@ -477,7 +477,11 @@ protected function addMockConnection($model) $resolver->shouldReceive('connection')->andReturn($connection = m::mock(Connection::class)); $model->setConnectionResolver($resolver); - $model->getConnection()->shouldReceive('getQueryGrammar')->andReturn($grammar = m::mock(Grammar::class)); + + $grammar = m::mock(Grammar::class); + $grammar->shouldReceive('isExpression'); + + $model->getConnection()->shouldReceive('getQueryGrammar')->andReturn($grammar); $model->getConnection()->shouldReceive('getPostProcessor')->andReturn($processor = m::mock(Processor::class)); $model->getConnection()->shouldReceive('query')->andReturnUsing(function () use ($connection, $grammar, $processor) { diff --git a/tests/Users/IlluminateUserRepositoryTest.php b/tests/Users/IlluminateUserRepositoryTest.php index 89072d7a..125fbe59 100644 --- a/tests/Users/IlluminateUserRepositoryTest.php +++ b/tests/Users/IlluminateUserRepositoryTest.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 */