Skip to content

Add support for Laravel 8 and PHP 8 #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Add support for Laravel 8 and PHP 8 #970

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
738cc1c
package info updated
hakobyansen Jul 25, 2020
54daaf6
composer.json fixed
hakobyansen Jul 25, 2020
024ae49
readme updated
hakobyansen Jul 25, 2020
7b88139
dependencies update
hakobyansen Jul 25, 2020
d4e796a
Merge branch 'release/7.0.0'
hakobyansen Jul 25, 2020
074172c
Merge tag '7.0.0' into develop
hakobyansen Jul 25, 2020
53c73e3
readme updated
hakobyansen Jul 26, 2020
be0a812
Merge branch 'release/7.0.1'
hakobyansen Jul 26, 2020
6333c68
Merge tag '7.0.1' into develop
hakobyansen Jul 26, 2020
d4241e2
readme updated
hakobyansen Jul 26, 2020
a969493
Merge branch 'master' into develop
hakobyansen Jul 26, 2020
d58aede
Update README.md
hakobyansen Aug 5, 2020
755736a
dependencies upgrade
Sep 9, 2020
3d92b23
readme updated
Sep 9, 2020
ffa294a
Merge branch 'release/8.0.0'
Sep 9, 2020
1d82cb2
Add support for PHP 8
allayGerald Feb 12, 2021
3338758
Extend TestCase from PHPUnit\Framework\TestCase instead of PHPUnit_Fr…
allayGerald Feb 12, 2021
672c2f0
Fix: Undefined str_is function
allayGerald Feb 12, 2021
749ab88
Use doesNotPerformAssertions annotation for tests that does not perfo…
allayGerald Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: Undefined str_is function 
Replace deprecated str_is with Str::is
  • Loading branch information
@allayGerald
allayGerald committed Feb 12, 2021
commit 672c2f0befdbd0a45839ecec88200d662f0d2bcd
3 changes: 2 additions & 1 deletion src/Entrust/Traits/EntrustUserTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Config;
use InvalidArgumentException;
use Illuminate\Support\Str;

trait EntrustUserTrait
{
Expand Down Expand Up @@ -162,7 +163,7 @@ public function can($permission, $requireAll = false)
foreach ($this->cachedRoles() as $role) {
// Validate against the Permission table
foreach ($role->cachedPermissions() as $perm) {
if (str_is( $permission, $perm->name) ) {
if (Str::is( $permission, $perm->name) ) {
return true;
}
}
Expand Down