From 689812b1c3457bd7981479064ccb1ac6e482c829 Mon Sep 17 00:00:00 2001
From: Dimitri BOUTEILLE <dimitri.bouteille@reflet-digital.com>
Date: Mon, 23 Sep 2024 10:25:47 +0200
Subject: [PATCH 1/4] Fix bad phpdoc
 Magento\Framework\App\Config\ScopeConfigInterface

---
 .../Magento/Backend/Model/View/Result/Page.php     |  2 +-
 lib/internal/Magento/Framework/App/Config.php      | 14 ++------------
 .../Framework/App/Config/ScopeConfigInterface.php  |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php
index 2ea9cdf2ee7bd..6eb727f347ea5 100644
--- a/app/code/Magento/Backend/Model/View/Result/Page.php
+++ b/app/code/Magento/Backend/Model/View/Result/Page.php
@@ -36,7 +36,7 @@ public function setActiveMenu($itemId)
     /**
      * Add link to breadcrumb block
      *
-     * @param string $label
+     * @param \Stringable $label
      * @param string $title
      * @param string|null $link
      * @return $this
diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
index 32a1cd4948d66..fec3c73962024 100644
--- a/lib/internal/Magento/Framework/App/Config.php
+++ b/lib/internal/Magento/Framework/App/Config.php
@@ -45,12 +45,7 @@ public function __construct(
     }
 
     /**
-     * Retrieve config value by path and scope
-     *
-     * @param string $path
-     * @param string $scope
-     * @param null|int|string $scopeCode
-     * @return mixed
+     * @inheritDoc
      */
     public function getValue(
         $path = null,
@@ -80,12 +75,7 @@ public function getValue(
     }
 
     /**
-     * Retrieve config flag
-     *
-     * @param string $path
-     * @param string $scope
-     * @param null|int|string $scopeCode
-     * @return bool
+     * @inheritDoc
      */
     public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
     {
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
index cdac6f3552eea..6119671b1286e 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
@@ -24,7 +24,7 @@ interface ScopeConfigInterface
      *
      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
-     * @param null|int|string $scopeCode
+     * @param null|int|string|\Magento\Store\Api\Data\StoreInterface $scopeCode
      * @return mixed
      */
     public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
@@ -34,7 +34,7 @@ public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DE
      *
      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
-     * @param null|int|string $scopeCode
+     * @param null|int|string|\Magento\Store\Api\Data\StoreInterface $scopeCode
      * @return bool
      */
     public function isSetFlag($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);

From 632f588fab7a755a06610f727ce820fb659f148c Mon Sep 17 00:00:00 2001
From: Dimitri BOUTEILLE <dimitri.bouteille@reflet-digital.com>
Date: Mon, 23 Sep 2024 10:32:37 +0200
Subject: [PATCH 2/4] Rollback addBreadcrumb

---
 app/code/Magento/Backend/Model/View/Result/Page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php
index 6eb727f347ea5..2ea9cdf2ee7bd 100644
--- a/app/code/Magento/Backend/Model/View/Result/Page.php
+++ b/app/code/Magento/Backend/Model/View/Result/Page.php
@@ -36,7 +36,7 @@ public function setActiveMenu($itemId)
     /**
      * Add link to breadcrumb block
      *
-     * @param \Stringable $label
+     * @param string $label
      * @param string $title
      * @param string|null $link
      * @return $this

From 7954b2607c09c97f1cb9b31071c8d299fceb5403 Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Mon, 16 Dec 2024 14:54:01 +0530
Subject: [PATCH 3/4] 39199: fix static failures

---
 lib/internal/Magento/Framework/App/Config.php             | 6 +++---
 .../Magento/Framework/App/Config/ScopeConfigInterface.php | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
index fec3c73962024..c1b3babe4de8e 100644
--- a/lib/internal/Magento/Framework/App/Config.php
+++ b/lib/internal/Magento/Framework/App/Config.php
@@ -1,9 +1,9 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
+
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Config\ConfigTypeInterface;
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
index 6119671b1286e..0bc04a69dc662 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * Configuration interface
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\App\Config;
@@ -17,7 +15,7 @@ interface ScopeConfigInterface
     /**
      * Default scope type
      */
-    const SCOPE_TYPE_DEFAULT = 'default';
+    public const SCOPE_TYPE_DEFAULT = 'default';
 
     /**
      * Retrieve config value by path and scope.

From cf6e875a1add46ba44f27c2c7c42b723cfdde2f8 Mon Sep 17 00:00:00 2001
From: Dimitri BOUTEILLE <dimitri.bouteille@reflet-digital.com>
Date: Mon, 16 Dec 2024 16:19:44 +0100
Subject: [PATCH 4/4] Fix review

---
 .../Magento/Framework/App/Config/ScopeConfigInterface.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
index 0bc04a69dc662..927ad4373efca 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
@@ -22,7 +22,7 @@ interface ScopeConfigInterface
      *
      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
-     * @param null|int|string|\Magento\Store\Api\Data\StoreInterface $scopeCode
+     * @param null|int|string|\Magento\Framework\App\ScopeInterface $scopeCode
      * @return mixed
      */
     public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
@@ -32,7 +32,7 @@ public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DE
      *
      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
-     * @param null|int|string|\Magento\Store\Api\Data\StoreInterface $scopeCode
+     * @param null|int|string|\Magento\Framework\App\ScopeInterface $scopeCode
      * @return bool
      */
     public function isSetFlag($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);