Allow Symfony 5.0 (#23)

Author: theofidry

.travis.yml

@@ -7,21 +7,28 @@ cache:
         - $HOME/.composer/cache/files
 
 env:
-    matrix:
-        - COMPOSER_FLAGS='--no-interaction --no-progress --no-suggest --prefer-dist'
+    - COMPOSER_FLAGS='--no-interaction --no-progress --no-suggest --prefer-dist'
 
 matrix:
     include:
         - php: '7.2'
           env: PREFER_LOWEST='--prefer-lowest'
         - php: '7.3'
+        - php: '7.4'
+          env: SYMFONY_VERSION='~4.4.0'
+        - php: '7.4'
+          env: SYMFONY_VERSION='~5.0.0'
     fast_finish: true
 
 before_install:
     - phpenv config-rm xdebug.ini || true
     - set -eo pipefail
     - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - composer validate --strict
+    - |
+        if [ -n "$SYMFONY_VERSION" ]; then
+            composer require --no-update "symfony/console:${SYMFONY_VERSION}" "symfony/dependency-injection:${SYMFONY_VERSION}" "symfony/process:${SYMFONY_VERSION}" "symfony/framework-bundle:${SYMFONY_VERSION}";
+        fi
 
 install:
     - composer update $COMPOSER_FLAGS $PREFER_LOWEST

composer.json

@@ -15,18 +15,18 @@
     ],
 
     "require": {
-        "php": "^7.1",
-        "symfony/console": "^3.0 || ^4.0",
-        "symfony/dependency-injection": "^3.0 || ^4.1.12",
-        "symfony/process": "^3.0 || ^4.0",
+        "php": "^7.2",
+        "symfony/console": "3.0 || ^4.0 || ^5.0",
+        "symfony/dependency-injection": "^3.0 || ^4.1.12 || ^5.0",
+        "symfony/process": "^3.0 || ^4.0 || ^5.0",
         "webmozart/assert": "^1.5",
         "psr/log": "^1.1"
     },
     "require-dev": {
         "ext-json": "*",
         "friendsofphp/php-cs-fixer": "^2.15",
         "phpunit/phpunit": "^8.4",
-        "symfony/framework-bundle": "^4.1"
+        "symfony/framework-bundle": "^3.0 || ^4.1 || ^5.0"
     },
 
     "autoload": {

src/ContainerAwareCommand.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Webmozarts Console Parallelization package.
+ *
+ * (c) Webmozarts GmbH <office@webmozarts.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Webmozarts\Console\Parallelization;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Webmozart\Assert\Assert;
+
+abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
+{
+    /**
+     * @var ContainerInterface|null
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null): void
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer(): ContainerInterface
+    {
+        if (null !== $this->container) {
+            return $this->container;
+        }
+
+        $application = $this->getApplication();
+
+        Assert::notNull(
+            $application,
+            'The container cannot be retrieved as the application instance is not yet set'
+        );
+
+        return $this->container = $application->getKernel()->getContainer();
+    }
+}

src/Parallelization.php

@@ -30,6 +30,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Contracts\Service\ResetInterface;
 use Throwable;
 use function trim;
 use Webmozart\Assert\Assert;
@@ -272,15 +273,17 @@ protected function getBatchSize(): int
     /**
      * Executes the parallelized command.
      */
-    protected function execute(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('child')) {
             $this->executeChildProcess($input, $output);
 
-            return;
+            return 0;
         }
 
         $this->executeMasterProcess($input, $output);
+
+        return 0;
     }
 
     /**
@@ -505,7 +508,10 @@ private function runTolerantSingleCommand(
 
             $container = $this->getContainer();
 
-            if ($container instanceof ResettableContainerInterface) {
+            if (
+                (class_exists(ResetInterface::class) && $container instanceof ResetInterface)
+                || (class_exists(ResettableContainerInterface::class) && $container instanceof ResettableContainerInterface)
+            ) {
                 $container->reset();
             }
         }

tests/ImportMoviesCommand.php

@@ -13,7 +13,6 @@
 
 namespace Webmozarts\Console\Parallelization;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 

tests/ParallelizationIntegrationTest.php

@@ -13,7 +13,6 @@
 
 namespace Webmozarts\Console\Parallelization;
 
-use function method_exists;
 use PHPUnit\Framework\TestCase;
 use function preg_replace;
 use function str_replace;
@@ -263,6 +262,6 @@ private function getOutput(): string
 
     private function isSymfony3(): bool
     {
-        return method_exists(Application::class, 'getTerminalDimensions');
+        return Kernel::VERSION_ID < 40000;
     }
 }