diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php similarity index 86% rename from app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php rename to app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php index d20323a485d..6cc669e46d0 100644 --- a/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php +++ b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php @@ -7,14 +7,14 @@ namespace Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite; -use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface; +use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface; use Magento\Store\Model\ScopeInterface; use Magento\Cms\Helper\Page; /** - * Home page URL resolver. + * Home page URL locator. */ -class HomePageUrlResolver implements CustomUrlResolverInterface +class HomePageUrlLocator implements CustomUrlLocatorInterface { /** * @var \Magento\Framework\App\Config\ScopeConfigInterface @@ -33,7 +33,7 @@ public function __construct( /** * @inheritdoc */ - public function resolveUrl($urlKey): ?string + public function locateUrl($urlKey): ?string { if ($urlKey === '/') { $homePageUrl = $this->scopeConfig->getValue( diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml index 8cd226b3fd2..d384c898acb 100644 --- a/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml +++ b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml @@ -6,10 +6,10 @@ */ --> - + - - Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite\HomePageUrlResolver + + Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite\HomePageUrlLocator diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php index 0de21c81f7a..3f07edc6019 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php @@ -14,7 +14,7 @@ use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\UrlRewrite\Model\UrlFinderInterface; -use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface; +use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface; /** * UrlRewrite field resolver, used for GraphQL request processing. @@ -37,26 +37,26 @@ class UrlRewrite implements ResolverInterface private $valueFactory; /** - * @var UrlRewrite\CustomUrlResolverInterface + * @var CustomUrlLocatorInterface */ - private $customUrlResolver; + private $customUrlLocator; /** * @param UrlFinderInterface $urlFinder * @param StoreManagerInterface $storeManager * @param ValueFactory $valueFactory - * @param CustomUrlResolverInterface $customUrlResolver + * @param CustomUrlLocatorInterface $customUrlLocator */ public function __construct( UrlFinderInterface $urlFinder, StoreManagerInterface $storeManager, ValueFactory $valueFactory, - CustomUrlResolverInterface $customUrlResolver + CustomUrlLocatorInterface $customUrlLocator ) { $this->urlFinder = $urlFinder; $this->storeManager = $storeManager; $this->valueFactory = $valueFactory; - $this->customUrlResolver = $customUrlResolver; + $this->customUrlLocator = $customUrlLocator; } /** @@ -78,7 +78,7 @@ public function resolve( if (substr($url, 0, 1) === '/' && $url !== '/') { $url = ltrim($url, '/'); } - $customUrl = $this->customUrlResolver->resolveUrl($url); + $customUrl = $this->customUrlLocator->locateUrl($url); $url = $customUrl ?: $url; $urlRewrite = $this->findCanonicalUrl($url); if ($urlRewrite) { diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php new file mode 100644 index 00000000000..553c08e2913 --- /dev/null +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php @@ -0,0 +1,41 @@ +urlLocators = $urlLocators; + } + + /** + * @inheritdoc + */ + public function locateUrl($urlKey): ?string + { + foreach ($this->urlLocators as $urlLocator) { + $url = $urlLocator->locateUrl($urlKey); + if ($url !== null) { + return $url; + } + } + return null; + } +} diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php similarity index 84% rename from app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php rename to app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php index 1aee63b6706..df0c0ee96c1 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php @@ -12,7 +12,7 @@ * * It can be used, for example, to resolve '\' URL path to a 'Home' page. */ -interface CustomUrlResolverInterface +interface CustomUrlLocatorInterface { /** * Resolve URL based on custom rules. @@ -20,5 +20,5 @@ interface CustomUrlResolverInterface * @param string $urlKey * @return string|null Return null if URL cannot be resolved */ - public function resolveUrl($urlKey): ?string; + public function locateUrl($urlKey): ?string; } diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php deleted file mode 100644 index 08efb54bd6b..00000000000 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php +++ /dev/null @@ -1,41 +0,0 @@ -urlResolvers = $urlResolvers; - } - - /** - * @inheritdoc - */ - public function resolveUrl($urlKey): ?string - { - foreach ($this->urlResolvers as $urlResolver) { - $url = $urlResolver->resolveUrl($urlKey); - if ($url !== null) { - return $url; - } - } - return null; - } -} diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/di.xml b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml index c7b1533962a..a9865db4e97 100644 --- a/app/code/Magento/UrlRewriteGraphQl/etc/di.xml +++ b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml @@ -6,5 +6,5 @@ */ --> - +