Skip to content

Commit bef7496

Browse files
committed
MAGETWO-58924: SQL error wait timeout error when saving categories
- fix travis build for names
1 parent 3f27350 commit bef7496

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

app/code/Magento/UrlRewrite/Model/MergeDataProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\UrlRewrite\Model;
77

8-
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
8+
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteService;
99

1010
/**
1111
* 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
2424
/**
2525
* Adds url rewrites to class data container by removing duplicates by a unique key
2626
*
27-
* @param UrlRewrite[] $urlRewritesArray
27+
* @param UrlRewriteService[] $urlRewritesArray
2828
* @return void
2929
*/
3030
public function merge(array $urlRewritesArray)
@@ -42,7 +42,7 @@ public function merge(array $urlRewritesArray)
4242
/**
4343
* Returns the data added to container
4444
*
45-
* @return UrlRewrite[]
45+
* @return UrlRewriteService[]
4646
*/
4747
public function getData()
4848
{

0 commit comments

Comments
 (0)