From 58a7afeeab967ea2ffe9ed2c5486e7d9a9ef7874 Mon Sep 17 00:00:00 2001 From: roadiz-ci Date: Thu, 14 Mar 2024 17:17:14 +0000 Subject: [PATCH] refactor: Removed deprecated AppController.php and Handler methods. Removed FrontendController.php. --- src/EntityHandler/CustomFormFieldHandler.php | 12 ++++------ src/EntityHandler/CustomFormHandler.php | 5 ---- src/EntityHandler/TagHandler.php | 11 --------- src/EntityHandler/TranslationHandler.php | 11 --------- .../Handler/DeleteNodeTypeMessageHandler.php | 14 ++++------- .../Handler/HttpRequestMessageHandler.php | 18 ++++----------- .../PurgeReverseProxyCacheMessageHandler.php | 23 ++++--------------- ...archRealmNodeInheritanceMessageHandler.php | 21 +++++------------ .../UpdateDoctrineSchemaMessageHandler.php | 5 +--- .../UpdateNodeTypeSchemaMessageHandler.php | 14 ++++------- 10 files changed, 30 insertions(+), 104 deletions(-) diff --git a/src/EntityHandler/CustomFormFieldHandler.php b/src/EntityHandler/CustomFormFieldHandler.php index 5af55d5f..e7b8cbd5 100644 --- a/src/EntityHandler/CustomFormFieldHandler.php +++ b/src/EntityHandler/CustomFormFieldHandler.php @@ -14,12 +14,7 @@ final class CustomFormFieldHandler extends AbstractHandler { private ?CustomFormField $customFormField = null; - private CustomFormHandler $customFormHandler; - public function getCustomFormField(): ?CustomFormField - { - return $this->customFormField; - } /** * @param CustomFormField $customFormField * @return $this @@ -34,10 +29,11 @@ public function setCustomFormField(CustomFormField $customFormField): self * @param ObjectManager $objectManager * @param CustomFormHandler $customFormHandler */ - public function __construct(ObjectManager $objectManager, CustomFormHandler $customFormHandler) - { + public function __construct( + ObjectManager $objectManager, + private readonly CustomFormHandler $customFormHandler + ) { parent::__construct($objectManager); - $this->customFormHandler = $customFormHandler; } /** diff --git a/src/EntityHandler/CustomFormHandler.php b/src/EntityHandler/CustomFormHandler.php index a2fbb925..721e121a 100644 --- a/src/EntityHandler/CustomFormHandler.php +++ b/src/EntityHandler/CustomFormHandler.php @@ -15,11 +15,6 @@ final class CustomFormHandler extends AbstractHandler { protected ?CustomForm $customForm = null; - public function getCustomForm(): ?CustomForm - { - return $this->customForm; - } - public function setCustomForm(CustomForm $customForm): self { $this->customForm = $customForm; diff --git a/src/EntityHandler/TagHandler.php b/src/EntityHandler/TagHandler.php index e3cf16b0..b995f460 100644 --- a/src/EntityHandler/TagHandler.php +++ b/src/EntityHandler/TagHandler.php @@ -17,17 +17,6 @@ final class TagHandler extends AbstractHandler { private ?Tag $tag = null; - /** - * @return Tag - */ - public function getTag(): Tag - { - if (null === $this->tag) { - throw new \BadMethodCallException('Tag is null'); - } - return $this->tag; - } - /** * @param Tag $tag * @return $this diff --git a/src/EntityHandler/TranslationHandler.php b/src/EntityHandler/TranslationHandler.php index 3fc38349..6f3f30ea 100644 --- a/src/EntityHandler/TranslationHandler.php +++ b/src/EntityHandler/TranslationHandler.php @@ -18,17 +18,6 @@ final class TranslationHandler extends AbstractHandler { private ?TranslationInterface $translation = null; - /** - * @return TranslationInterface - */ - public function getTranslation(): TranslationInterface - { - if (null === $this->translation) { - throw new \BadMethodCallException('Translation is null'); - } - return $this->translation; - } - /** * @param TranslationInterface $translation * diff --git a/src/Message/Handler/DeleteNodeTypeMessageHandler.php b/src/Message/Handler/DeleteNodeTypeMessageHandler.php index 6159b918..9a9c4723 100644 --- a/src/Message/Handler/DeleteNodeTypeMessageHandler.php +++ b/src/Message/Handler/DeleteNodeTypeMessageHandler.php @@ -19,15 +19,11 @@ final class DeleteNodeTypeMessageHandler implements MessageHandlerInterface { - private ManagerRegistry $managerRegistry; - private HandlerFactoryInterface $handlerFactory; - private MessageBusInterface $messageBus; - - public function __construct(ManagerRegistry $managerRegistry, HandlerFactoryInterface $handlerFactory, MessageBusInterface $messageBus) - { - $this->managerRegistry = $managerRegistry; - $this->handlerFactory = $handlerFactory; - $this->messageBus = $messageBus; + public function __construct( + private readonly ManagerRegistry $managerRegistry, + private readonly HandlerFactoryInterface $handlerFactory, + private readonly MessageBusInterface $messageBus + ) { } /** diff --git a/src/Message/Handler/HttpRequestMessageHandler.php b/src/Message/Handler/HttpRequestMessageHandler.php index b7848ed5..35f275e5 100644 --- a/src/Message/Handler/HttpRequestMessageHandler.php +++ b/src/Message/Handler/HttpRequestMessageHandler.php @@ -7,24 +7,15 @@ use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use Psr\Log\LoggerInterface; -use Psr\Log\NullLogger; use RZ\Roadiz\CoreBundle\Message\HttpRequestMessage; use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Handler\MessageHandlerInterface; final class HttpRequestMessageHandler implements MessageHandlerInterface { - private LoggerInterface $logger; - private ?Client $client; - - /** - * @param Client|null $client - * @param LoggerInterface|null $logger - */ - public function __construct(Client $client = null, ?LoggerInterface $logger = null) - { - $this->logger = $logger ?? new NullLogger(); - $this->client = $client ?? new Client(); + public function __construct( + private readonly LoggerInterface $logger + ) { } public function __invoke(HttpRequestMessage $message): void @@ -35,7 +26,8 @@ public function __invoke(HttpRequestMessage $message): void $message->getRequest()->getMethod(), $message->getRequest()->getUri() )); - $this->client->send($message->getRequest(), $message->getOptions()); + $client = new Client(); + $client->send($message->getRequest(), $message->getOptions()); } catch (GuzzleException $exception) { throw new UnrecoverableMessageHandlingException($exception->getMessage(), 0, $exception); } diff --git a/src/Message/Handler/PurgeReverseProxyCacheMessageHandler.php b/src/Message/Handler/PurgeReverseProxyCacheMessageHandler.php index 6082040d..13da36f7 100644 --- a/src/Message/Handler/PurgeReverseProxyCacheMessageHandler.php +++ b/src/Message/Handler/PurgeReverseProxyCacheMessageHandler.php @@ -20,27 +20,12 @@ final class PurgeReverseProxyCacheMessageHandler implements MessageHandlerInterface { - private UrlGeneratorInterface $urlGenerator; - private ReverseProxyCacheLocator $reverseProxyCacheLocator; - private MessageBusInterface $bus; - private ManagerRegistry $managerRegistry; - - /** - * @param MessageBusInterface $bus - * @param UrlGeneratorInterface $urlGenerator - * @param ReverseProxyCacheLocator $reverseProxyCacheLocator - * @param ManagerRegistry $managerRegistry - */ public function __construct( - MessageBusInterface $bus, - UrlGeneratorInterface $urlGenerator, - ReverseProxyCacheLocator $reverseProxyCacheLocator, - ManagerRegistry $managerRegistry + private readonly MessageBusInterface $bus, + private readonly UrlGeneratorInterface $urlGenerator, + private readonly ReverseProxyCacheLocator $reverseProxyCacheLocator, + private readonly ManagerRegistry $managerRegistry ) { - $this->urlGenerator = $urlGenerator; - $this->reverseProxyCacheLocator = $reverseProxyCacheLocator; - $this->managerRegistry = $managerRegistry; - $this->bus = $bus; } public function __invoke(PurgeReverseProxyCacheMessage $message): void diff --git a/src/Message/Handler/SearchRealmNodeInheritanceMessageHandler.php b/src/Message/Handler/SearchRealmNodeInheritanceMessageHandler.php index 145bc5e8..277bf6a5 100644 --- a/src/Message/Handler/SearchRealmNodeInheritanceMessageHandler.php +++ b/src/Message/Handler/SearchRealmNodeInheritanceMessageHandler.php @@ -21,21 +21,12 @@ final class SearchRealmNodeInheritanceMessageHandler implements MessageHandlerInterface { - private ManagerRegistry $managerRegistry; - private HandlerFactoryInterface $handlerFactory; - private MessageBusInterface $bus; - private LoggerInterface $logger; - public function __construct( - ManagerRegistry $managerRegistry, - HandlerFactoryInterface $handlerFactory, - MessageBusInterface $bus, - LoggerInterface $logger + private readonly ManagerRegistry $managerRegistry, + private readonly HandlerFactoryInterface $handlerFactory, + private readonly MessageBusInterface $bus, + private readonly LoggerInterface $logger ) { - $this->managerRegistry = $managerRegistry; - $this->handlerFactory = $handlerFactory; - $this->bus = $bus; - $this->logger = $logger; } public function __invoke(SearchRealmNodeInheritanceMessage $message): void @@ -65,7 +56,7 @@ private function clearAnyExistingRealmNodes(Node $node): void $this->logger->info('Clean existing RealmNode information'); $this->bus->dispatch(new Envelope(new CleanRealmNodeInheritanceMessage( $autoRealmNode->getNode()->getId(), - null !== $autoRealmNode->getRealm() ? $autoRealmNode->getRealm()->getId() : null + $autoRealmNode->getRealm()->getId() ))); } } @@ -90,7 +81,7 @@ private function applyRootRealmNodes(Node $node): void $this->logger->info('Apply new root RealmNode information'); $this->bus->dispatch(new Envelope(new ApplyRealmNodeInheritanceMessage( $rootRealmNode->getNode()->getId(), - null !== $rootRealmNode->getRealm() ? $rootRealmNode->getRealm()->getId() : null + $rootRealmNode->getRealm()->getId() ))); } } diff --git a/src/Message/Handler/UpdateDoctrineSchemaMessageHandler.php b/src/Message/Handler/UpdateDoctrineSchemaMessageHandler.php index e9c384f5..e9fc413d 100644 --- a/src/Message/Handler/UpdateDoctrineSchemaMessageHandler.php +++ b/src/Message/Handler/UpdateDoctrineSchemaMessageHandler.php @@ -10,11 +10,8 @@ final class UpdateDoctrineSchemaMessageHandler implements MessageHandlerInterface { - private SchemaUpdater $schemaUpdater; - - public function __construct(SchemaUpdater $schemaUpdater) + public function __construct(private readonly SchemaUpdater $schemaUpdater) { - $this->schemaUpdater = $schemaUpdater; } /** diff --git a/src/Message/Handler/UpdateNodeTypeSchemaMessageHandler.php b/src/Message/Handler/UpdateNodeTypeSchemaMessageHandler.php index 6a0185ec..a14b07d1 100644 --- a/src/Message/Handler/UpdateNodeTypeSchemaMessageHandler.php +++ b/src/Message/Handler/UpdateNodeTypeSchemaMessageHandler.php @@ -17,15 +17,11 @@ final class UpdateNodeTypeSchemaMessageHandler implements MessageHandlerInterface { - private ManagerRegistry $managerRegistry; - private HandlerFactoryInterface $handlerFactory; - private MessageBusInterface $messageBus; - - public function __construct(ManagerRegistry $managerRegistry, HandlerFactoryInterface $handlerFactory, MessageBusInterface $messageBus) - { - $this->managerRegistry = $managerRegistry; - $this->handlerFactory = $handlerFactory; - $this->messageBus = $messageBus; + public function __construct( + private readonly ManagerRegistry $managerRegistry, + private readonly HandlerFactoryInterface $handlerFactory, + private readonly MessageBusInterface $messageBus + ) { } public function __invoke(UpdateNodeTypeSchemaMessage $message): void