feat: Compatible with thinkphp8.0 (#41)

Author: leeqvip

.github/workflows/default.yml

@@ -1,10 +1,6 @@
 name: Default
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   test:
@@ -23,10 +19,26 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 7.1, 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        stability: [ prefer-lowest ]
+        include:
+          # ThinkPHP 6.*
+          - php: 7.1
+            thinkphp: 6.*
+          - php: 7.2
+            thinkphp: 6.*
+          - php: 7.4
+            thinkphp: 6.*
+          - php: 8.0
+            thinkphp: 6.*
+          - php: 8.1
+            thinkphp: 6.*
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+          # ThinkPHP 8.*
+          - php: 8.0
+            thinkphp: 8.*
+          - php: 8.1
+            thinkphp: 8.*
+
+    name: ThinkPHP${{ matrix.thinkphp }}-PHP${{ matrix.php }}
 
     steps:
       - name: Checkout code
@@ -39,6 +51,10 @@ jobs:
           tools: composer:v2
           coverage: xdebug
 
+      - name: Pre composer
+        if: matrix.thinkphp == '8.*'
+        run: composer remove php-coveralls/php-coveralls --dev
+
       - name: Validate composer.json and composer.lock
         run: composer validate
 
@@ -47,17 +63,40 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.thinkphp }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.php }}-
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.thinkphp }}
 
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
-        run: composer install --prefer-dist --no-progress --no-suggest
+        run: |
+          composer require topthink/framework:${{ matrix.thinkphp }} --no-update --no-interaction
+          composer require topthink/think:${{ matrix.thinkphp }} --no-update --no-interaction --dev
+          composer install --prefer-dist --no-progress --no-suggest
 
       - name: Run test suite
         run: ./vendor/bin/phpunit
 
+      - name: Run Coveralls
+        if: matrix.thinkphp != '8.*'
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: ${{ runner.os }} - ${{ matrix.php }}
+        run: |
+          composer global require php-coveralls/php-coveralls:^2.4
+          php-coveralls --coverage_clover=build/logs/clover.xml -v
+
+  upload-coverage:
+    runs-on: ubuntu-latest
+    needs: [ test ]
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+
   semantic-release:
     runs-on: ubuntu-latest
     needs: [ test ]

composer.json

@@ -21,14 +21,14 @@
     "license": "Apache-2.0",
     "require": {
         "casbin/casbin": "~3.0",
-        "topthink/framework": "^6.0.0",
-        "topthink/think-migration": "^3.0",
+        "topthink/framework": "~6.0|~8.0",
+        "topthink/think-migration": "^3.0.6",
         "casbin/psr3-bridge": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0|~8.0|~9.0",
-        "php-coveralls/php-coveralls": "^2.1",
-        "topthink/think": "^6.0.0"
+        "php-coveralls/php-coveralls": "^2.4",
+        "topthink/think": "~6.0|~8.0"
     },
     "autoload": {
         "psr-4": {
@@ -50,4 +50,4 @@
             ]
         }
     }
-}
+}

phpunit.xml

@@ -23,7 +23,8 @@
         <log type="coverage-html" target="build/html"/>
     </logging>
     <php>
-        <env name="PHP_APP_DEBUG " value="true"/>
+        <env name="PHP_APP_DEBUG" value="true"/>
         <env name="PHP_DATABASE_DATABASE" value="tauthz"/>
+        <env name="PHP_DB_NAME" value="tauthz"/>
     </php>
 </phpunit>