Merge pull request #20028 from terabytesoftw/synchronize-to-master

Synchronize to master.

Author: bizley

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
         run: sudo locale-gen fr_FR.UTF-8
 
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP.
         uses: shivammathur/setup-php@v2

.github/workflows/ci-mssql.yml

@@ -43,8 +43,8 @@ jobs:
           options: --name=mssql --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - name: Checkout.
-        uses: actions/checkout@v3
+      - name: Checkout
+        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'

.github/workflows/ci-mysql.yml

@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2

.github/workflows/ci-node.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies.
         run: composer update $DEFAULT_COMPOSER_FLAGS

.github/workflows/ci-oracle.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2

.github/workflows/ci-pgsql.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2

.github/workflows/ci-sqlite.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2

build/controllers/MimeTypeController.php

@@ -121,10 +121,14 @@ private function generateMimeTypesFile($outFile, $content)
  * Its content is generated from the apache http mime.types file.
  * https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?view=markup
  * This file has been placed in the public domain for unlimited redistribution.
+ *
+ * All extra changes made to this file must be comitted to /build/controllers/MimeTypeController.php
+ * otherwise they will be lost on next build.
  */
 \$mimeTypes = $array;
 
-if (PHP_VERSION_ID >= 80100) {
+# fix for bundled libmagic bug, see also https://github.com/yiisoft/yii2/issues/19925
+if ((PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80122) || (PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80209)) {
     \$mimeTypes = array_replace(\$mimeTypes, array('xz' => 'application/octet-stream'));
 }
 
@@ -148,6 +152,9 @@ private function generateMimeAliasesFile($outFile)
  * MIME aliases.
  *
  * This file contains aliases for MIME types.
+ *
+ * All extra changes made to this file must be comitted to /build/controllers/MimeTypeController.php
+ * otherwise they will be lost on next build.
  */
 return $array;
 
@@ -209,6 +216,9 @@ private function generateMimeExtensionsFile($outFile, $content)
  * Its content is generated from the apache http mime.types file.
  * https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?view=markup
  * This file has been placed in the public domain for unlimited redistribution.
+ *
+ * All extra changes made to this file must be comitted to /build/controllers/MimeTypeController.php
+ * otherwise they will be lost on next build.
  */
 return $array;
 

composer.json

@@ -76,10 +76,9 @@
         "ezyang/htmlpurifier": "^4.6",
         "cebe/markdown": "~1.0.0 | ~1.1.0 | ~1.2.0",
         "bower-asset/jquery": "3.7.*@stable | 3.6.*@stable | 3.5.*@stable | 3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
-        "bower-asset/inputmask": "~3.2.2 | ~3.3.5",
-        "bower-asset/punycode": "1.3.*",
-        "bower-asset/yii2-pjax": "~2.0.1",
-        "paragonie/random_compat": ">=1"
+        "bower-asset/inputmask": "^5.0.8 ",
+        "bower-asset/punycode": "^2.2",
+        "bower-asset/yii2-pjax": "~2.0.1"
     },
     "require-dev": {
         "dms/phpunit-arraysubset-asserts": "^0.5",
@@ -110,7 +109,6 @@
     },
     "config": {
         "allow-plugins": {
-            "cweagans/composer-patches": true,
             "yiisoft/yii2-composer": true
         }
     },