Merge pull request #63 from php-casbin/develop

leeqvip · web-flow · commit 466590c083b3 · 2024-03-24T23:33:09.000+08:00
fix: add laravel 11
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,7 +105,14 @@ jobs:
           - php: 8.1
             laravel: 10.*
             phpunit: ~9.0
-
+          # Laravel 11.x
+          - php: 8.2
+            laravel: 11.*
+            phpunit: ~10.5
+          - php: 8.3
+            laravel: 11.*
+            phpunit: ~10.5
+            
     name: Laravel${{ matrix.laravel }}-PHP${{ matrix.php }}
 
     steps:
@@ -130,8 +137,13 @@ jobs:
           composer install --prefer-dist --no-progress --no-suggest
 
       - name: Run test suite
+        if: matrix.laravel != '11.*'
         run: ./vendor/bin/phpunit -v
 
+      - name: Run test suite laravel 11
+        if: matrix.laravel == '11.*'
+        run: ./vendor/bin/phpunit -c phpunit.10.xml
+
       - name: Run Coveralls
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/composer.json b/composer.json
@@ -21,17 +21,17 @@
     "license": "Apache-2.0",
     "require": {
         "php": ">=7.1.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",
+        "illuminate/support": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
+        "illuminate/database": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
+        "illuminate/console": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
         "casbin/casbin": "~3.1",
         "casbin/psr3-bridge": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.0|~8.0|~9.0",
+        "phpunit/phpunit": "~7.0|~8.0|~9.0|~10.5",
         "php-coveralls/php-coveralls": "^2.4",
         "mockery/mockery": "^1.0",
-        "laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0"
+        "laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.10.xml b/phpunit.10.xml
@@ -0,0 +1,42 @@
+<?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>
+
+    <coverage includeUncoveredFiles="true"
+          pathCoverage="false"
+          ignoreDeprecatedCodeUnits="true"
+          disableCodeCoverageIgnore="true">
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory="build/html" lowUpperBound="50" highLowerBound="90"/>
+        </report>
+    </coverage>
+
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
+
+    <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>
diff --git a/phpunit.xml b/phpunit.xml
@@ -16,10 +16,12 @@
             <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"/>
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -46,6 +46,7 @@ protected function initConfig()
         $this->app['config']->set('database.default', 'mysql');
         $this->app['config']->set('database.connections.mysql.charset', 'utf8');
         $this->app['config']->set('database.connections.mysql.collation', 'utf8_unicode_ci');
+        $this->app['config']->set('cache.default', 'array');
         // $app['config']->set('lauthz.log.enabled', true);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ protected function initConfig()`
`46`	`46`	`$this->app['config']->set('database.default', 'mysql');`
`47`	`47`	`$this->app['config']->set('database.connections.mysql.charset', 'utf8');`
`48`	`48`	`$this->app['config']->set('database.connections.mysql.collation', 'utf8_unicode_ci');`
	`49`	`+ $this->app['config']->set('cache.default', 'array');`
`49`	`50`	`// $app['config']->set('lauthz.log.enabled', true);`
`50`	`51`	`}`
`51`	`52`