Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3998' into PR_2025_06_25_muntianu

katmoon · katmoon · commit faa16c52af6a · 2025-06-25T13:27:40.000-05:00
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
@@ -80,7 +80,9 @@ public function __construct(
         $this->formKey = $context->getFormKey();
         $this->nameBuilder = $context->getNameBuilder();
         $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
-        $data['directoryHelper']= $directoryHelper ?? ObjectManager::getInstance()->get(DirectoryHelper::class);
+        if (empty($data['directoryHelper'])) {
+            $data['directoryHelper'] = $directoryHelper ?? ObjectManager::getInstance()->get(DirectoryHelper::class);
+        }
         parent::__construct($context, $data);
     }
 
@@ -107,6 +109,7 @@ public function getFormKey()
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
      * issues that will be addressed in future releases.
+     * @see no alternatives
      */
     public function isOutputEnabled($moduleName = null)
     {
diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php
@@ -25,7 +25,10 @@
 use Magento\Framework\View\TemplateEngineInterface;
 use Magento\Framework\View\TemplateEnginePool;
 use Magento\Rule\Model\Condition\Combine;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Widget\Model\Widget\Instance;
+use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -196,9 +199,9 @@ public function testConstructWithParamsFromBlock()
 
     /**
      * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws Exception
      */
-    public function testRender()
+    public function testRender(): void
     {
         $data = ['area' => 'backend'];
         $abstractElementMock = $this->getMockBuilder(AbstractElement::class)
@@ -226,6 +229,10 @@ public function testRender()
         $templateEngineMock->expects($this->once())->method('render')->willReturn('html');
         $resolverMock->method('getTemplateFileName')->willReturn('');
 
+        $storeMock = $this->createMock(StoreInterface::class);
+        $storeManager = $this->createMock(StoreManagerInterface::class);
+        $storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $this->contextMock->expects($this->any())->method('getStoreManager')->willReturn($storeManager);
         $this->widgetConditions = $this->objectManagerHelper->getObject(
             Conditions::class,
             [
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Email\Block\Adminhtml\Template;
 
@@ -100,7 +100,7 @@ public function __construct(
         $this->_emailConfig = $emailConfig;
         $this->buttonList = $buttonList;
         $this->toolbar = $toolbar;
-        parent::__construct($context, $data);
+        parent::__construct($context, $data, $jsonHelper);
     }
 
     /**
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
@@ -1,29 +1,42 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Email\Test\Unit\Block\Adminhtml\Template;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\ToolbarInterface;
+use Magento\Backend\Model\Menu\Item\Factory;
 use Magento\Backend\Helper\Data;
 use Magento\Backend\Model\Menu;
 use Magento\Backend\Model\Menu\Config;
 use Magento\Backend\Model\Menu\Item;
-use Magento\Backend\Model\Url;
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Config\Model\Config\Structure\Element\Group;
 use Magento\Config\Model\Config\Structure\Element\Section;
 use Magento\Email\Block\Adminhtml\Template\Edit;
 use Magento\Email\Model\BackendTemplate;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template\File\Resolver;
+use Magento\Framework\View\Element\Template\File\Validator;
 use Magento\Framework\View\FileSystem as FilesystemView;
 use Magento\Framework\View\Layout;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -62,20 +75,29 @@ class EditTest extends TestCase
      */
     protected $filesystemMock;
 
+    /**
+     * @var Context|MockObject
+     */
+    private Context $context;
+
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
         $layoutMock = $this->getMockBuilder(Layout::class)
             ->addMethods(['helper'])
             ->disableOriginalConstructor()
             ->getMock();
         $helperMock = $this->createMock(Data::class);
         $menuConfigMock = $this->createMock(Config::class);
         $menuMock = $this->getMockBuilder(Menu::class)
-            ->setConstructorArgs([$this->getMockForAbstractClass(LoggerInterface::class)])
-            ->getMock();
+            ->setConstructorArgs(
+                [
+                    $this->getMockForAbstractClass(LoggerInterface::class),
+                    '',
+                    $this->createMock(Factory::class),
+                    $this->createMock(SerializerInterface::class)
+                ]
+            )->getMock();
         $menuItemMock = $this->createMock(Item::class);
-        $urlBuilder = $this->createMock(Url::class);
         $this->_configStructureMock = $this->createMock(Structure::class);
         $this->_emailConfigMock = $this->createMock(\Magento\Email\Model\Template\Config::class);
 
@@ -96,20 +118,29 @@ protected function setUp(): void
         )->willReturn(
             DirectoryList::ROOT . '/custom/filename.phtml'
         );
-
-        $params = [
-            'urlBuilder' => $urlBuilder,
-            'layout' => $layoutMock,
-            'menuConfig' => $menuConfigMock,
-            'configStructure' => $this->_configStructureMock,
-            'emailConfig' => $this->_emailConfigMock,
-            'filesystem' => $this->filesystemMock,
-            'viewFileSystem' => $viewFilesystem,
-        ];
-        $arguments = $objectManager->getConstructArguments(
-            Edit::class,
-            $params
-        );
+        $this->context = $this->createMock(Context::class);
+        $this->context->expects($this->any())->method('getStoreManager')
+            ->willReturn($this->createMock(StoreManagerInterface::class));
+        $urlBuilder = $this->createMock(UrlInterface::class);
+        $this->context->expects($this->any())->method('getUrlBuilder')->willReturn($urlBuilder);
+        $eventManager = $this->createMock(ManagerInterface::class);
+        $this->context->expects($this->any())->method('getEventManager')->willReturn($eventManager);
+        $scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->context->expects($this->any())->method('getScopeConfig')->willReturn($scopeConfig);
+        $appState = $this->createMock(State::class);
+        $this->context->expects($this->any())->method('getAppState')->willReturn($appState);
+        $resolver = $this->createMock(Resolver::class);
+        $this->context->expects($this->any())->method('getResolver')->willReturn($resolver);
+        $fileSystem = $this->createMock(Filesystem::class);
+        $fileSystem->expects($this->any())
+            ->method('getDirectoryRead')
+            ->willReturn($this->createMock(Read::class));
+        $this->context->expects($this->any())->method('getFilesystem')->willReturn($fileSystem);
+        $validator = $this->createMock(Validator::class);
+        $this->context->expects($this->any())->method('getValidator')->willReturn($validator);
+        $this->context->expects($this->any())
+            ->method('getLogger')
+            ->willReturn($this->createMock(LoggerInterface::class));
 
         $urlBuilder->expects($this->any())->method('getUrl')->willReturnArgument(0);
         $menuConfigMock->expects($this->any())->method('getMenu')->willReturn($menuMock);
@@ -118,7 +149,25 @@ protected function setUp(): void
 
         $layoutMock->expects($this->any())->method('helper')->willReturn($helperMock);
 
-        $this->_block = $objectManager->getObject(Edit::class, $arguments);
+        $encoder = $this->createMock(EncoderInterface::class);
+        $registry = $this->createMock(Registry::class);
+        $jsonHelper = $this->createMock(JsonHelper::class);
+        $buttonList = $this->createMock(ButtonList::class);
+        $toolbar = $this->createMock(ToolbarInterface::class);
+        $this->_block = new Edit(
+            $this->context,
+            $encoder,
+            $registry,
+            $menuConfigMock,
+            $this->_configStructureMock,
+            $this->_emailConfigMock,
+            $jsonHelper,
+            $buttonList,
+            $toolbar,
+            [
+                'directoryHelper' => $this->createMock(\Magento\Directory\Helper\Data::class)
+            ]
+        );
     }
 
     /**
@@ -148,6 +197,7 @@ public function testGetCurrentlyUsedForPaths()
             ['getLabel']
         );
         $map = [
+            [['section1'], $sectionMock],
             [['section1', 'group1'], $groupMock1],
             [['section1', 'group1', 'group2'], $groupMock2],
             [['section1', 'group1', 'group2', 'group3'], $groupMock3],
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -213,7 +213,7 @@ public function testGetCacheKeyInfo(): void
             ->onlyMethods(['getCode'])
             ->getMock();
         $store->expects($this->once())->method('getCode')->willReturn('321');
-        $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
+        $this->storeManager->expects($this->exactly(2))->method('getStore')->willReturn($store);
 
         $this->assertEquals(
             ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null],
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\View\Element;
 
@@ -35,7 +35,7 @@ class Template extends AbstractBlock
     /**
      * Config path to 'Allow Symlinks' template settings
      */
-    const XML_PATH_TEMPLATE_ALLOW_SYMLINK = 'dev/template/allow_symlink';
+    public const XML_PATH_TEMPLATE_ALLOW_SYMLINK = 'dev/template/allow_symlink';
 
     /**
      * Assigned variables for view
@@ -211,6 +211,7 @@ public function getTemplateFile($template = null)
         if ($area) {
             $params['area'] = $area;
         }
+        $params['store_id'] = $this->_storeManager->getStore()?->getId();
         return $this->resolver->getTemplateFileName($template ?: $this->getTemplate(), $params);
     }
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -107,6 +107,7 @@ protected function setUp(): void
         $storeMock->expects($this->any())
             ->method('getCode')
             ->willReturn('storeCode');
+        $storeMock->expects($this->any())->method('getId')->willReturn(1);
         $urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
         $urlBuilderMock->expects($this->any())
             ->method('getBaseUrl')
@@ -130,7 +131,7 @@ protected function setUp(): void
 
     public function testGetTemplateFile()
     {
-        $params = ['module' => 'Fixture_Module', 'area' => 'frontend'];
+        $params = ['module' => 'Fixture_Module', 'area' => 'frontend', 'store_id' => 1];
         $this->resolver->expects($this->once())->method('getTemplateFileName')->with('template.phtml', $params);
         $this->block->getTemplateFile();
     }
