From bef74960ad542671d8143c5cb24eaa2a990c60c9 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 11 Jan 2017 11:53:38 -0600
Subject: [PATCH] MAGETWO-58924: SQL error wait timeout error when saving
categories
- fix travis build for names
---
app/code/Magento/UrlRewrite/Model/MergeDataProvider.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/code/Magento/UrlRewrite/Model/MergeDataProvider.php b/app/code/Magento/UrlRewrite/Model/MergeDataProvider.php
index f37e6cbde7d..20ecf0f52c0 100644
--- a/app/code/Magento/UrlRewrite/Model/MergeDataProvider.php
+++ b/app/code/Magento/UrlRewrite/Model/MergeDataProvider.php
@@ -5,7 +5,7 @@
*/
namespace Magento\UrlRewrite\Model;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteService;
/**
* This class is to be used as a container for new generated url rewrites by adding new ones using merge method
@@ -24,7 +24,7 @@ class MergeDataProvider
/**
* Adds url rewrites to class data container by removing duplicates by a unique key
*
- * @param UrlRewrite[] $urlRewritesArray
+ * @param UrlRewriteService[] $urlRewritesArray
* @return void
*/
public function merge(array $urlRewritesArray)
@@ -42,7 +42,7 @@ class MergeDataProvider
/**
* Returns the data added to container
*
- * @return UrlRewrite[]
+ * @return UrlRewriteService[]
*/
public function getData()
{
--
GitLab