Merge branch '4.14' of https://github.com/craftcms/cms into 5.6

craftcms · Jan 2, 2025 · cfa7e12 · cfa7e12
2 parents 1459e6d + 9791899
commit cfa7e12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -94,6 +94,7 @@
 - Added `craft\web\User::getImpersonatorId()`.
 - Added `craft\web\User::setImpersonatorId()`.
 - Added `craft\web\View::setTwig()`.
+- `GuzzleHttp\Client` is now instantiated via `Craft::createObject()`. ([#16366](https://github.com/craftcms/cms/pull/16366))
 - `craft\elements\NestedElementManager::getIndexHtml()` now supports passing `defaultSort` in the `$config` array. ([#16236](https://github.com/craftcms/cms/discussions/16236))
 - `craft\elements\conditions\entries\MatrixFieldConditionRule` is now an alias of `FieldConditionRule`.
 - `craft\helpers\Cp::elementIndexHtml()` now supports passing `defaultSort` in the `$config` array, when `sources` is `null`. ([#16236](https://github.com/craftcms/cms/discussions/16236))

diff --git a/src/Craft.php b/src/Craft.php
@@ -404,7 +404,7 @@ public static function createGuzzleClient(array $config = []): Client
             $guzzleConfig['proxy'] = $generalConfig->httpProxy;
         }
 
-        return new Client($guzzleConfig);
+        return Craft::createObject(Client::class, [$guzzleConfig]);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 $guzzleConfig['proxy'] = $generalConfig->httpProxy;
             }
-            return new Client($guzzleConfig);
+            return Craft::createObject(Client::class, [$guzzleConfig]);
         }
     }
@@ Expand Down @@