Merge branch '3.2'

* 3.2:
  Remove calls to deprecated method where possible
  Don't pass wrong object to legacy constructors
  Add test to instantiate Loader with ManagerRegistry
  removed workaround for Composer issue with --prefer-lowest

.travis.yml

@@ -39,8 +39,6 @@ before_install:
     - if [[ $DEPENDENCIES == *"/"* ]]; then composer require --no-update $DEPENDENCIES; fi;
 
 install:
-    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
     - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
 
 script:

Command/LoadDataFixturesDoctrineCommand.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use const E_USER_DEPRECATED;
 use function implode;
+use function method_exists;
 use function sprintf;
 use function trigger_error;
 
@@ -38,7 +39,8 @@ public function __construct(SymfonyFixturesLoader $fixturesLoader, ?ManagerRegis
             ), E_USER_DEPRECATED);
         }
 
-        parent::__construct($doctrine);
+        // @todo The method_exists call can be removed once the DoctrineBundle dependency has been bumped to at least 1.10
+        parent::__construct(method_exists($this, 'getDoctrine') ? $doctrine : null);
 
         $this->fixturesLoader = $fixturesLoader;
     }
@@ -83,9 +85,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $ui = new SymfonyStyle($input, $output);
 
-        /** @var ManagerRegistry $doctrine */
-        $doctrine = $this->getContainer()->get('doctrine');
-        $em       = $doctrine->getManager($input->getOption('em'));
+        // @todo The method_exists call can be removed once the DoctrineBundle dependency has been bumped to at least 1.10
+        if (method_exists($this, 'getDotrine')) {
+            $doctrine = $this->getDoctrine();
+        } else {
+            /** @var ManagerRegistry $doctrine */
+            $doctrine = $this->getContainer()->get('doctrine');
+        }
+
+        $em = $doctrine->getManager($input->getOption('em'));
 
         if (! $input->getOption('append')) {
             if (! $ui->confirm(sprintf('Careful, database "%s" will be purged. Do you want to continue?', $em->getConnection()->getDatabase()), ! $input->isInteractive())) {

Tests/Command/LoadDataFixturesDoctrineCommandTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Bundle\FixturesBundle\Tests\Command;
+
+use Doctrine\Bundle\FixturesBundle\Command\LoadDataFixturesDoctrineCommand;
+use Doctrine\Bundle\FixturesBundle\Loader\SymfonyFixturesLoader;
+use Doctrine\Common\Persistence\ManagerRegistry;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+
+class LoadDataFixturesDoctrineCommandTest extends TestCase
+{
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Doctrine\Bundle\FixturesBundle\Command\LoadDataFixturesDoctrineCommand" constructor expects a "Doctrine\Common\Persistence\ManagerRegistry" instance as second argument, not passing it will throw a \TypeError in DoctrineFixturesBundle 4.0.
+     */
+    public function testInstantiatingWithoutManagerRegistry() : void
+    {
+        $loader = new SymfonyFixturesLoader(new Container());
+
+        new LoadDataFixturesDoctrineCommand($loader);
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testInstantiatingWithManagerRegistry() : void
+    {
+        $registry = $this->createMock(ManagerRegistry::class);
+        $loader   = new SymfonyFixturesLoader(new Container());
+
+        new LoadDataFixturesDoctrineCommand($loader, $registry);
+    }
+}

phpunit.xml.dist

@@ -17,4 +17,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
 </phpunit>