ACP2E-3998: [Cloud]Magento OOTB code - Email Template Setup issue

Author: aplapana

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,
             [

app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php

@@ -1,12 +1,14 @@
 <?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\Model\Menu\Item\Factory;
 use Magento\Backend\Helper\Data;
 use Magento\Backend\Model\Menu;
 use Magento\Backend\Model\Menu\Config;
@@ -21,9 +23,11 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 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,6 +66,11 @@ class EditTest extends TestCase
      */
     protected $filesystemMock;
 
+    /**
+     * @var Context|MockObject
+     */
+    private Context $context;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -72,8 +81,14 @@ protected function setUp(): void
         $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);
@@ -96,6 +111,9 @@ protected function setUp(): void
         )->willReturn(
             DirectoryList::ROOT . '/custom/filename.phtml'
         );
+        $this->context = $this->createMock(Context::class);
+        $this->context->expects($this->any())->method('getStoreManager')
+            ->willReturn($this->createMock(StoreManagerInterface::class));
 
         $params = [
             'urlBuilder' => $urlBuilder,
@@ -105,6 +123,7 @@ protected function setUp(): void
             'emailConfig' => $this->_emailConfigMock,
             'filesystem' => $this->filesystemMock,
             'viewFileSystem' => $viewFilesystem,
+            'context' => $this->context
         ];
         $arguments = $objectManager->getConstructArguments(
             Edit::class,

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,7 +211,7 @@ public function getTemplateFile($template = null)
         if ($area) {
             $params['area'] = $area;
         }
-        $params['store_id'] = $this->_storeManager->getStore()->getId();
+        $params['store_id'] = $this->_storeManager->getStore()?->getId();
         return $this->resolver->getTemplateFileName($template ?: $this->getTemplate(), $params);
     }