diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php b/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php index 18a57c8070dca..c7ed9f288eb81 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php @@ -14,17 +14,12 @@ */ class EntityDataProviderComposite implements EntityDataProviderInterface { - /** - * @var EntityDataProviderInterface[] - */ - private $dataProviders; - /** * @param EntityDataProviderInterface[] $dataProviders */ - public function __construct(array $dataProviders = []) - { - $this->dataProviders = $dataProviders; + public function __construct( + private readonly array $dataProviders = [] + ) { } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/AbstractEntityUrl.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/AbstractEntityUrl.php index 7df53a17c13ff..65de94291319d 100755 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/AbstractEntityUrl.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/AbstractEntityUrl.php @@ -19,34 +19,16 @@ abstract class AbstractEntityUrl implements ResolverInterface { - /** - * @var UrlFinderInterface - */ - private $urlFinder; - - /** - * @var CustomUrlLocatorInterface - */ - private $customUrlLocator; - - /** - * @var Uid - */ - private $idEncoder; - /** * @param UrlFinderInterface $urlFinder * @param CustomUrlLocatorInterface $customUrlLocator * @param Uid $idEncoder */ public function __construct( - UrlFinderInterface $urlFinder, - CustomUrlLocatorInterface $customUrlLocator, - Uid $idEncoder + private readonly UrlFinderInterface $urlFinder, + private readonly CustomUrlLocatorInterface $customUrlLocator, + private readonly Uid $idEncoder ) { - $this->urlFinder = $urlFinder; - $this->customUrlLocator = $customUrlLocator; - $this->idEncoder = $idEncoder; } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php index 300373822b435..9c5f28e4d2c7d 100755 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php @@ -17,11 +17,6 @@ class Route extends AbstractEntityUrl implements ResolverInterface { - /** - * @var EntityDataProviderComposite - */ - private $entityDataProviderComposite; - /** * @param UrlFinderInterface $urlFinder * @param CustomUrlLocatorInterface $customUrlLocator @@ -31,11 +26,10 @@ class Route extends AbstractEntityUrl implements ResolverInterface public function __construct( UrlFinderInterface $urlFinder, CustomUrlLocatorInterface $customUrlLocator, - EntityDataProviderComposite $entityDataProviderComposite, + private readonly EntityDataProviderComposite $entityDataProviderComposite, Uid $idEncoder ) { parent::__construct($urlFinder, $customUrlLocator, $idEncoder); - $this->entityDataProviderComposite = $entityDataProviderComposite; } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php index 55cd505928f42..18e0647cbecca 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php @@ -22,26 +22,6 @@ */ class UrlRewrite implements ResolverInterface { - /** - * @var UrlFinderInterface - */ - private $urlFinder; - - /** - * @var array - */ - private $entityTypeMapping; - - /** - * @var MetadataPool - */ - private $metadataPool; - - /** - * @var TypeResolver - */ - private $typeResolver; - /** * @param UrlFinderInterface $urlFinder * @param TypeResolver $typeResolver @@ -49,15 +29,11 @@ class UrlRewrite implements ResolverInterface * @param array $entityTypeMapping */ public function __construct( - UrlFinderInterface $urlFinder, - TypeResolver $typeResolver, - MetadataPool $metadataPool, - array $entityTypeMapping = [] + private readonly UrlFinderInterface $urlFinder, + private readonly TypeResolver $typeResolver, + private readonly MetadataPool $metadataPool, + private readonly array $entityTypeMapping = [] ) { - $this->urlFinder = $urlFinder; - $this->typeResolver = $typeResolver; - $this->metadataPool = $metadataPool; - $this->entityTypeMapping = $entityTypeMapping; } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php index 553c08e29137a..b005ab8230609 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php @@ -12,17 +12,12 @@ */ class CustomUrlLocator implements CustomUrlLocatorInterface { - /** - * @var CustomUrlLocatorInterface[] - */ - private $urlLocators; - /** * @param CustomUrlLocatorInterface[] $urlLocators */ - public function __construct(array $urlLocators = []) - { - $this->urlLocators = $urlLocators; + public function __construct( + private readonly array $urlLocators = [] + ) { } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/UrlResolverIdentity.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/UrlResolverIdentity.php index 1230d96818e13..382d5df962d63 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/UrlResolverIdentity.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/UrlResolverIdentity.php @@ -14,18 +14,12 @@ */ class UrlResolverIdentity implements IdentityInterface { - /** - * @var IdentityInterface[] - */ - private $urlResolverIdentities = []; - /** * @param IdentityInterface[] $urlResolverIdentities */ public function __construct( - array $urlResolverIdentities + private readonly array $urlResolverIdentities = [] ) { - $this->urlResolverIdentities = $urlResolverIdentities; } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/RoutableInterfaceTypeResolver.php b/app/code/Magento/UrlRewriteGraphQl/Model/RoutableInterfaceTypeResolver.php index a100b9a20dcc2..f9c77b5ccccb0 100755 --- a/app/code/Magento/UrlRewriteGraphQl/Model/RoutableInterfaceTypeResolver.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/RoutableInterfaceTypeResolver.php @@ -16,26 +16,14 @@ class RoutableInterfaceTypeResolver implements TypeResolverInterface { private const DEFAULT_TYPE = 'RoutableUrl'; - /** - * @var TypeResolverInterface[] - */ - private array $productTypeNameResolvers; - - /** - * @var string - */ - private string $defaultType; - /** * @param TypeResolverInterface[] $productTypeNameResolvers * @param string $defaultType */ public function __construct( - array $productTypeNameResolvers = [], - string $defaultType = self::DEFAULT_TYPE + private readonly array $productTypeNameResolvers = [], + private readonly string $defaultType = self::DEFAULT_TYPE ) { - $this->productTypeNameResolvers = $productTypeNameResolvers; - $this->defaultType = $defaultType; } /** diff --git a/app/code/Magento/UrlRewriteGraphQl/registration.php b/app/code/Magento/UrlRewriteGraphQl/registration.php index 72b576c2a0be9..5b6ddae32f6b7 100644 --- a/app/code/Magento/UrlRewriteGraphQl/registration.php +++ b/app/code/Magento/UrlRewriteGraphQl/registration.php @@ -6,4 +6,8 @@ use Magento\Framework\Component\ComponentRegistrar; -ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_UrlRewriteGraphQl', __DIR__); +ComponentRegistrar::register( + ComponentRegistrar::MODULE, + 'Magento_UrlRewriteGraphQl', + __DIR__ +);