Merge branch 'dev2' of https://github.com/ulue/swoft-component into dev2

Author: inhere

.github/workflows/php.yml

@@ -0,0 +1,54 @@
+#
+# Github actions for swoft component tests
+# https://github.com/marketplace?type=actions
+#
+name: Unit-tests
+
+on: [push, pull_request]
+
+# usage refer https://github.com/shivammathur/setup-php
+jobs:
+  test:
+    name: Test on php ${{ matrix.php}} and ${{ matrix.os }} OS
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
+    env:
+      SWOFT_DEBUG: 0
+    strategy:
+      fail-fast: true # fast fail
+      matrix:
+        php: [7.2, 7.3, 7.4, 8.0]
+        os: [ubuntu-latest] # , macOS-latest, windows-latest
+        swoole-versions: [''] # latest
+        include:
+        - os: 'ubuntu-latest'
+          php: '7.1'
+          swoole-versions: '-4.5.11'
+
+    steps:
+      - uses: actions/checkout@v2
+      # usage refer https://github.com/shivammathur/setup-php
+      - name: Setup PHP
+        timeout-minutes: 5
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php}}
+          extensions: mbstring, dom, fileinfo, mysql, openssl, redis, swoole${{ matrix.swoole-versions }} #optional, setup extensions
+          ini-values: post_max_size=56M, short_open_tag=On #optional, setup php.ini configuration
+          coverage: none #optional, setup coverage driver: xdebug, none
+
+      - name: Display swoole extensions
+        timeout-minutes: 1
+        run: php --ri swoole
+      #    sudo pecl install -f swoole
+      # echo 'no' | pecl install -f redis
+      # sudo pecl update-channels && pecl install -f msgpack && pecl install -f igbinary && php -m
+
+      - name: Install dependencies
+        run: composer install --no-progress --no-suggest
+
+      # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+      # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+      - name: Run test suite
+        run: composer run test

.github/workflows/release.yml

@@ -0,0 +1,62 @@
+name: Tag-release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  release:
+    name: Test on php ${{ matrix.php}}
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.3]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set ENV for github-release
+        # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+        run: |
+          echo "RELEASE_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
+          echo "RELEASE_NAME=$GITHUB_WORKFLOW" >> $GITHUB_ENV
+
+      # usage refer https://github.com/shivammathur/setup-php
+      - name: Setup PHP
+        timeout-minutes: 5
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php}}
+          tools: pecl, php-cs-fixer, phpunit
+          extensions: mbstring, dom, fileinfo, mysql, openssl # , swoole-4.4.19 #optional, setup extensions
+          ini-values: post_max_size=56M, short_open_tag=On #optional, setup php.ini configuration
+          coverage: none #optional, setup coverage driver: xdebug, none
+
+      - name: Install dependencies # eg: v1.0.3
+        run: |
+          tag1=${GITHUB_REF#refs/*/}
+          echo "release tag: ${tag1}"
+          composer install --no-progress --no-suggest
+
+      # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+      # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+#      - name: Build phar and send to github assets
+#        run: |
+#          echo $RELEASE_TAG
+#          echo $RELEASE_NAME
+#          php -d phar.readonly=0 bin/kite phar:pack -o kite-${RELEASE_TAG}.phar --no-progress
+#          php kite-${RELEASE_TAG}.phar -V
+
+      # https://github.com/actions/create-release
+      - uses: meeDamian/[email protected]
+        with:
+          gzip: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ env.RELEASE_TAG }}
+          name: ${{ env.RELEASE_TAG }}
+#          files: kite-${{ env.RELEASE_TAG }}.phar

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "swoft/db",
   "type": "library",
-  "version": "v2.0.10",
+  "version": "v2.0.11",
   "keywords": [
     "php",
     "swoole",
@@ -23,7 +23,7 @@
     }
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.5"
+    "phpunit/phpunit": "^7.5 || ^8.0"
   },
   "autoload-dev": {
     "psr-4": {

test/unit/Eloquent/ModelTest.php

@@ -780,14 +780,14 @@ public function testProp()
 
         $expectSql = '`user_desc` = ?';
         $sql       = User::whereProp('udesc', $desc)->toSql();
-        $this->assertContains($expectSql, $sql);
+        $this->assertStringContainsString($expectSql, $sql);
 
         $expectSql1 = 'select * from `user` where (`user_desc` = ? and `test_json`->\'$."user_status"\' = ?)';
         $sql1       = User::whereProp([
             'udesc'                  => $desc,
             'test_json->user_status' => $rand
         ])->toSql();
-        $this->assertContains($expectSql1, $sql1);
+        $this->assertStringContainsString($expectSql1, $sql1);
     }
 
     public function testUpdateOrCreate()