Upgrade to PHPUnit 8/9

Author: curry684

composer.json

@@ -37,7 +37,7 @@
         "doctrine/persistence": "^1.3.4",
         "friendsofphp/php-cs-fixer": "^2.7",
         "mongodb/mongodb": "^1.2",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^8.5|^9.0",
         "ruflin/elastica": "^6.0|^7.0",
         "symfony/browser-kit": "^4.1|^5.0",
         "symfony/css-selector": "^4.1|^5.0",

tests/Functional/FunctionalTest.php

@@ -41,8 +41,8 @@ public function testFrontend()
         $this->assertSuccessful($response = $this->client->getResponse());
 
         $content = $response->getContent();
-        $this->assertContains('"name":"dt"', $content);
-        $this->assertContains('(filtered from _MAX_ total entries)', $content);
+        $this->assertStringContainsString('"name":"dt"', $content);
+        $this->assertStringContainsString('(filtered from _MAX_ total entries)', $content);
         $json = $this->callDataTableUrl('/?_dt=noCDN&_init=true');
         $this->assertEmpty($json->data);
     }
@@ -56,7 +56,7 @@ public function testPlainDataTable()
         $this->assertSame(125, $json->recordsFiltered);
         $this->assertCount(50, $json->data);
 
-        $this->assertContains('<table id="persons"', $json->template);
+        $this->assertStringContainsString('<table id="persons"', $json->template);
         $this->assertNotEmpty($json->options);
 
         $sample = $json->data[5];
@@ -133,9 +133,9 @@ public function testTranslation(string $locale, string $languageProcessing, stri
         $this->assertSuccessful($response = $this->client->getResponse());
 
         $content = $response->getContent();
-        $this->assertNotContains('"options":{"language":{"url"', $content);
-        $this->assertContains(sprintf('"processing":"%s"', $languageProcessing), $content);
-        $this->assertContains(sprintf('"infoFiltered":"%s"', $languageInfoFiltered), $content);
+        $this->assertStringNotContainsString('"options":{"language":{"url"', $content);
+        $this->assertStringContainsString(sprintf('"processing":"%s"', $languageProcessing), $content);
+        $this->assertStringContainsString(sprintf('"infoFiltered":"%s"', $languageInfoFiltered), $content);
     }
 
     public function translationProvider(): array
@@ -152,7 +152,7 @@ private function callDataTableUrl(string $url)
         $this->client->enableProfiler();
         $this->client->request('GET', $url);
         $this->assertSuccessful($response = $this->client->getResponse());
-        $this->assertContains('application/json', $response->headers->get('Content-type'));
+        $this->assertStringContainsString('application/json', $response->headers->get('Content-type'));
 
         return json_decode($response->getContent());
     }

tests/Unit/Adapter/DoctrineTest.php

@@ -20,6 +20,7 @@
 use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
 use Omines\DataTablesBundle\Column\TextColumn;
 use Omines\DataTablesBundle\DataTable;
+use Omines\DataTablesBundle\Exception\InvalidConfigurationException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
@@ -58,34 +59,29 @@ public function testSearchCriteriaProvider()
         $this->assertTrue(true);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage doctrine/doctrine-bundle
-     */
     public function testORMAdapterRequiresDependency()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('doctrine/doctrine-bundle');
         (new ORMAdapter());
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Provider must be a callable or implement QueryBuilderProcessorInterface
-     */
     public function testInvalidQueryProcessorThrows()
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Provider must be a callable or implement QueryBuilderProcessorInterface');
         (new ORMAdapter($this->createMock(ManagerRegistry::class)))
             ->configure([
                 'entity' => 'bar',
                 'query' => ['foo'],
             ]);
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Field name 'invalid' must consist at least of an alias and a field
-     */
     public function testInvalidFieldThrows()
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage("Field name 'invalid' must consist at least of an alias and a field");
+
         $query = $this->createMock(AdapterQuery::class);
         $query->method('get')->willReturn([]);
         $column = new TextColumn();

tests/Unit/Adapter/ORMAdapterTest.php

@@ -12,6 +12,7 @@
 
 namespace Tests\Unit\Adapter;
 
+use Doctrine\ORM\Query\QueryException;
 use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
 use Omines\DataTablesBundle\DataTableFactory;
 use Omines\DataTablesBundle\DataTableState;
@@ -29,12 +30,11 @@ protected function setUp(): void
         $this->factory = $kernel->getContainer()->get(DataTableFactory::class);
     }
 
-    /**
-     * @expectedException \Doctrine\ORM\Query\QueryException
-     * @expectedExceptionMessage Iterate with fetch join in class Tests\Fixtures\AppBundle\Entity\Employee using association company not allowed.
-     */
     public function testCountGroupedDataTable()
     {
+        $this->expectException(QueryException::class);
+        $this->expectExceptionMessage('Iterate with fetch join in class Tests\Fixtures\AppBundle\Entity\Employee using association company not allowed.');
+
         $datatable = $this->factory->createFromType(GroupedTableType::class);
         /** @var ORMAdapter $adapter */
         $adapter = $datatable->getAdapter();

tests/Unit/AdapterTest.php

@@ -14,6 +14,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
+use Omines\DataTablesBundle\Exception\InvalidConfigurationException;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
@@ -23,12 +24,11 @@
  */
 class AdapterTest extends KernelTestCase
 {
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Doctrine has no manager for entity "foobar"
-     */
     public function testInvalidEntity()
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Doctrine has no manager for entity "foobar"');
+
         /** @var Registry $registryMock */
         $registryMock = $this->createMock(Registry::class);
         $adapter = new ORMAdapter($registryMock);

tests/Unit/ColumnTest.php

@@ -19,6 +19,7 @@
 use Omines\DataTablesBundle\Column\TextColumn;
 use Omines\DataTablesBundle\Column\TwigColumn;
 use Omines\DataTablesBundle\DataTable;
+use Omines\DataTablesBundle\Exception\MissingDependencyException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
@@ -132,12 +133,11 @@ public function testColumnWithClosures()
         $this->assertSame('BAR', $column->transform(null));
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\MissingDependencyException
-     * @expectedExceptionMessage You must have TwigBundle installed to use
-     */
     public function testTwigDependencyDetection()
     {
+        $this->expectException(MissingDependencyException::class);
+        $this->expectExceptionMessage('You must have TwigBundle installed to use');
+
         new TwigColumn();
     }
 }

tests/Unit/DataTableTest.php

@@ -20,12 +20,16 @@
 use Omines\DataTablesBundle\DataTablesBundle;
 use Omines\DataTablesBundle\DependencyInjection\DataTablesExtension;
 use Omines\DataTablesBundle\DependencyInjection\Instantiator;
+use Omines\DataTablesBundle\Exception\InvalidArgumentException;
+use Omines\DataTablesBundle\Exception\InvalidConfigurationException;
+use Omines\DataTablesBundle\Exception\InvalidStateException;
 use Omines\DataTablesBundle\Twig\TwigRenderer;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
 use Tests\Fixtures\AppBundle\DataTable\Type\RegularPersonTableType;
 
 /**
@@ -103,12 +107,11 @@ public function testPostMethod()
         $this->assertSame(684, $datatable->getState()->getDraw());
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Could not resolve type
-     */
     public function testFactoryFailsOnInvalidType()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Could not resolve type');
+
         $dummy = new ServiceLocator([]);
         $container = new ContainerBuilder();
         (new DataTablesExtension())->load([], $container);
@@ -117,66 +120,58 @@ public function testFactoryFailsOnInvalidType()
         $factory->createFromType('foobar');
     }
 
-    /**
-     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
-     */
     public function testInvalidOption()
     {
+        $this->expectException(UndefinedOptionsException::class);
+
         $this->createMockDataTable(['option' => 'bar']);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testDataTableInvalidColumn()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->createMockDataTable()->getColumn(5);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testDataTableInvalidColumnByName()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->createMockDataTable()->getColumnByName('foo');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage There already is a column with name
-     */
     public function testDuplicateColumnNameThrows()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('There already is a column with name');
+
         $this->createMockDataTable()
             ->add('foo', TextColumn::class)
             ->add('foo', TextColumn::class)
         ;
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Could not resolve type "foo\bar" to a service or class, are you missing a use statement? Or is it implemented but does it not correctly derive from "Omines\DataTablesBundle\Adapter\AdapterInterface"?
-     */
     public function testInvalidAdapterThrows()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Could not resolve type "foo\\bar" to a service or class, are you missing a use statement? Or is it implemented but does it not correctly derive from "Omines\\DataTablesBundle\\Adapter\\AdapterInterface"?');
+
         $this->createMockDataTable()->createAdapter('foo\bar');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Could not resolve type "bar" to a service or class, are you missing a use statement? Or is it implemented but does it not correctly derive from "Omines\DataTablesBundle\Column\AbstractColumn"?
-     */
     public function testInvalidColumnThrows()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Could not resolve type "bar" to a service or class, are you missing a use statement? Or is it implemented but does it not correctly derive from "Omines\\DataTablesBundle\\Column\\AbstractColumn"?');
+
         $this->createMockDataTable()->add('foo', 'bar');
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidStateException
-     * @expectedExceptionMessage No adapter was configured yet to retrieve data with
-     */
     public function testMissingAdapterThrows()
     {
+        $this->expectException(InvalidStateException::class);
+        $this->expectExceptionMessage('No adapter was configured yet to retrieve data with');
         $datatable = $this->createMockDataTable();
         $datatable
             ->setMethod(Request::METHOD_GET)
@@ -185,41 +180,37 @@ public function testMissingAdapterThrows()
         ;
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidArgumentException
-     * @expectedExceptionMessage DataTable name cannot be empty
-     */
     public function testEmptyNameThrows()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('DataTable name cannot be empty');
+
         $this->createMockDataTable()->setName('');
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Unknown request method 'OPTIONS'
-     */
     public function testStateWillNotProcessInvalidMethod()
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage("Unknown request method 'OPTIONS'");
+
         $datatable = $this->createMockDataTable();
         $datatable->setMethod(Request::METHOD_OPTIONS);
         $datatable->handleRequest(Request::create('/foo'));
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidStateException
-     * @expectedExceptionMessage The DataTable does not know its state yet
-     */
     public function testMissingStateThrows()
     {
+        $this->expectException(InvalidStateException::class);
+        $this->expectExceptionMessage('The DataTable does not know its state yet');
+
         $this->createMockDataTable()->getResponse();
     }
 
-    /**
-     * @expectedException \Omines\DataTablesBundle\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Could not resolve type "foo" to a service or class
-     */
     public function testInvalidDataTableTypeThrows()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Could not resolve type "foo" to a service or class');
+
         (new DataTableFactory([], $this->createMock(DataTableRendererInterface::class), new Instantiator(), $this->createMock(EventDispatcher::class)))
             ->createFromType('foo');
     }

tests/Unit/TwigTest.php

@@ -12,11 +12,12 @@
 
 namespace Tests\Unit;
 
+use Omines\DataTablesBundle\Exception\MissingDependencyException;
 use Omines\DataTablesBundle\Twig\DataTablesExtension;
 use Omines\DataTablesBundle\Twig\TwigRenderer;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Translator;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * TwigTest.
@@ -34,12 +35,11 @@ public function testExtensionName()
         $this->assertSame('DataTablesBundle', $twig->getName());
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage You must have symfony/twig-bundle installed
-     */
     public function testMissingTwigBundleThrows()
     {
+        $this->expectException(MissingDependencyException::class);
+        $this->expectExceptionMessage('You must have symfony/twig-bundle installed');
+
         new TwigRenderer();
     }
 }