Merge branch 'yiisoft:master' into master

framework/CHANGELOG.md

@@ -8,7 +8,7 @@ Yii Framework 2 Change Log
 - Bug #19940: File Log writer without newline (terabytesoftw)
 - Bug #19951: Removed unneeded MIME file tests (schmunk42)
 - Bug #19950: Fix `Query::groupBy(null)` causes error for PHP 8.1: `trim(): Passing null to parameter #1 ($string) of type string is deprecated` (uaoleg)
-
+- Enh #19780: added pcntl to requirements check (schmunk42)
 
 2.0.49 August 29, 2023
 ----------------------

framework/composer.json

@@ -71,8 +71,8 @@
         "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/inputmask": "~3.2.2 | ~3.3.5 | ~5.0.8 ",
+        "bower-asset/punycode": "1.3.* | 2.2.*",
         "bower-asset/yii2-pjax": "~2.0.1",
         "paragonie/random_compat": ">=1"
     },

framework/messages/ko/yii.php

@@ -75,8 +75,8 @@ return [
     '{attribute} must be greater than or equal to "{compareValue}".' => '{attribute}는 "{compareValue}" 보다 크거나 같아야 합니다.',
     '{attribute} must be less than "{compareValue}".' => '{attribute}는 "{compareValue}" 보다 작아야 합니다.',
     '{attribute} must be less than or equal to "{compareValue}".' => '{attribute}는 "{compareValue}" 보다 작거나 같아야 합니다.',
-    '{attribute} must be no greater than {max}.' => '{attribute}는 "{compareValue}" 보다 클 수 없습니다.',
-    '{attribute} must be no less than {min}.' => '{attribute}는 "{compareValue}" 보다 작을 수 없습니다.',
+    '{attribute} must be no greater than {max}.' => '{attribute}는 "{max}" 보다 클 수 없습니다.',
+    '{attribute} must be no less than {min}.' => '{attribute}는 "{min}" 보다 작을 수 없습니다.',
     '{attribute} must be repeated exactly.' => '{attribute}는 정확하게 반복합니다.',
     '{attribute} must not be equal to "{compareValue}".' => '{attribute}는 "{compareValue}"와 같을 수 없습니다.',
     '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '{attribute}는 최소 {min}자 이어야합니다.',

framework/requirements/requirements.php

@@ -111,5 +111,12 @@ return array(
         'memo' => 'When <a href="https://www.yiiframework.com/doc-2.0/yii-validators-ipvalidator.html#$expandIPv6-detail">IpValidator::expandIPv6</a>
         property is set to <code>true</code>, PHP must support IPv6 protocol stack. Currently PHP constant <code>AF_INET6</code> is not defined
         and IPv6 is probably unsupported.'
+    ),
+    array(
+        'name' => 'pcntl',
+        'mandatory' => false,
+        'condition' => extension_loaded('pcntl'),
+        'by' => '<a href="https://www.php.net/manual/de/book.pcntl.php">Process Control</a>',
+        'memo' => 'Recommended for yii2-queue CLI operations'
     )
 );