diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php index 6988efcabbba0838cff0bb87455a6300b338db10..9263f48a22ec771cbeb01564328c3560f8de281a 100644 --- a/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php +++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php @@ -6,14 +6,12 @@ namespace Magento\CatalogUrlRewrite\Model\Category; use Magento\Catalog\Model\Category; -use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator; use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator; use Magento\UrlRewrite\Model\OptionProvider; use Magento\UrlRewrite\Model\UrlFinderInterface; use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory; use Magento\UrlRewrite\Service\V1\Data\UrlRewrite; use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteMap; -use Magento\Framework\App\ObjectManager; use Magento\UrlRewrite\Model\UrlRewritesSetFactory; class CurrentUrlRewritesRegenerator @@ -42,23 +40,24 @@ class CurrentUrlRewritesRegenerator /** * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory - * @param UrlFinderInterface $urlFinder - * @param UrlRewriteMap|null $urlRewriteMap + * @param \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder + * @param \Magento\CatalogUrlRewrite\Model\Map\UrlRewriteMap|null $urlRewriteMap * @param \Magento\UrlRewrite\Model\UrlRewritesSetFactory|null $urlRewritesSetFactory */ public function __construct( - CategoryUrlPathGenerator $categoryUrlPathGenerator, - UrlRewriteFactory $urlRewriteFactory, - UrlFinderInterface $urlFinder, - UrlRewriteMap $urlRewriteMap = null, - UrlRewritesSetFactory $urlRewritesSetFactory = null + \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator, + \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory, + \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder, + \Magento\CatalogUrlRewrite\Model\Map\UrlRewriteMap $urlRewriteMap = null, + \Magento\UrlRewrite\Model\UrlRewritesSetFactory $urlRewritesSetFactory = null ) { $this->categoryUrlPathGenerator = $categoryUrlPathGenerator; $this->urlRewriteFactory = $urlRewriteFactory; $this->urlRewritePlaceholder = $urlRewriteFactory->create(); $this->urlFinder = $urlFinder; - $this->urlRewriteMap = $urlRewriteMap ?: ObjectManager::getInstance()->get(UrlRewriteMap::class); - $urlRewritesSetFactory = $urlRewritesSetFactory ?: ObjectManager::getInstance() + $this->urlRewriteMap = $urlRewriteMap ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(UrlRewriteMap::class); + $urlRewritesSetFactory = $urlRewritesSetFactory ?: \Magento\Framework\App\ObjectManager::getInstance() ->get(UrlRewritesSetFactory::class); $this->urlRewritesSetPlaceHolder = $urlRewritesSetFactory->create(); }