Merge branch '4.x' into 5.x

# Conflicts: # CHANGELOG.md # src/Plugin.php
craftcms · Jun 20, 2024 · 7f011e7 · 7f011e7
2 parents 98092cc + 2668522
commit 7f011e7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a PHP error that could occur on app initialization.
+
 ## 5.0.11 - 2024-06-18
 
 - Added `craft\commerce\elements\Product::getDefaultPrice()`.

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -282,38 +282,39 @@ public static function editions(): array
     public function init(): void
     {
         parent::init();
+        $request = Craft::$app->getRequest();
+
+        $this->_addTwigExtensions();
+        $this->_registerFieldTypes();
+        $this->_registerPermissions();
+        $this->_registerCraftEventListeners();
+        $this->_registerProjectConfigEventListeners();
+        $this->_registerVariables();
+        $this->_registerForeignKeysRestore();
+        $this->_registerPoweredByHeader();
+        $this->_registerElementTypes();
+        $this->_registerGqlInterfaces();
+        $this->_registerGqlQueries();
+        $this->_registerGqlComponents();
+        $this->_registerGqlEagerLoadableFields();
+        $this->_registerCacheTypes();
+        $this->_registerGarbageCollection();
+
+        if ($request->getIsConsoleRequest()) {
+            $this->_defineResaveCommand();
+        } elseif ($request->getIsCpRequest()) {
+            $this->_registerCpRoutes();
+            $this->_registerWidgets();
+            $this->_registerElementExports();
+            $this->_defineFieldLayoutElements();
+            $this->_registerRedactorLinkOptions();
+            $this->_registerCKEditorLinkOptions();
+        } else {
+            $this->_registerSiteRoutes();
+        }
 
-        Craft::$app->onInit(function() {
-            $request = Craft::$app->getRequest();
-            $this->_addTwigExtensions();
-            $this->_registerFieldTypes();
-            $this->_registerPermissions();
-            $this->_registerCraftEventListeners();
-            $this->_registerProjectConfigEventListeners();
-            $this->_registerVariables();
-            $this->_registerForeignKeysRestore();
-            $this->_registerPoweredByHeader();
-            $this->_registerElementTypes();
-            $this->_registerGqlInterfaces();
-            $this->_registerGqlQueries();
-            $this->_registerGqlComponents();
-            $this->_registerGqlEagerLoadableFields();
-            $this->_registerCacheTypes();
-            $this->_registerGarbageCollection();
+        Craft::$app->onInit(function() use ($request) {
             $this->_registerDebugPanels();
-
-            if ($request->getIsConsoleRequest()) {
-                $this->_defineResaveCommand();
-            } elseif ($request->getIsCpRequest()) {
-                $this->_registerCpRoutes();
-                $this->_registerWidgets();
-                $this->_registerElementExports();
-                $this->_defineFieldLayoutElements();
-                $this->_registerRedactorLinkOptions();
-                $this->_registerCKEditorLinkOptions();
-            } else {
-                $this->_registerSiteRoutes();
-            }
         });
 
         Craft::setAlias('@commerceLib', Craft::getAlias('@craft/commerce/../lib'));
@@ -781,9 +782,12 @@ function(DefineBehaviorsEvent $event) {
         Event::on(Address::class, Address::EVENT_DEFINE_BEHAVIORS, function(DefineBehaviorsEvent $event) {
             /** @var Address $address */
             $address = $event->sender;
-            $owner = $address->getOwner();
-            if ($owner instanceof UserElement) {
-                $event->behaviors['commerce:address'] = CustomerAddressBehavior::class;
+
+            if ($address->ownerId) {
+                $owner = $address->getOwner();
+                if ($owner instanceof UserElement) {
+                    $event->behaviors['commerce:address'] = CustomerAddressBehavior::class;
+                }
             }
         });