From f1e86dfba5aefe84a1e7ae28020e2c3c725327a3 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 10 Jan 2017 15:12:46 -0600
Subject: [PATCH] MAGETWO-58924: SQL error wait timeout error when saving
categories
- fix static issues
---
.../Observer/UrlRewriteHandler.php | 2 +-
.../Test/Unit/Model/Map/HashMapPoolTest.php | 20 +++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 727dd744cd8..73b7c2b8167 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -65,7 +65,7 @@ class UrlRewriteHandler
$this->urlPersist = $urlPersist;
$this->productCollectionFactory = $productCollectionFactory;
if (!isset($mergeDataProviderFactory)) {
- $mergeDataProviderFactory = $mergeDataProviderFactory = ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
+ $mergeDataProviderFactory = ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
}
$this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php
index eef5e05e4f6..616a1d9b524 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php
@@ -48,21 +48,21 @@ class HashMapPoolTest extends \PHPUnit_Framework_TestCase
->method('create')
->willReturnMap(
[
- [
- DataCategoryHashMap::class,
- ['category' => 1],
- $dataCategoryMapMock
- ],
+ [
+ DataCategoryHashMap::class,
+ ['category' => 1],
+ $dataCategoryMapMock
+ ],
[
DataProductHashMap::class,
['category' => 1],
$dataProductMapMock
],
- [
- DataCategoryUsedInProductsHashMap::class,
- ['category' => 2],
- $dataProductMapMockOtherCategory
- ]
+ [
+ DataCategoryUsedInProductsHashMap::class,
+ ['category' => 2],
+ $dataProductMapMockOtherCategory
+ ]
]
);
$this->assertSame($dataCategoryMapMock, $this->model->getDataMap(DataCategoryHashMap::class, 1));
--
GitLab