Raise version min PHP 7.3.

yiisoft · Mar 20, 2024 · ce813e5 · ce813e5
1 parent e2a1670
commit ce813e5
Show file tree

Hide file tree

Showing 189 changed files with 1,867 additions and 1,552 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: C:\projects\yii2
 
 environment:
     matrix:
-      - php_ver: 7.2.4
+      - php_ver: 7.3.0
 
 cache:
     - '%APPDATA%\Composer'
@@ -30,7 +30,7 @@ install:
     - echo extension=php_mbstring.dll >> php.ini
     - echo extension=php_openssl.dll >> php.ini
     - echo extension=php_pdo_sqlite.dll >> php.ini
-    - IF NOT EXIST C:\tools\composer.phar (cd C:\tools && appveyor DownloadFile https://getcomposer.org/download/1.4.1/composer.phar)
+    - IF NOT EXIST C:\tools\composer.phar (cd C:\tools && appveyor DownloadFile https://getcomposer.org/download/2.6.3/composer.phar)
 
 before_test:
     - cd C:\projects\yii2

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,62 +13,32 @@ concurrency:
 
 jobs:
   phpunit:
-    name: PHP ${{ matrix.php }} on ${{ matrix.os }}
+    name: PHP ${{ matrix.php }}
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         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
+            coverage: none
           - php: 7.4
-            coverage: xdebug
             extensions: apc, curl, dom, imagick, intl, mbstring, mcrypt, memcached
-            os: ubuntu-latest
+            coverage: pcov
           - php: 8.0
-            coverage: none
             extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
-            os: ubuntu-latest
-          - php: 8.1
             coverage: none
+          - php: 8.1
             extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
-            os: ubuntu-latest
+            coverage: none
           - 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.
@@ -92,18 +62,14 @@ jobs:
       - name: Install dependencies.
         run: composer update $DEFAULT_COMPOSER_FLAGS
 
-      - 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
-
-      - name: Run tests with PHPUnit.
-        if: matrix.php == '8.0'
-        run: vendor/bin/phpunit --verbose --exclude-group $PHPUNIT_EXCLUDE_GROUP --colors=always
-
       - 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: Run tests with PHPUnit.
+        if: matrix.php >= '8.0'
+        run: vendor/bin/phpunit --verbose --exclude-group $PHPUNIT_EXCLUDE_GROUP --colors=always
+
       - name: Upload coverage to Codecov.
         if: matrix.php == '7.4'
         uses: codecov/codecov-action@v3

diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
@@ -66,15 +66,9 @@ jobs:
         run: composer update --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: Run MSSQL tests with PHPUnit.
-        if: matrix.php > '7.4'
-        run: vendor/bin/phpunit --group mssql --colors=always
-
       - name: Upload coverage to Codecov.
-        if: matrix.php == '7.4'
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
@@ -15,13 +15,10 @@ jobs:
       extensions: curl, intl, pdo, pdo_mysql
       XDEBUG_MODE: coverage, develop
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
           - 7.4
           - 8.0
@@ -60,15 +57,9 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run MySQL tests with PHPUnit and generate coverage.
-        if: matrix.php == '7.4'
         run: vendor/bin/phpunit --group mysql --coverage-clover=coverage.xml --colors=always
 
-      - name: Run MySQL tests with PHPUnit.
-        if: matrix.php > '7.4'
-        run: vendor/bin/phpunit --group mysql --colors=always
-
       - name: Upload coverage to Codecov.
-        if: matrix.php == '7.4'
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
@@ -15,13 +15,10 @@ jobs:
       extensions: curl, intl, pdo, pdo_pgsql
       XDEBUG_MODE: coverage, develop
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
         php:
           - 7.4
           - 8.0
@@ -68,15 +65,9 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run Pgsql tests with PHPUnit and generate coverage.
-        if: matrix.php == '7.4'
         run: vendor/bin/phpunit --group pgsql --coverage-clover=coverage.xml --colors=always
 
-      - name: Run Pgsql tests with PHPUnit.
-        if: matrix.php > '7.4'
-        run: vendor/bin/phpunit --group pgsql --colors=always
-
       - name: Upload coverage to Codecov.
-        if: matrix.php == '7.4'
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
diff --git a/.github/workflows/ci-sqlite.yml b/.github/workflows/ci-sqlite.yml
@@ -20,9 +20,6 @@ jobs:
 
     strategy:
         matrix:
-            os:
-              - ubuntu-latest
-
             php:
               - 7.4
               - 8.0
@@ -50,15 +47,9 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run SQLite tests with PHPUnit and generate coverage.
-        if: matrix.php == '7.4'
         run: vendor/bin/phpunit --group sqlite --coverage-clover=coverage.xml --colors=always
 
-      - name: Run SQLite tests with PHPUnit.
-        if: matrix.php > '7.4'
-        run: vendor/bin/phpunit --group sqlite --colors=always
-
       - name: Upload coverage to Codecov.
-        if: matrix.php == '7.4'
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
diff --git a/composer.json b/composer.json
@@ -68,7 +68,7 @@
         "yiisoft/yii2": "self.version"
     },
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=7.3.0",
         "ext-mbstring": "*",
         "ext-ctype": "*",
         "lib-pcre": "*",
@@ -82,11 +82,10 @@
         "paragonie/random_compat": ">=1"
     },
     "require-dev": {
-        "cweagans/composer-patches": "^1.7",
-        "phpunit/phpunit": "4.8.34",
         "cebe/indent": "~1.0.2",
-        "johnkary/phpunit-speedtrap": "^1.0",
         "dealerdirect/phpcodesniffer-composer-installer": "*",
+        "dms/phpunit-arraysubset-asserts": "^0.5",
+        "phpunit/phpunit": "9.6",
         "yiisoft/yii2-coding-standards": "^3.0"
     },
     "repositories": [
@@ -122,20 +121,6 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.0.x-dev"
-        },
-        "composer-exit-on-patch-failure": true,
-        "patches": {
-            "phpunit/phpunit-mock-objects": {
-                "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
-            },
-            "phpunit/php-file-iterator": {
-                "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_path_file_iterator.patch"
-            },
-            "phpunit/phpunit": {
-                "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
-                "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch",
-                "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php81.patch"
-            }
         }
     }
 }