MAGETWO-58924: SQL error wait timeout error when saving categories

- fix static issues

Author: cpartica

app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php

@@ -65,7 +65,7 @@ public function __construct(
         $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();
     }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php

@@ -48,21 +48,21 @@ public function testGetDataMap()
             ->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));