Merge branch 'master' into patch-18

WinterSilence · Mar 13, 2024 · da8275f · da8275f
2 parents cab6b14 + b0aa6ab
commit da8275f
Show file tree

Hide file tree

Showing 352 changed files with 10,137 additions and 3,814 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
 # Autodetect text files
-* text=auto
+* text=auto eol=lf
 
 # ...Unless the name matches the following overriding patterns
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,95 +4,108 @@ on: [push, pull_request]
 
 env:
   DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi"
-  PHPUNIT_EXCLUDE_GROUP: mssql,oci,wincache,xcache,zenddata,cubrid
+  PHPUNIT_EXCLUDE_GROUP: db,wincache,xcache,zenddata
   XDEBUG_MODE: coverage, develop
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   phpunit:
     name: PHP ${{ matrix.php }} on ${{ matrix.os }}
+
     runs-on: ${{ matrix.os }}
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: yiitest
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-      postgres:
-        image: postgres:9.6
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: yiitest
-        ports:
-          - 5432:5432
-        options: --name=postgres --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
+
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        php: [5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
+        include:
+          - php: 5.4
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 5.5
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 5.6
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 7.0
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 7.1
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 7.2
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 7.3
+            coverage: none
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 7.4
+            coverage: xdebug
+            extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 8.0
+            coverage: none
+            extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 8.1
+            coverage: none
+            extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            os: ubuntu-latest
+          - php: 8.2
+            extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            coverage: none
+            os: ubuntu-latest
+          - php: 8.3
+            extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            coverage: none
+            os: ubuntu-latest
 
     steps:
-      - name: Generate french locale
+      - name: Generate french locale.
         run: sudo locale-gen fr_FR.UTF-8
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install PHP
+
+      - name: Checkout.
+        uses: actions/checkout@v4
+
+      - name: Install PHP.
         uses: shivammathur/setup-php@v2
         with:
+          coverage: ${{ matrix.coverage }}
+          extensions: ${{ matrix.extensions }}
+          ini-values: apc.enabled=1,apc.shm_size=32M,apc.enable_cli=1, date.timezone='UTC', session.save_path="${{ runner.temp }}"
           php-version: ${{ matrix.php }}
           tools: pecl
-          extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached, mysql, pdo, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, sqlite
-          ini-values: date.timezone='UTC', session.save_path="${{ runner.temp }}"
-      - name: Install Memcached
+
+      - name: Install Memcached.
         uses: niden/actions-memcached@v7
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: Install dependencies
+
+      - name: Install dependencies.
         run: composer update $DEFAULT_COMPOSER_FLAGS
-      - name: PHP Unit tests
+
+      - name: Run tests with PHPUnit.
+        if: matrix.php < '7.4' || matrix.php >= '8.1'
         run: vendor/bin/phpunit --verbose --exclude-group $PHPUNIT_EXCLUDE_GROUP --colors=always
 
-  npm:
-    name: NPM 6 on ubuntu-latest
-    runs-on: ubuntu-latest
+      - name: Run tests with PHPUnit.
+        if: matrix.php == '8.0'
+        run: vendor/bin/phpunit --verbose --exclude-group $PHPUNIT_EXCLUDE_GROUP --colors=always
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.2
-          ini-values: session.save_path=${{ runner.temp }}
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: Install dependencies
-        run: composer update $DEFAULT_COMPOSER_FLAGS
-      - name: Install node.js
-        uses: actions/setup-node@v1
+      - name: Run tests with PHPUnit and generate coverage.
+        if: matrix.php == '7.4'
+        run: vendor/bin/phpunit --verbose --exclude-group $PHPUNIT_EXCLUDE_GROUP --coverage-clover=coverage.xml --colors=always
+
+      - name: Upload coverage to Codecov.
+        if: matrix.php == '7.4'
+        uses: codecov/codecov-action@v3
         with:
-          node-version: 6
-      - name: Tests
-        run: |
-          npm install
-          npm test
-#        env:
-#          CI: true
+          file: ./coverage.xml
diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
@@ -4,42 +4,33 @@ on:
 
 name: ci-mssql
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     name: PHP ${{ matrix.php }}-mssql-${{ matrix.mssql }}
 
     env:
-      key: cache
+      EXTENSIONS: pdo, pdo_sqlsrv
+      XDEBUG_MODE: coverage, develop
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         include:
-          - php: 7.0
-            extensions: pdo, pdo_sqlsrv-5.8.1
-            mssql: server:2017-latest
-          - php: 7.1
-            extensions: pdo, pdo_sqlsrv-5.8.1
-            mssql: server:2017-latest
-          - php: 7.2
-            extensions: pdo, pdo_sqlsrv-5.8.1
-            mssql: server:2017-latest
-          - php: 7.3
-            extensions: pdo, pdo_sqlsrv-5.8.1
-            mssql: server:2017-latest
           - php: 7.4
-            extensions: pdo, pdo_sqlsrv
-            mssql: server:2017-latest
-          - php: 7.4
-            extensions: pdo, pdo_sqlsrv
-            mssql: server:2019-latest
-          - php: 8.0
-            extensions: pdo, pdo_sqlsrv
             mssql: server:2017-latest
           - php: 8.0
-            extensions: pdo, pdo_sqlsrv
             mssql: server:2019-latest
+          - php: 8.1
+            mssql: server:2019-latest
+          - php: 8.2
+            mssql: server:2022-latest
+          - php: 8.3
+            mssql: server:2022-latest
 
     services:
       mssql:
@@ -54,50 +45,36 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create MS SQL Database
         run: docker exec -i mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE yiitest'
 
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
-          extensions: ${{ matrix.extensions }}
+          coverage: xdebug
+          extensions: ${{ env.EXTENSIONS }}
           ini-values: date.timezone='UTC'
+          php-version: ${{ matrix.php }}
           tools: composer:v2, pecl
 
-      - name: Determine composer cache directory on Linux
-        run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
-
-      - name: Cache dependencies installed with composer
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.COMPOSER_CACHE_DIR }}
-          key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            php${{ matrix.php }}-composer-
-
       - name: Update composer
         run: composer self-update
 
       - name: Install dependencies with composer
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Install dependencies with composer php 8.0
-        if: matrix.php == '8.0'
-        run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      - name: Run MSSQL tests with PHPUnit and generate coverage.
+        if: matrix.php == '7.4'
+        run: vendor/bin/phpunit --group mssql --coverage-clover=coverage.xml --colors=always
 
-      - name: PHP Unit tests for PHP 7.1
-        run: vendor/bin/phpunit --coverage-clover=coverage.clover --group mssql --colors=always
-        if: matrix.php == '7.1'
-
-      - name: Run tests with phpunit without coverage
+      - name: Run MSSQL tests with PHPUnit.
+        if: matrix.php > '7.4'
         run: vendor/bin/phpunit --group mssql --colors=always
 
-      - name: Code coverage
-        run: |
-          wget https://scrutinizer-ci.com/ocular.phar
-          php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-        if: matrix.php == '7.1'
-        continue-on-error: true # if is fork
+      - name: Upload coverage to Codecov.
+        if: matrix.php == '7.4'
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml