Merge pull request #2875 from Adyen/ECP-9605

khushboo-singhvi · web-flow · commit 6c37baa071b9 · 2025-02-05T15:13:15.000+01:00
[ECP-9605] Fix broken Magento 2.4.4 and 2.4.5 compatibility
diff --git a/Model/Config/Adminhtml/ApplePayDomainAssociationFileButton.php b/Model/Config/Adminhtml/ApplePayDomainAssociationFileButton.php
@@ -40,9 +40,9 @@ public function __construct(
     }
 
     /**
-     * @return $this|ApplePayDomainAssociationFileButton
+     * @return ApplePayDomainAssociationFileButton
      */
-    protected function _prepareLayout(): ApplePayDomainAssociationFileButton|static
+    protected function _prepareLayout(): ApplePayDomainAssociationFileButton
     {
         parent::_prepareLayout();
 
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "magento/module-vault": ">=101.2.4",
     "magento/module-multishipping": ">=100.4.4",
     "magento/module-graph-ql": ">=100.4.4",
-    "magento/module-instant-purchase": ">=100.4.4",
+    "magento/module-instant-purchase": ">=100.4.3",
     "ext-json": "*"
   },
   "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ public function __construct(`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
`43`		`- * @return $this\|ApplePayDomainAssociationFileButton`
	`43`	`+ * @return ApplePayDomainAssociationFileButton`
`44`	`44`	`*/`
`45`		`- protected function _prepareLayout(): ApplePayDomainAssociationFileButton\|static`
	`45`	`+ protected function _prepareLayout(): ApplePayDomainAssociationFileButton`
`46`	`46`	`{`
`47`	`47`	`parent::_prepareLayout();`
`48`	`48`