Fix the builds (#488)

- use `pcov` instead of `phpdbg`
- bump minimum PHP version required from 7.1 to 7.2
- upgrade to PHPUnit 8
- bump a few dependencies to make it work with lowest dependencies

Author: juntereiner

.gitignore

@@ -4,3 +4,5 @@
 /.php_cs.cache
 /phpunit.xml
 /vendor/
+/var/
+.phpunit.result.cache

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - '7.1'
   - '7.2'
   - nightly
 
@@ -47,8 +46,8 @@ before_install:
   - if [ "$SYMFONY_REQUIRE" != "" ]; then composer global require --no-scripts symfony/flex; fi
   - |
     if [ -n "$COVERAGE" ]; then
+      pecl install pcov;
       PHPUNIT_FLAGS="$PHPUNIT_FLAGS --testdox --coverage-text"
-      PHPUNIT_BIN="phpdbg -qrr $PHPUNIT_BIN"
 
       if [ ! -e $OCULAR_BIN ]; then
           wget https://scrutinizer-ci.com/ocular.phar -O $OCULAR_BIN

composer.json

@@ -31,20 +31,20 @@
     },
 
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "doctrine/doctrine-bundle": "^1.8",
         "doctrine/data-fixtures": "^1.2",
         "doctrine/orm": "^2.5.11",
         "psr/log": "^1.0",
         "symfony/finder": "^3.4 || ^4.0",
-        "symfony/framework-bundle": "^3.4 || ^4.0",
+        "symfony/framework-bundle": "^3.4.24 || ^4.0",
         "theofidry/alice-data-fixtures": "^1.0"
     },
     "require-dev": {
         "doctrine/persistence": "^1.0",
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^8.5",
         "phpspec/prophecy": "^1.7",
-        "symfony/phpunit-bridge": "^3.4 || ^4.0"
+        "symfony/phpunit-bridge": "^3.4.31 || ^4.0"
     },
 
     "extra": {

tests/Alice/Generator/Instantiator/Chainable/InstantiatedReferenceInstantiatorTest.php

@@ -93,12 +93,11 @@ public function testCanInstantiateFixtureWitAServiceReferenceFactory()
         $this->assertTrue($instantiator->canInstantiate($fixture));
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected instantiator method "Hautelook\AliceBundle\Alice\Generator\Instantiator\Chainable\InstantiatedReferenceInstantiator::instantiate" to be used only if it has a container, but no container could be found.
-     */
     public function testThrowsAnExceptionIfNoContainerIsSetWhilstTryingToInstantiateObject()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected instantiator method "Hautelook\AliceBundle\Alice\Generator\Instantiator\Chainable\InstantiatedReferenceInstantiator::instantiate" to be used only if it has a container, but no container could be found.');
+
         $fixture = new SimpleFixture(
             'dummy',
             City::class,
@@ -156,12 +155,11 @@ public function testInstantiatesObjectWithFactoryAndArguments()
         $this->assertEquals($expected, $actual);
     }
 
-    /**
-     * @expectedException \Nelmio\Alice\Throwable\Exception\Generator\Instantiator\InstantiationException
-     * @expectedExceptionMessage Instantiated fixture was expected to be an instance of "Dummy". Got "Hautelook\AliceBundle\Functional\TestBundle\Entity\City" instead.
-     */
     public function testThrowsAnExceptionIfTheInstantiatedFixtureIsNotOfTheClassExpected()
     {
+        $this->expectException(\Nelmio\Alice\Throwable\Exception\Generator\Instantiator\InstantiationException::class);
+        $this->expectExceptionMessage('Instantiated fixture was expected to be an instance of "Dummy". Got "Hautelook\AliceBundle\Functional\TestBundle\Entity\City" instead.');
+
         $fixture = new SimpleFixture(
             'dummy',
             'Dummy',

tests/Console/Command/Doctrine/LoadDataFixturesCommandIntegrationTest.php

@@ -51,7 +51,7 @@ class LoadDataFixturesCommandIntegrationTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         if (false === class_exists(DoctrineBundle::class, true)) {
             $this->markTestSkipped('DoctrineBundle is not installed.');
@@ -90,7 +90,7 @@ protected function setUp()
     /**
      * {@inheritdoc}
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->kernel->shutdown();
     }
@@ -143,12 +143,12 @@ public function testAppendFixtures()
 
     /**
      * @dataProvider loadCommandProvider
-     *
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp /^Doctrine (fixtures|ORM) Manager named "foo" does not exist\.$/
      */
     public function testFixturesRegisteringUsingInvalidManager(array $inputs, string $expected)
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/^Doctrine (fixtures|ORM) Manager named "foo" does not exist\.$/');
+
         $command = $this->application->find('hautelook:fixtures:load');
         $commandTester = new CommandTester($command);
         $commandTester->execute(

tests/Console/Command/Doctrine/LoadDataFixturesCommandTest.php

@@ -54,12 +54,11 @@ public function testCanResetTheCommandApplication()
         $this->assertTrue(true);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Expected application to be an instance of "Symfony\Bundle\FrameworkBundle\Console\Application".
-     */
     public function testThrowsAnExceptionIfInvalidApplicationIsGiven()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected application to be an instance of "Symfony\Bundle\FrameworkBundle\Console\Application".');
+
         $command = new DoctrineOrmLoadDataFixturesCommand('dummy', new FakeDoctrineManagerRegistry(), new FakeLoader());
         $command->setApplication(new ConsoleApplication());
     }

tests/DependencyInjection/HautelookAliceBundleTest.php

@@ -34,29 +34,27 @@ class HautelookAliceBundleTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         if (null !== $this->kernel) {
             $this->kernel->shutdown();
         }
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage To register "Hautelook\AliceBundle\HautelookAliceBundle", you also need: "Doctrine\Bundle\DoctrineBundle\DoctrineBundle", "Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle".
-     */
     public function testCannotBootIfFidryAliceDataFixturesBundleIsNotRegistered()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('To register "Hautelook\AliceBundle\HautelookAliceBundle", you also need: "Doctrine\Bundle\DoctrineBundle\DoctrineBundle", "Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle".');
+
         $this->kernel = new ConfigurableKernel('ConfigurableKernel0', true);
         $this->kernel->boot();
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage To register "Hautelook\AliceBundle\HautelookAliceBundle", you also need: "Doctrine\Bundle\DoctrineBundle\DoctrineBundle".
-     */
     public function testWillReplaceFixtureLoadCommandWithErrorInformationCommandIfDoctrineBundleIsNotRegistered()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('To register "Hautelook\AliceBundle\HautelookAliceBundle", you also need: "Doctrine\Bundle\DoctrineBundle\DoctrineBundle".');
+
         $this->kernel = new WithoutDoctrineKernel('ConfigurableKernel1', true);
         $this->kernel->addBundle(new FidryAliceDataFixturesBundle());
         $this->kernel->addBundle(new NelmioAliceBundle());

tests/Loader/DoctrineOrmLoaderTest.php

@@ -40,12 +40,11 @@ public function testIsNotClonable()
         $this->assertFalse((new ReflectionClass(DoctrineOrmLoader::class))->isCloneable());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Expected loader to be an instance of "Fidry\AliceDataFixtures\Persistence\PersisterAwareInterface".
-     */
     public function testDataFixtureLoaderMustBePersisterAware()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected loader to be an instance of "Fidry\AliceDataFixtures\Persistence\PersisterAwareInterface".');
+
         new DoctrineOrmLoader(new FakeBundleResolver(), new FakeFixtureLocator(), new FakeLoader(), new FakeLoader(), new FakeLogger());
     }
 }

tests/Locator/EnvDirectoryLocatorTest.php

@@ -43,7 +43,7 @@ public function testGetFilesFromABundle(array $bundles, string $environment, arr
         $locator = new EnvDirectoryLocator($paths, [$invalidPath]);
         $actual = $locator->locateFiles($bundles, $environment);
 
-        $this->assertEquals($expected, $actual, '', 0.0, 10, true);
+        $this->assertEqualsCanonicalizing($expected, $actual);
     }
 
     public function provideSets()
@@ -106,7 +106,7 @@ public function provideSets()
             [],
         ];
 
-        yield 'bundle with fixture files' => [
+        yield 'bundle with fixture files 2' => [
             [new DummyBundle()],
             '',
             ['Resources/fixtures/test'],
@@ -149,7 +149,7 @@ public function testGetFilesFromSeveralBundles(
         $locator = new EnvDirectoryLocator($paths, [$invalidPath]);
         $actual = $locator->locateFiles($bundles, $environment);
 
-        $this->assertEquals($expected, $actual, '', 0.0, 10, true);
+        $this->assertEqualsCanonicalizing($expected, $actual);
     }
 
     public function provideSetsForSeveralBundles()

tests/Resolver/Bundle/SimpleBundleResolverTest.php

@@ -50,12 +50,11 @@ public function testCanResolveBundles()
         $kernel->shutdown();
     }
 
-    /**
-     * @expectedException \Hautelook\AliceBundle\Exception\Resolver\BundleNotFoundException
-     * @expectedExceptionMessage The bundle "UnknownBundle" was not found. Bundles available are: ["ABundle", "BBundle"].
-     */
     public function testThrowsAnExceptionWhenBundleCoudlNotBeFound()
     {
+        $this->expectException(\Hautelook\AliceBundle\Exception\Resolver\BundleNotFoundException::class);
+        $this->expectExceptionMessage('The bundle "UnknownBundle" was not found. Bundles available are: ["ABundle", "BBundle"].');
+
         $kernel = new ResolverKernel(__FUNCTION__, true);
         $application = new Application($kernel);
         $kernel->boot();

tests/Resolver/File/KernelFileResolverTest.php

@@ -31,7 +31,7 @@ class KernelFileResolverTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         if (null !== $this->kernel) {
             $this->kernel->shutdown();
@@ -60,31 +60,28 @@ public function testReturnResolvedFiles()
         $this->assertSame($expected, $actual);
     }
 
-    /**
-     * @expectedException \TypeError
-     */
     public function testThrowsAnErrorIfOneOfTheFilePathGivenIsNotAString()
     {
+        $this->expectException(\TypeError::class);
+
         $resolver = new KernelFileResolver(new DummyKernel());
         $resolver->resolve([true]);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The file "unknown" was not found.
-     */
     public function testThrowsAnExceptionIfFileDoesNotExist()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The file "unknown" was not found.');
+
         $resolver = new KernelFileResolver(new DummyKernel());
         $resolver->resolve(['unknown']);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp /^Expected "\/.*?\/tests\/Resolver\/File" to be a fixture file, got a directory instead\.$/
-     */
     public function testThrowsAnExceptionIfFileIsADirectory()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/^Expected "\/.*?\/tests\/Resolver\/File" to be a fixture file, got a directory instead\.$/');
+
         $resolver = new KernelFileResolver(new DummyKernel());
         $resolver->resolve([__DIR__]);
     }
@@ -110,11 +107,10 @@ public function testResolveFileWithTheKernelIfPossible()
         $this->assertSame($expected, $actual);
     }
 
-    /**
-     * @expectedException \TypeError
-     */
     public function testThrowsAnErrorIfTheFileResolvedByTheKernelIsNotAString()
     {
+        $this->expectException(\TypeError::class);
+
         $files = [
             '@SimpleBundle/files/foo.yml',
         ];
@@ -127,11 +123,10 @@ public function testThrowsAnErrorIfTheFileResolvedByTheKernelIsNotAString()
         $resolver->resolve($files);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testThrowsAnExceptionIfFileResolvedByTheKernelDoesNotExist()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $files = [
             '@SimpleBundle/dummy.yml',
         ];
@@ -143,12 +138,11 @@ public function testThrowsAnExceptionIfFileResolvedByTheKernelDoesNotExist()
         $resolver->resolve($files);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Expected "@SimpleBundle/files" to be a fixture file, got a directory instead.
-     */
     public function testThrowsAnExceptionIfFileResolvedByTheKernelIsADirectory()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected "@SimpleBundle/files" to be a fixture file, got a directory instead.');
+
         $files = [
             '@SimpleBundle/files',
         ];