Merge branch 'master' into master

yiisoft · Dec 6, 2024 · d318d71 · d318d71
2 parents a4ecd76 + 80f2545
commit d318d71
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php
@@ -1783,7 +1783,7 @@ private function isValueDifferent($newValue, $oldValue)
     {
         if (is_array($newValue) && is_array($oldValue)) {
             // Only sort associative arrays
-            $sorter = function(&$array) {
+            $sorter = function (&$array) {
                 if (ArrayHelper::isAssociative($array)) {
                     ksort($array);
                 }

diff --git a/framework/db/mssql/Schema.php b/framework/db/mssql/Schema.php
@@ -823,5 +823,4 @@ public function createColumnSchemaBuilder($type, $length = null)
     {
         return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length, $this->db]);
     }
-
 }
diff --git a/tests/framework/web/session/SessionTest.php b/tests/framework/web/session/SessionTest.php
@@ -65,6 +65,7 @@ public function testParamsAfterSessionStart()
             $this->assertNotEquals($oldUseCookies, $newUseCookies);
             $this->assertFalse($newUseCookies);
         }
+        $session->setUseCookies($oldUseCookies);
 
         $oldGcProbability = $session->getGCProbability();
         $session->setGCProbability(100);
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length, $this->db]);
         }
     }