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

 - merged with '2.3-develop-expedited-prs' branch

Author: magento-engcom-team

app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php

@@ -49,9 +49,9 @@ class DbStorage extends AbstractStorage
     private $logger;
 
     /**
-     * @param UrlRewriteFactory $urlRewriteFactory
-     * @param DataObjectHelper $dataObjectHelper
-     * @param ResourceConnection $resource
+     * @param UrlRewriteFactory    $urlRewriteFactory
+     * @param DataObjectHelper     $dataObjectHelper
+     * @param ResourceConnection   $resource
      * @param LoggerInterface|null $logger
      */
     public function __construct(
@@ -71,7 +71,7 @@ public function __construct(
     /**
      * Prepare select statement for specific filter
      *
-     * @param array $data
+     * @param  array $data
      * @return Select
      */
     protected function prepareSelect(array $data)
@@ -106,12 +106,14 @@ protected function doFindOneByData(array $data)
 
             $requestPath = $data[UrlRewrite::REQUEST_PATH];
             $decodedRequestPath = urldecode($requestPath);
-            $data[UrlRewrite::REQUEST_PATH] = array_unique([
+            $data[UrlRewrite::REQUEST_PATH] = array_unique(
+                [
                 rtrim($requestPath, '/'),
                 rtrim($requestPath, '/') . '/',
                 rtrim($decodedRequestPath, '/'),
                 rtrim($decodedRequestPath, '/') . '/',
-            ]);
+                ]
+            );
 
             $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
             if ($resultsFromDb) {
@@ -128,8 +130,8 @@ protected function doFindOneByData(array $data)
     /**
      * Extract most relevant url rewrite from url rewrites list
      *
-     * @param string $requestPath
-     * @param array $urlRewrites
+     * @param  string $requestPath
+     * @param  array  $urlRewrites
      * @return array|null
      */
     private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites): ?array
@@ -166,8 +168,8 @@ private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRe
      * If request path matches the DB value or it's redirect - we can return result from DB
      * Otherwise return 301 redirect to request path from DB results
      *
-     * @param string $requestPath
-     * @param array $urlRewrite
+     * @param  string $requestPath
+     * @param  array  $urlRewrite
      * @return array
      */
     private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
@@ -197,7 +199,7 @@ private function prepareUrlRewrite(string $requestPath, array $urlRewrite): arra
     /**
      * Delete old URLs from DB.
      *
-     * @param UrlRewrite[] $urls
+     * @param  UrlRewrite[] $urls
      * @return void
      */
     private function deleteOldUrls(array $urls): void
@@ -242,7 +244,7 @@ private function deleteOldUrls(array $urls): void
     /**
      * Prepare array with unique entities
      *
-     * @param UrlRewrite[] $urls
+     * @param  UrlRewrite[] $urls
      * @return array
      */
     private function prepareUniqueEntities(array $urls): array
@@ -258,23 +260,33 @@ private function prepareUniqueEntities(array $urls): array
             }
             $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
         }
+
         return $uniqueEntities;
     }
 
     /**
      * @inheritDoc
      */
-    protected function doReplace(array $urls)
+    protected function doReplace(array $urls): array
     {
-        $this->deleteOldUrls($urls);
+        $this->connection->beginTransaction();
 
-        $data = [];
-        foreach ($urls as $url) {
-            $data[] = $url->toArray();
-        }
         try {
+            $this->deleteOldUrls($urls);
+
+            $data = [];
+            foreach ($urls as $url) {
+                $data[] = $url->toArray();
+            }
+
             $this->insertMultiple($data);
+
+            $this->connection->commit();
+            // @codingStandardsIgnoreStart
         } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
+            // @codingStandardsIgnoreEnd
+            $this->connection->rollBack();
+
             /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $urlConflicted */
             $urlConflicted = [];
             foreach ($urls as $url) {
@@ -298,6 +310,9 @@ protected function doReplace(array $urls)
             } else {
                 throw $e->getPrevious() ?: $e;
             }
+        } catch (\Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
         }
 
         return $urls;
@@ -306,12 +321,12 @@ protected function doReplace(array $urls)
     /**
      * Insert multiple
      *
-     * @param array $data
+     * @param  array $data
      * @return void
      * @throws \Magento\Framework\Exception\AlreadyExistsException|\Exception
      * @throws \Exception
      */
-    protected function insertMultiple($data)
+    protected function insertMultiple($data): void
     {
         try {
             $this->connection->insertMultiple($this->resource->getTableName(self::TABLE_NAME), $data);
@@ -331,11 +346,11 @@ protected function insertMultiple($data)
     /**
      * Get filter for url rows deletion due to provided urls
      *
-     * @param UrlRewrite[] $urls
-     * @return array
+     * @param      UrlRewrite[] $urls
+     * @return     array
      * @deprecated Not used anymore.
      */
-    protected function createFilterDataBasedOnUrls($urls)
+    protected function createFilterDataBasedOnUrls($urls): array
     {
         $data = [];
         foreach ($urls as $url) {