Merge branch 'master' into sync-to-master.

2025-08-26 06:15:19 +08:00 · 2024-03-20 06:11:31 -03:00
parent 3587dfb322 e2a167028b
commit 20d6c65db2
516 changed files with 1216 additions and 2289 deletions
--- a/framework/validators/BooleanValidator.php
+++ b/framework/validators/BooleanValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/CompareValidator.php
+++ b/framework/validators/CompareValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/DateValidator.php
+++ b/framework/validators/DateValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/DefaultValueValidator.php
+++ b/framework/validators/DefaultValueValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/EachValidator.php
+++ b/framework/validators/EachValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/EmailValidator.php
+++ b/framework/validators/EmailValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/ExistValidator.php
+++ b/framework/validators/ExistValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
@ -133,7 +134,7 @@ class ExistValidator extends Validator

        $connection = $model::getDb();
        if ($this->forceMasterDb && method_exists($connection, 'useMaster')) {
-            $exists = $connection->useMaster(function() use ($relationQuery) {
+            $exists = $connection->useMaster(function () use ($relationQuery) {
                return $relationQuery->exists();
            });
        } else {
@ -328,7 +329,8 @@ class ExistValidator extends Validator
                $prefixedColumn = "{$alias}.[[" . preg_replace(
                    '/^' . preg_quote($alias, '/') . '\.(.*)$/',
                    '$1',
-                    $columnName) . ']]';
+                    $columnName
+                ) . ']]';
            } else {
                // there is an expression, can't prefix it reliably
                $prefixedColumn = $columnName;
--- a/framework/validators/FileValidator.php
+++ b/framework/validators/FileValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/FilterValidator.php
+++ b/framework/validators/FilterValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/ImageValidator.php
+++ b/framework/validators/ImageValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/InlineValidator.php
+++ b/framework/validators/InlineValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/IpValidator.php
+++ b/framework/validators/IpValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/NumberValidator.php
+++ b/framework/validators/NumberValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/PunycodeAsset.php
+++ b/framework/validators/PunycodeAsset.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/RangeValidator.php
+++ b/framework/validators/RangeValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
@ -57,7 +58,8 @@ class RangeValidator extends Validator
    public function init()
    {
        parent::init();
-        if (!is_array($this->range)
+        if (
+            !is_array($this->range)
            && !($this->range instanceof \Closure)
            && !($this->range instanceof \Traversable)
        ) {
@ -75,7 +77,8 @@ class RangeValidator extends Validator
    {
        $in = false;

-        if ($this->allowArray
+        if (
+            $this->allowArray
            && ($value instanceof \Traversable || is_array($value))
            && ArrayHelper::isSubset($value, $this->range, $this->strict)
        ) {
--- a/framework/validators/RegularExpressionValidator.php
+++ b/framework/validators/RegularExpressionValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/RequiredValidator.php
+++ b/framework/validators/RequiredValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/SafeValidator.php
+++ b/framework/validators/SafeValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/StringValidator.php
+++ b/framework/validators/StringValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/TrimValidator.php
+++ b/framework/validators/TrimValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/UniqueValidator.php
+++ b/framework/validators/UniqueValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/UrlValidator.php
+++ b/framework/validators/UrlValidator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/ValidationAsset.php
+++ b/framework/validators/ValidationAsset.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC
--- a/framework/validators/Validator.php
+++ b/framework/validators/Validator.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * @link https://www.yiiframework.com/
 * @copyright Copyright (c) 2008 Yii Software LLC