Merge branch '5.0' of github.com:darkwebdesign/symfony-addon-pack into ISSUE-190

Author: raymondschouten

.gitignore

@@ -1,2 +1,3 @@
+/.phpunit.result.cache
 /composer.lock
 /vendor/

composer.json

@@ -15,7 +15,7 @@
         "symfony/form": "5.0.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^8.5"
     },
     "suggest": {
         "darkwebdesign/symfony-addon-pack": "All Symfony add-ons bundled together"

tests/EntityTypeTest.php

@@ -27,6 +27,7 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 
@@ -157,12 +158,11 @@ public function testEntityManagerString()
         $this->assertSame($this->entity, $form->getData());
     }
 
-    /**
-     * @expectedException \Symfony\Component\Form\Exception\RuntimeException
-     * @expectedExceptionMessage Class "DarkWebDesign\SymfonyAddonFormTypes\Tests\Models\City" seems not to be a managed Doctrine entity. Did you forget to map it?
-     */
     public function testNoEntityManager()
     {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Class "DarkWebDesign\SymfonyAddonFormTypes\Tests\Models\City" seems not to be a managed Doctrine entity. Did you forget to map it?');
+
         $this->registry->method('getManager')->willReturn(null);
         $this->registry->method('getManagerForClass')->willReturn(null);