refactor: drop symfony 2.x support. (#80)

* refactor: remove symfony <=2.8 logic

* refactor: drop symfony v2

* refactor: remove symfony 2 assertion

Author: gsdevme

DependencyInjection/MarkupJobQueueExtension.php

@@ -141,8 +141,8 @@ private function configureConsoleDirectory(array $config, ContainerBuilder $cont
         if ($isUsingSymfony4OrGreater && $config['use_root_dir_for_symfony_console']) {
             throw new \Exception('The `use_root_dir_for_symfony_console` option cannot be used with Symfony 4+.');
         }
-        $isUsingSymfony2 = Kernel::MAJOR_VERSION === 2;
-        if ($isUsingSymfony2 || $config['use_root_dir_for_symfony_console']) {
+
+        if ($config['use_root_dir_for_symfony_console']) {
             $container->setParameter($parameter, $container->getParameter('kernel.root_dir'));
 
             return;

EventSubscriber/AddUuidOptionConsoleCommandEventSubscriber.php

@@ -6,7 +6,6 @@
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Adds the `uuid` option to all console commands
@@ -15,8 +14,6 @@
  */
 class AddUuidOptionConsoleCommandEventSubscriber implements EventSubscriberInterface
 {
-    use CheckUsingSymfony28Trait;
-
     /**
      * {@inheritdoc}
      */
@@ -43,23 +40,12 @@ public function onConsoleCommand(ConsoleCommandEvent $event)
             null
         );
 
-        //symfony 2.8+ has different behaviour available for adding options
-        if ($this->isUsingAtLeastSymfony28()) {
-            //for symfony 2.8 up
-            $definition = $event->getCommand()->getDefinition();
-            $definition->addOption($inputOption);
-        } else {
-            $inputDefinition = $event->getCommand()->getApplication()->getDefinition();
-            $inputDefinition->addOption($inputOption);
-        }
+        $definition = $event->getCommand()->getDefinition();
+        $definition->addOption($inputOption);
     }
 
     public function bindInput(ConsoleCommandEvent $event)
     {
-        if (!$this->isUsingAtLeastSymfony28()) {
-            return;
-        }
-
         $event->getInput()->bind($event->getCommand()->getDefinition());
     }
 }

EventSubscriber/CheckUsingSymfony28Trait.php

@@ -7,12 +7,9 @@
 use Markup\JobQueueBundle\Model\JobLog;
 use Markup\JobQueueBundle\Repository\JobLogRepository;
 use Symfony\Component\Console\ConsoleEvents;
-use Symfony\Component\Console\Event\ConsoleCommandEvent;
 use Symfony\Component\Console\Event\ConsoleEvent;
 use Symfony\Component\Console\Event\ConsoleExceptionEvent;
 use Symfony\Component\Console\Event\ConsoleTerminateEvent;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -27,8 +24,6 @@
  */
 class CompleteConsoleCommandEventSubscriber implements EventSubscriberInterface
 {
-    use CheckUsingSymfony28Trait;
-
     /**
      * @var JobLogRepository
      */
@@ -47,15 +42,11 @@ public function __construct(JobLogRepository $jobLogRepository)
      */
     public static function getSubscribedEvents()
     {
-        $consoleErrorEvent = (class_exists('Symfony\Component\Console\Event\ConsoleErrorEvent'))
-            ? ConsoleEvents::ERROR
-            : ConsoleEvents::EXCEPTION;
-
         return [
             ConsoleEvents::TERMINATE => [
                 ['onConsoleTerminate', 10]
             ],
-            $consoleErrorEvent => [
+            ConsoleEvents::ERROR => [
                 ['onConsoleError', 10]
             ],
         ];
@@ -67,15 +58,14 @@ public static function getSubscribedEvents()
      */
     public function onConsoleTerminate(ConsoleTerminateEvent $event)
     {
-        if ($this->isUsingAtLeastSymfony28()) {
-            $input = $event->getInput();
-        } else {
-            $event->getCommand()->mergeApplicationDefinition();
-            $input = new ArgvInput();
-            $input->bind($event->getCommand()->getDefinition());
+        $input = $event->getInput();
+
+        if (!$input->hasOption('uuid')) {
+            return;
         }
 
         $uuid = $input->getOption('uuid');
+
         if (!$uuid) {
             return;
         }
@@ -102,12 +92,10 @@ public function onConsoleTerminate(ConsoleTerminateEvent $event)
      */
     public function onConsoleError(ConsoleEvent $event)
     {
-        if ($this->isUsingAtLeastSymfony28()) {
-            $input = $event->getInput();
-        } else {
-            $event->getCommand()->mergeApplicationDefinition();
-            $input = new ArgvInput();
-            $input->bind($event->getCommand()->getDefinition());
+        $input = $event->getInput();
+
+        if (!$input->hasOption('uuid')) {
+            return;
         }
 
         $uuid = $input->getOption('uuid');

EventSubscriber/CompleteConsoleCommandEventSubscriber.php

@@ -17,8 +17,6 @@
  */
 class LogConsoleCommandEventSubscriber implements EventSubscriberInterface
 {
-    use CheckUsingSymfony28Trait;
-
     /**
      * @var JobLogRepository
      */
@@ -49,14 +47,10 @@ public static function getSubscribedEvents()
      */
     public function onConsoleCommand(ConsoleCommandEvent $event)
     {
+        $input = $event->getInput();
 
-        // following jiggerypokery can be removed in symfony 2.8+
-        if ($this->isUsingAtLeastSymfony28()) {
-            $input = $event->getInput();
-        } else {
-            $event->getCommand()->mergeApplicationDefinition();
-            $input = new ArgvInput();
-            $input->bind($event->getCommand()->getDefinition());
+        if (!$input->hasOption('uuid')) {
+            return;
         }
 
         $uuid = $input->getOption('uuid');

EventSubscriber/LogConsoleCommandEventSubscriber.php

@@ -15,11 +15,11 @@
         }
     ],
     "require": {
-        "symfony/framework-bundle": "^2.3|^3",
-        "symfony/finder": "^2.3|^3",
-        "symfony/yaml": "^2.3|^3",
-        "symfony/console": "^2.3|^3",
-        "symfony/process": "^2.3|^3",
+        "symfony/framework-bundle": "^3",
+        "symfony/finder": "^3",
+        "symfony/yaml": "^3",
+        "symfony/console": "^3",
+        "symfony/process": "^3",
         "twig/twig": "^1.12|^2",
         "php": ">=7.1.0",
         "mtdowling/cron-expression": "1.0.*",
@@ -32,7 +32,7 @@
     "require-dev": {
         "phpunit/phpunit": "^7.2",
         "mockery/mockery": "^1.2",
-        "symfony/form": "~2.3|^3",
+        "symfony/form": "^3",
         "predis/predis": "^1.0"
     },
     "suggest": {