From f8be49baba0c388737996a8d4489a61c5c07c8b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 29 Feb 2024 14:50:22 +0100 Subject: [PATCH] Php 8.x constructor style Fix namespace Cleanup --- Command.php | 56 ++++------------------------------------------------- 1 file changed, 4 insertions(+), 52 deletions(-) diff --git a/Command.php b/Command.php index 6f4a8ee..178648c 100644 --- a/Command.php +++ b/Command.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Rapsys\AirBundle\Command; +namespace Rapsys\AirBundle; use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\Console\Command\Command as BaseCommand; @@ -21,41 +21,6 @@ use Rapsys\AirBundle\RapsysAirBundle; use Rapsys\PackBundle\Util\SluggerUtil; class Command extends BaseCommand { - /** - * Doctrine instance - * - * @var ManagerRegistry - */ - protected ManagerRegistry $doctrine; - - /** - * Router instance - * - * @var RouterInterface - */ - protected RouterInterface $router; - - /** - * Slugger instance - * - * @var SluggerUtil - */ - protected SluggerUtil $slugger; - - /** - * Translator instance - * - * @var TranslatorInterface - */ - protected TranslatorInterface $translator; - - /** - * Locale - * - * @var string - */ - protected string $locale; - /** * Creates new command * @@ -65,34 +30,21 @@ class Command extends BaseCommand { * @param TranslatorInterface $translator The translator instance * @param string $locale The default locale */ - public function __construct(ManagerRegistry $doctrine, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator, string $locale) { + public function __construct(protected ManagerRegistry $doctrine, protected RouterInterface $router, protected SluggerUtil $slugger, protected TranslatorInterface $translator, protected string $locale) { //Call parent constructor parent::__construct(); - //Set doctrine - $this->doctrine = $doctrine; - - //Set router - $this->router = $router; - - //Set slugger - $this->slugger = $slugger; - //Get router context $context = $this->router->getContext(); //Set host + //TODO: set it in env RAPSYSAIR_HOST ? $context->setHost('airlibre.eu'); //Set scheme + //TODO: set it in env RAPSYSAIR_SCHEME ? $context->setScheme('https'); - //Set the translator - $this->translator = $translator; - - //Set locale - $this->locale = $locale; - //With default name //TODO: XXX: see how to make it works /*if (isset(self::$defaultName)) { -- 2.41.1