Revert "minor #133 Use Command as base for console command classes (phansys)"

This reverts commit 352c083, reversing
changes made to 3cd0fbd.

Author: phansys

Command/AutoClosingCommand.php

@@ -2,64 +2,17 @@
 
 namespace Hackzilla\Bundle\TicketBundle\Command;
 
-use Doctrine\ORM\EntityManagerInterface;
-use Hackzilla\Bundle\TicketBundle\Entity\Ticket;
 use Hackzilla\Bundle\TicketBundle\Entity\TicketMessage;
-use Hackzilla\Bundle\TicketBundle\Manager\TicketManagerInterface;
-use Hackzilla\Bundle\TicketBundle\Manager\UserManagerInterface;
-use Symfony\Component\Console\Command\Command;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 
-class AutoClosingCommand extends Command
+class AutoClosingCommand extends ContainerAwareCommand
 {
     protected static $defaultName = 'ticket:autoclosing';
 
-    /**
-     * @var TicketManagerInterface
-     */
-    private $ticketManager;
-
-    /**
-     * @var UserManagerInterface
-     */
-    private $userManager;
-
-    /**
-     * @var EntityManagerInterface
-     */
-    private $entityManager;
-
-    /**
-     * @var string
-     */
-    private $locale = 'en';
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * BC: Replace 5th argument with "Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface" after bumping to "symfony/dependency-injection:^4.1".
-     */
-    public function __construct(TicketManagerInterface $ticketManager, UserManagerInterface $userManager, EntityManagerInterface $entityManager, TranslatorInterface $translator, ContainerInterface $container)
-    {
-        parent::__construct();
-
-        $this->ticketManager = $ticketManager;
-        $this->userManager = $userManager;
-        $this->entityManager = $entityManager;
-        $this->translator = $translator;
-        if ($container->hasParameter('locale')) {
-            $this->locale = $container->getParameter('locale');
-        }
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -88,26 +41,30 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $ticketRepository = $this->entityManager->getRepository(Ticket::class);
+        $ticket_manager   = $this->getContainer()->get('hackzilla_ticket.ticket_manager');
+        $userManager      = $this->getContainer()->get('fos_user.user_manager');
+        $ticketRepository = $this->getContainer()->get('doctrine')->getRepository('HackzillaTicketBundle:Ticket');
 
-        $this->translator->setLocale($this->locale);
+        $locale     = $this->getContainer()->getParameter('locale') ? $this->getContainer()->getParameter('locale') : 'en';
+        $translator = $this->getContainer()->get('translator');
+        $translator->setLocale($locale);
 
         $username = $input->getArgument('username');
 
         $resolved_tickets = $ticketRepository->getResolvedTicketOlderThan($input->getOption('age'));
 
         foreach ($resolved_tickets as $ticket) {
-            $message = $this->ticketManager->createMessage()
+            $message = $ticket_manager->createMessage()
                 ->setMessage(
-                    $this->translator->trans('MESSAGE_STATUS_CHANGED', ['%status%' => $this->translator->trans('STATUS_CLOSED')])
+                    $translator->trans('MESSAGE_STATUS_CHANGED', ['%status%' => $translator->trans('STATUS_CLOSED')])
                 )
                 ->setStatus(TicketMessage::STATUS_CLOSED)
                 ->setPriority($ticket->getPriority())
-                ->setUser($this->userManager->findUserByUsername($username))
+                ->setUser($userManager->findUserByUsername($username))
                 ->setTicket($ticket);
 
             $ticket->setStatus(TicketMessage::STATUS_CLOSED);
-            $this->ticketManager->updateTicket($ticket, $message);
+            $ticket_manager->updateTicket($ticket, $message);
 
             $output->writeln('The ticket "'.$ticket->getSubject().'" has been closed.');
         }

Command/TicketManagerCommand.php

@@ -2,40 +2,17 @@
 
 namespace Hackzilla\Bundle\TicketBundle\Command;
 
-use FOS\UserBundle\Model\UserManagerInterface;
 use Hackzilla\Bundle\TicketBundle\Entity\TicketMessage;
-use Hackzilla\Bundle\TicketBundle\Manager\TicketManagerInterface;
-use Symfony\Component\Console\Command\Command;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class TicketManagerCommand extends Command
+class TicketManagerCommand extends ContainerAwareCommand
 {
     protected static $defaultName = 'ticket:create';
 
-    /**
-     * @var TicketManagerInterface
-     */
-    private $ticketManager;
-
-    /**
-     * @var UserManagerInterface
-     */
-    private $userManager;
-
-    public function __construct(TicketManagerInterface $ticketManager, UserManagerInterface $userManager = null)
-    {
-        if (!$userManager) {
-            throw new \InvalidArgumentException(sprintf('%s requires a user manager in order to set the user for the ticket message. Is "friendsofsymfony/user-bundle" installed and enabled in your project?', self::class));
-        }
-        parent::__construct();
-
-        $this->ticketManager = $ticketManager;
-        $this->userManager = $userManager;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -69,16 +46,20 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $ticket = $this->ticketManager->createTicket()
+        $userManager = $this->getContainer()->get('fos_user.user_manager');
+
+        $ticketManager = $this->getContainer()->get('hackzilla_ticket.ticket_manager');
+
+        $ticket = $ticketManager->createTicket()
             ->setSubject($input->getArgument('subject'));
 
-        $message = $this->ticketManager->createMessage()
+        $message = $ticketManager->createMessage()
             ->setMessage($input->getArgument('message'))
             ->setStatus(TicketMessage::STATUS_OPEN)
             ->setPriority($input->getOption('priority'))
-            ->setUser($this->userManager->findUserByUsername('system'));
+            ->setUser($userManager->findUserByUsername('system'));
 
-        $this->ticketManager->updateTicket($ticket, $message);
+        $ticketManager->updateTicket($ticket, $message);
 
         $output->writeln(
             "Ticket with subject '".$ticket->getSubject()."' has been created with ticketnumber #".$ticket->getId().''

Resources/config/services.yml

@@ -14,9 +14,6 @@ services:
             - '@security.authorization_checker'
         public: true
 
-    Hackzilla\Bundle\TicketBundle\Manager\UserManagerInterface:
-        alias: hackzilla_ticket.user_manager
-
     hackzilla_ticket.user_repository:
         class: Doctrine\ORM\EntityRepository
         factory: ['@doctrine.orm.default_entity_manager', getRepository]
@@ -33,9 +30,6 @@ services:
             - [ setTranslator, ['@translator'] ]
         public: true
 
-    Hackzilla\Bundle\TicketBundle\Manager\TicketManagerInterface:
-        alias: hackzilla_ticket.ticket_manager
-
     hackzilla_ticket.form.type.ticket:
         class: Hackzilla\Bundle\TicketBundle\Form\Type\TicketType
         arguments:
@@ -79,20 +73,10 @@ services:
 
     hackzilla_ticket.command.autoclosing:
         class: Hackzilla\Bundle\TicketBundle\Command\AutoClosingCommand
-        arguments:
-            - '@hackzilla_ticket.ticket_manager'
-            - '@hackzilla_ticket.user_manager'
-            - '@doctrine.orm.entity_manager'
-            - '@translator'
-            # BC: Replace 5th argument with "@parameter_bag" after bumping "symfony/dependency-injection" to "^4.1"
-            - '@service_container'
         tags:
             - { name: console.command, command: ticket:autoclosing }
 
     hackzilla_ticket.command.create:
         class: Hackzilla\Bundle\TicketBundle\Command\TicketManagerCommand
-        arguments:
-            - '@hackzilla_ticket.ticket_manager'
-            - '@?fos_user.user_manager'
         tags:
             - { name: console.command, command: ticket:create }