[Magento Community Engineering] Community Contributions - 2.4-develop-prs

 - merged with '2.4-develop-fast-lane-prs' branch

Author: magento-engcom-team

app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/View.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CmsUrlRewrite\Plugin\Cms\Model\Store;
 
+use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
 use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -21,6 +22,8 @@
  */
 class View
 {
+    private const ALL_STORE_VIEWS = '0';
+
     /**
      * @var UrlPersistInterface
      */
@@ -89,14 +92,27 @@ private function generateCmsPagesUrls(int $storeId): array
     {
         $rewrites = [];
         $urls = [];
-        $searchCriteria = $this->searchCriteriaBuilder->create();
-        $cmsPagesCollection = $this->pageRepository->getList($searchCriteria)->getItems();
-        foreach ($cmsPagesCollection as $page) {
+
+        foreach ($this->getCmsPageItems() as $page) {
             $page->setStoreId($storeId);
             $rewrites[] = $this->cmsPageUrlRewriteGenerator->generate($page);
         }
         $urls = array_merge($urls, ...$rewrites);
 
         return $urls;
     }
+
+    /**
+     * Return cms page items for all store view
+     *
+     * @return PageInterface[]
+     */
+    private function getCmsPageItems(): array
+    {
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('store_id', self::ALL_STORE_VIEWS)
+            ->create();
+        $list = $this->pageRepository->getList($searchCriteria);
+
+        return $list->getItems();
+    }
 }

app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php

@@ -54,6 +54,19 @@ public function destruct()
     {
         if (is_object($this->_fileHandler)) {
             $this->_fileHandler->close();
+            $this->resolveDestination();
+        }
+    }
+
+    /**
+     * Remove temporary destination
+     *
+     * @return void
+     */
+    private function resolveDestination(): void
+    {
+        // only temporary file located directly in var folder
+        if (strpos($this->_destination, '/') === false) {
             $this->_directoryHandle->delete($this->_destination);
         }
     }

app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php

@@ -80,11 +80,9 @@ public function draw()
         $lines = [];
 
         // draw Product name
-        $lines[0] = [
-            [
+        $lines[0][] = [
                 'text' => $this->string->split($this->prepareText((string)$item->getName()), 35, true, true),
                 'feed' => 35
-            ]
         ];
 
         // draw SKU

app/code/Magento/Store/etc/di.xml

@@ -65,7 +65,6 @@
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
     <type name="Magento\Framework\App\ActionInterface">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck"/>
-        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\LoadDesignPlugin"/>
         <plugin name="eventDispatch"  type="Magento\Framework\App\Action\Plugin\EventDispatchPlugin"/>
         <plugin name="actionFlagNoDispatch"  type="Magento\Framework\App\Action\Plugin\ActionFlagNoDispatchPlugin"/>
     </type>

lib/internal/Magento/Framework/App/Action/Plugin/LoadDesignPlugin.php renamed to app/code/Magento/Theme/Plugin/LoadDesignPlugin.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\Action\Plugin;
+namespace Magento\Theme\Plugin;
 
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Config\Dom\ValidationException;
@@ -21,12 +21,12 @@ class LoadDesignPlugin
     /**
      * @var DesignLoader
      */
-    protected $_designLoader;
+    private $designLoader;
 
     /**
      * @var MessageManagerInterface
      */
-    protected $messageManager;
+    private $messageManager;
 
     /**
      * @param DesignLoader $designLoader
@@ -36,7 +36,7 @@ public function __construct(
         DesignLoader $designLoader,
         MessageManagerInterface $messageManager
     ) {
-        $this->_designLoader = $designLoader;
+        $this->designLoader = $designLoader;
         $this->messageManager = $messageManager;
     }
 
@@ -50,7 +50,7 @@ public function __construct(
     public function beforeExecute(ActionInterface $subject)
     {
         try {
-            $this->_designLoader->load();
+            $this->designLoader->load();
         } catch (LocalizedException $e) {
             if ($e->getPrevious() instanceof ValidationException) {
                 /** @var MessageInterface $message */

lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/LoadDesignPluginTest.php renamed to app/code/Magento/Theme/Test/Unit/Plugin/LoadDesignPluginTest.php

@@ -3,15 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
-namespace Magento\Framework\App\Test\Unit\Action\Plugin;
+namespace Magento\Theme\Test\Unit\Plugin;
 
 use Magento\Framework\App\Action\Action;
-use Magento\Framework\App\Action\Plugin\LoadDesignPlugin;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\View\DesignLoader;
+use Magento\Theme\Plugin\LoadDesignPlugin;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -26,7 +24,7 @@ public function testBeforeExecute()
         $designLoaderMock = $this->createMock(DesignLoader::class);
 
         /** @var MockObject|ManagerInterface $messageManagerMock */
-        $messageManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $messageManagerMock = $this->createMock(ManagerInterface::class);
 
         $plugin = new LoadDesignPlugin($designLoaderMock, $messageManagerMock);
 

app/code/Magento/Theme/etc/di.xml

@@ -105,6 +105,9 @@
             <argument name="scope" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
+    </type>
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
              <argument name="collections" xsi:type="array">

dev/tests/integration/testsuite/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/ViewTest.php

@@ -25,7 +25,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for plugin which is listening store resource model and on save replace cms page url rewrites
+ * Test for plugin which is listening store resource model and on save replace cms page url rewrites.
  *
  * @magentoAppArea adminhtml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -84,9 +84,10 @@ protected function setUp(): void
     /**
      * Test of replacing cms page url rewrites on create and delete store
      *
+     * @magentoDataFixture Magento/Cms/_files/two_cms_page_with_same_url_for_different_stores.php
      * @magentoDataFixture Magento/Cms/_files/pages.php
      */
-    public function testUrlRewritesChangesAfterStoreSave()
+    public function testUrlRewritesChangesAfterStoreSave(): void
     {
         $storeId = $this->createStore();
         $this->assertUrlRewritesCount($storeId, 'page100', 1);
@@ -98,16 +99,16 @@ public function testUrlRewritesChangesAfterStoreSave()
     }
 
     /**
-     * Assert url rewrites count by store id
+     * Assert url rewrites count by store id and request path
      *
      * @param int $storeId
-     * @param string $pageIdentifier
+     * @param string $requestPath
      * @param int $expectedCount
      */
-    private function assertUrlRewritesCount(int $storeId, string $pageIdentifier, int $expectedCount): void
+    private function assertUrlRewritesCount(int $storeId, string $requestPath, int $expectedCount): void
     {
         $data = [
-            UrlRewrite::REQUEST_PATH => $pageIdentifier,
+            UrlRewrite::REQUEST_PATH => $requestPath,
             UrlRewrite::STORE_ID => $storeId
         ];
         $urlRewrites = $this->urlFinder->findAllByData($data);
@@ -116,8 +117,6 @@ private function assertUrlRewritesCount(int $storeId, string $pageIdentifier, in
 
     /**
      * Create test store
-     *
-     * @return int
      */
     private function createStore(): int
     {
@@ -134,7 +133,6 @@ private function createStore(): int
      * Delete test store
      *
      * @param int $storeId
-     * @return void
      */
     private function deleteStore(int $storeId): void
     {

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Adapter/CsvTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\ImportExport\Model\Import;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -28,43 +29,53 @@ class CsvTest extends TestCase
      */
     private $objectManager;
 
-    /**
-     * @var Csv
-     */
-    private $csv;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        parent::setUp();
-
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->csv = $this->objectManager->create(
-            Csv::class,
-            ['destination' => $this->destination]
-        );
     }
 
     /**
      * Test to destruct export adapter
+     *
+     * @dataProvider destructDataProvider
+     *
+     * @param string $destination
+     * @param bool $shouldBeDeleted
+     * @return void
      */
-    public function testDestruct(): void
+    public function testDestruct(string $destination, bool $shouldBeDeleted): void
     {
+        $csv = $this->objectManager->create(Csv::class, ['destination' => $destination]);
         /** @var Filesystem $fileSystem */
         $fileSystem = $this->objectManager->get(Filesystem::class);
         $directoryHandle = $fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
         /** Assert that the destination file is present after construct */
         $this->assertFileExists(
-            $directoryHandle->getAbsolutePath($this->destination),
+            $directoryHandle->getAbsolutePath($destination),
             'The destination file was\'t created after construct'
         );
-        /** Assert that the destination file was removed after destruct */
-        $this->csv = null;
-        $this->assertFileNotExists(
-            $directoryHandle->getAbsolutePath($this->destination),
-            'The destination file was\'t removed after destruct'
-        );
+        unset($csv);
+
+        if ($shouldBeDeleted) {
+            $this->assertFileDoesNotExist($directoryHandle->getAbsolutePath($destination));
+        } else {
+            $this->assertFileExists($directoryHandle->getAbsolutePath($destination));
+        }
+    }
+
+    /**
+     * DataProvider for testDestruct
+     *
+     * @return array
+     */
+    public function destructDataProvider(): array
+    {
+        return [
+            'temporary file' => [$this->destination, true],
+            'import history file' => [Import::IMPORT_HISTORY_DIR . $this->destination, false],
+        ];
     }
 }