fix: Compatible with Laravel 10
This commit is contained in:
parent
774857a93c
commit
a237b71baa
|
@ -101,6 +101,10 @@ jobs:
|
|||
- php: 8.0
|
||||
laravel: 9.*
|
||||
phpunit: ~9.0
|
||||
# Laravel 10.x
|
||||
- php: 8.1
|
||||
laravel: 10.*
|
||||
phpunit: ~9.0
|
||||
|
||||
name: Laravel${{ matrix.laravel }}-PHP${{ matrix.php }}
|
||||
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
"license": "Apache-2.0",
|
||||
"require": {
|
||||
"php": ">=7.1.0",
|
||||
"illuminate/support": "~5.5|~6.0|~7.0|~8.0|~9.0",
|
||||
"illuminate/database": "~5.5|~6.0|~7.0|~8.0|~9.0",
|
||||
"illuminate/console": "~5.5|~6.0|~7.0|~8.0|~9.0",
|
||||
"illuminate/support": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0",
|
||||
"illuminate/database": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0",
|
||||
"illuminate/console": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0",
|
||||
"casbin/casbin": "~3.1",
|
||||
"casbin/psr3-bridge": "^1.1"
|
||||
},
|
||||
|
@ -31,7 +31,7 @@
|
|||
"phpunit/phpunit": "~7.0|~8.0|~9.0",
|
||||
"php-coveralls/php-coveralls": "^2.4",
|
||||
"mockery/mockery": "^1.0",
|
||||
"laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0"
|
||||
"laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
70
phpunit.xml
70
phpunit.xml
|
@ -1,36 +1,34 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<phpunit backupGlobals="false"
|
||||
backupStaticAttributes="false"
|
||||
bootstrap="vendor/autoload.php"
|
||||
colors="true"
|
||||
convertErrorsToExceptions="true"
|
||||
convertNoticesToExceptions="true"
|
||||
convertWarningsToExceptions="true"
|
||||
processIsolation="false"
|
||||
stopOnFailure="false">
|
||||
<testsuites>
|
||||
<testsuite name="Application Test Suite">
|
||||
<directory>./tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
<filter>
|
||||
<whitelist processUncoveredFilesFromWhitelist="true">
|
||||
<directory suffix=".php">./src</directory>
|
||||
</whitelist>
|
||||
</filter>
|
||||
<logging>
|
||||
<log type="coverage-clover" target="build/logs/clover.xml"/>
|
||||
<log type="coverage-html" target="build/html"/>
|
||||
</logging>
|
||||
<php>
|
||||
<env name="APP_ENV" value="testing"/>
|
||||
<env name="BCRYPT_ROUNDS" value="4"/>
|
||||
<env name="CACHE_DRIVER" value="array"/>
|
||||
<env name="MAIL_DRIVER" value="array"/>
|
||||
<env name="QUEUE_CONNECTION" value="sync"/>
|
||||
<env name="SESSION_DRIVER" value="array"/>
|
||||
|
||||
<env name="DB_DATABASE" value="lauthz"/>
|
||||
<env name="DB_USERNAME" value="root"/>
|
||||
</php>
|
||||
</phpunit>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<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.0/phpunit.xsd">
|
||||
<testsuites>
|
||||
<testsuite name="Application Test Suite">
|
||||
<directory>./tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
<filter>
|
||||
<whitelist processUncoveredFilesFromWhitelist="true">
|
||||
<directory suffix=".php">./src</directory>
|
||||
</whitelist>
|
||||
</filter>
|
||||
<logging>
|
||||
<log type="coverage-clover" target="build/logs/clover.xml"/>
|
||||
<log type="coverage-html" target="build/html"/>
|
||||
</logging>
|
||||
<php>
|
||||
<env name="APP_ENV" value="testing"/>
|
||||
<env name="BCRYPT_ROUNDS" value="4"/>
|
||||
<env name="CACHE_DRIVER" value="array"/>
|
||||
<env name="MAIL_DRIVER" value="array"/>
|
||||
<env name="QUEUE_CONNECTION" value="sync"/>
|
||||
<env name="SESSION_DRIVER" value="array"/>
|
||||
|
||||
<env name="DB_DATABASE" value="lauthz"/>
|
||||
<env name="DB_USERNAME" value="root"/>
|
||||
</php>
|
||||
</phpunit>
|
Loading…
Reference in New Issue