Skip to content

Commit bab74ab

Browse files
DobmodDobmod
committed
BREAKING CHANGE: upgrade to PHP 8.0 and PHP-Casbin 4.0
1 parent 434ee80 commit bab74ab

File tree

5 files changed

+38
-112
lines changed

5 files changed

+38
-112
lines changed

Diff for: ‎.github/workflows/build.yml

-66
Original file line numberDiff line numberDiff line change
@@ -27,73 +27,7 @@ jobs:
2727
# laravel: [ ]
2828
# stability: [ prefer-lowest, prefer-stable ]
2929
include:
30-
# Laravel 5.5
31-
- php: 7.1
32-
laravel: 5.5.*
33-
phpunit: ~6.0
34-
- php: 7.2
35-
laravel: 5.5.*
36-
phpunit: ~6.0
37-
- php: 7.3
38-
laravel: 5.5.*
39-
phpunit: ~6.0
40-
41-
# Laravel 5.6
42-
- php: 7.1
43-
laravel: 5.6.*
44-
phpunit: ~7.0
45-
- php: 7.2
46-
laravel: 5.6.*
47-
phpunit: ~7.0
48-
- php: 7.3
49-
laravel: 5.6.*
50-
phpunit: ~7.0
51-
52-
# Laravel 5.7
53-
- php: 7.1
54-
laravel: 5.7.*
55-
phpunit: ~7.5
56-
- php: 7.2
57-
laravel: 5.7.*
58-
phpunit: ~7.5
59-
- php: 7.3
60-
laravel: 5.7.*
61-
phpunit: ~7.5
62-
63-
# Laravel 5.8
64-
- php: 7.1
65-
laravel: 5.8.*
66-
phpunit: ~7.5
67-
- php: 7.2
68-
laravel: 5.8.*
69-
phpunit: ~8.0
70-
- php: 7.3
71-
laravel: 5.8.*
72-
phpunit: ~8.0
73-
74-
# Laravel 6.x
75-
- php: 7.2
76-
laravel: 6.*
77-
phpunit: ~8.0
78-
- php: 7.3
79-
laravel: 6.*
80-
phpunit: ~8.0
81-
82-
# Laravel 7.x
83-
- php: 7.3
84-
laravel: 7.*
85-
phpunit: ~9.0
86-
- php: 7.4
87-
laravel: 7.*
88-
phpunit: ~9.0
89-
9030
# Laravel 8.x
91-
- php: 7.3
92-
laravel: 8.*
93-
phpunit: ~9.0
94-
- php: 7.4
95-
laravel: 8.*
96-
phpunit: ~9.0
9731
- php: 8.0
9832
laravel: 8.*
9933
phpunit: ~9.0

Diff for: ‎composer.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@
2020
],
2121
"license": "Apache-2.0",
2222
"require": {
23-
"php": ">=7.1.0",
23+
"php": ">=8.0",
2424
"illuminate/support": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
2525
"illuminate/database": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
2626
"illuminate/console": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
27-
"casbin/casbin": "~3.1",
28-
"casbin/psr3-bridge": "^1.1"
27+
"casbin/casbin": "~4.0"
2928
},
3029
"require-dev": {
3130
"phpunit/phpunit": "~7.0|~8.0|~9.0|~10.5",
32-
"php-coveralls/php-coveralls": "^2.4",
31+
"php-coveralls/php-coveralls": "^2.7",
3332
"mockery/mockery": "^1.0",
3433
"laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0"
3534
},

Diff for: ‎phpunit.xml

+30-35
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
backupGlobals="false"
4-
bootstrap="vendor/autoload.php"
5-
colors="true"
6-
processIsolation="false"
7-
stopOnFailure="false"
8-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
9-
<testsuites>
10-
<testsuite name="Application Test Suite">
11-
<directory>./tests/</directory>
12-
</testsuite>
13-
</testsuites>
14-
<filter>
15-
<whitelist processUncoveredFilesFromWhitelist="true">
16-
<directory suffix=".php">./src</directory>
17-
</whitelist>
18-
</filter>
19-
20-
<logging>
21-
<log type="coverage-clover" target="build/logs/clover.xml"/>
22-
<log type="coverage-html" target="build/html"/>
23-
</logging>
24-
25-
<php>
26-
<env name="APP_ENV" value="testing"/>
27-
<env name="BCRYPT_ROUNDS" value="4"/>
28-
<env name="CACHE_DRIVER" value="array"/>
29-
<env name="MAIL_DRIVER" value="array"/>
30-
<env name="QUEUE_CONNECTION" value="sync"/>
31-
<env name="SESSION_DRIVER" value="array"/>
32-
33-
<env name="DB_DATABASE" value="lauthz"/>
34-
<env name="DB_USERNAME" value="root"/>
35-
</php>
36-
</phpunit>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
3+
<coverage>
4+
<report>
5+
<clover outputFile="build/logs/clover.xml"/>
6+
<html outputDirectory="build/html"/>
7+
</report>
8+
</coverage>
9+
<testsuites>
10+
<testsuite name="Application Test Suite">
11+
<directory>./tests/</directory>
12+
</testsuite>
13+
</testsuites>
14+
<logging/>
15+
<php>
16+
<env name="APP_ENV" value="testing"/>
17+
<env name="BCRYPT_ROUNDS" value="4"/>
18+
<env name="CACHE_DRIVER" value="array"/>
19+
<env name="MAIL_DRIVER" value="array"/>
20+
<env name="QUEUE_CONNECTION" value="sync"/>
21+
<env name="SESSION_DRIVER" value="array"/>
22+
23+
<env name="DB_DATABASE" value="lauthz"/>
24+
<env name="DB_USERNAME" value="root"/>
25+
</php>
26+
<source>
27+
<include>
28+
<directory suffix=".php">./src</directory>
29+
</include>
30+
</source>
31+
</phpunit>

Diff for: ‎src/EnforcerManager.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Lauthz;
44

5-
use Casbin\Bridge\Logger\LoggerBridge;
65
use Casbin\Enforcer;
76
use Casbin\Model\Model;
87
use Casbin\Log\Log;
8+
use Casbin\Log\Logger\DefaultLogger;
99
use Lauthz\Contracts\Factory;
1010
use Lauthz\Models\Rule;
1111
use Illuminate\Support\Arr;
@@ -80,10 +80,10 @@ protected function resolve($name)
8080

8181
if ($logger = Arr::get($config, 'log.logger')) {
8282
if (is_string($logger)) {
83-
$logger = $this->app->make($logger);
83+
$logger = new DefaultLogger($this->app->make($logger));
8484
}
8585

86-
Log::setLogger(new LoggerBridge($logger));
86+
Log::setLogger($logger);
8787
}
8888

8989
$model = new Model();
@@ -98,7 +98,7 @@ protected function resolve($name)
9898
]);
9999
}
100100

101-
return new Enforcer($model, $adapter, Arr::get($config, 'log.enabled', false));
101+
return new Enforcer($model, $adapter, $logger, Arr::get($config, 'log.enabled', false));
102102
}
103103

104104
/**

Diff for: ‎tests/DatabaseAdapterForCacheTest.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
namespace Lauthz\Tests;
44

5-
use Enforcer;
65
use Lauthz\Models\Rule;
76
use Illuminate\Foundation\Testing\DatabaseMigrations;
8-
use Casbin\Persist\Adapters\Filter;
9-
use Casbin\Exceptions\InvalidFilterTypeException;
7+
use Lauthz\Facades\Enforcer;
108

119
class DatabaseAdapterForCacheTest extends TestCase
1210
{

0 commit comments

Comments
 (0)