Test case-bundle and PHPUnit 8 compat

jdewit · Jul 17, 2019 · 65a9f29 · 65a9f29
1 parent b8b9604
commit 65a9f29
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 25 deletions.
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -16,7 +16,7 @@
  */
 class ConfigurationTest extends TestCase
 {
-    public function testGetConfigTreeBuilder()
+    public function testGetConfigTreeBuilder(): void
     {
         $config = new Configuration();
         $this->assertInstanceOf(TreeBuilder::class, $config->getConfigTreeBuilder());

diff --git a/Tests/Doctrine/ImporterTest.php b/Tests/Doctrine/ImporterTest.php
@@ -27,7 +27,7 @@ class ImporterTest extends TestCase
     /**
      * Setup test class.
      */
-    public function setUp()
+    public function setUp(): void
     {
         $caseConverter = $this->createMock(CaseConverter::class);
         $caseConverter
@@ -51,7 +51,7 @@ public function setUp()
     /**
      * Test getHeaders.
      */
-    public function testGetHeaders()
+    public function testGetHeaders(): void
     {
         $this->importer->init(__DIR__.'/../import.csv', $this->class);
         $this->assertEquals(
@@ -67,7 +67,7 @@ public function testGetHeaders()
     /**
      * Test getHeaders.
      */
-    public function testGetFormHeaders()
+    public function testGetFormHeaders(): void
     {
         $this->importer->init(__DIR__.'/../import.csv', $this->class, ',', 'form');
         $this->assertEquals(

diff --git a/Tests/Export/Doctrine/ORM/ExporterTest.php b/Tests/Export/Doctrine/ORM/ExporterTest.php
@@ -24,7 +24,7 @@ class ExporterTest extends TestCase
      */
     protected $exporter;
 
-    public function setUp()
+    public function setUp(): void
     {
         $query = $this->getMockForAbstractClass(AbstractQuery::class, [], '', false, true, true, ['iterate', 'HYDRATE_ARRAY', 'getSQL', '_doExecute']);
         $query
@@ -60,7 +60,7 @@ public function setUp()
     /**
      * Test init.
      */
-    public function testInit()
+    public function testInit(): void
     {
         $this->exporter->init(TestEntity::class);
         $this->assertInstanceOf(QueryBuilder::class, $this->exporter->getQueryBuilder());
@@ -69,7 +69,7 @@ public function testInit()
     /**
      * Test convert row.
      */
-    public function testArrayToCsv()
+    public function testArrayToCsv(): void
     {
         $this->assertEquals(
             '"val\'1","val,2","val""3"'."\n",
@@ -80,7 +80,7 @@ public function testArrayToCsv()
     /**
      * Test convert row.
      */
-    public function testGetContent()
+    public function testGetContent(): void
     {
         $expected = '"row 1","row 2","row 3"';
         $expected .= "\n";

diff --git a/Tests/Import/ImporterTest.php b/Tests/Import/ImporterTest.php
@@ -33,7 +33,7 @@ class ImporterTest extends TestCase
     /**
      * Setup test class.
      */
-    public function setUp()
+    public function setUp(): void
     {
         $fields = ['id', 'field1', 'field2'];
         $assocs = ['assoc'];
@@ -88,7 +88,7 @@ static function ($value) use ($assocs) {
     /**
      * Test import.
      */
-    public function testImport()
+    public function testImport(): void
     {
         $this->importer->import($this->fields);
         $this->assertEquals(

diff --git a/Tests/TestEntity.php b/Tests/TestEntity.php
@@ -24,7 +24,7 @@ public function getId()
         return $this->id;
     }
 
-    public function setId($id)
+    public function setId($id): void
     {
         $this->id = $id;
     }
@@ -34,7 +34,7 @@ public function getField1()
         return $this->field1;
     }
 
-    public function setField1($field1)
+    public function setField1($field1): void
     {
         $this->field1 = $field1;
     }
@@ -44,7 +44,7 @@ public function getField2()
         return $this->field2;
     }
 
-    public function setField2($field2)
+    public function setField2($field2): void
     {
         $this->field2 = $field2;
     }

diff --git a/Tests/Util/FieldRetrieverTest.php b/Tests/Util/FieldRetrieverTest.php
@@ -11,6 +11,7 @@
 use Avro\CsvBundle\Tests\TestEntity;
 use Avro\CsvBundle\Util\FieldRetriever;
 use Doctrine\Common\Annotations\AnnotationReader;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class FieldRetrieverTest extends TestCase
@@ -24,11 +25,11 @@ class FieldRetrieverTest extends TestCase
      */
     protected $class;
     /**
-     * @var CaseConverter|\PHPUnit_Framework_MockObject_MockObject
+     * @var CaseConverter|MockObject
      */
     private $caseConverter;
 
-    public function setUp()
+    public function setUp(): void
     {
         $annotationReader = new AnnotationReader();
         $this->caseConverter = $this->createMock(CaseConverter::class);
@@ -54,7 +55,7 @@ public function setUp()
         $this->class = TestEntity::class;
     }
 
-    public function testGetFields()
+    public function testGetFields(): void
     {
         $this->assertEquals(
             $this->fieldRetriever->getFields($this->class),
@@ -69,7 +70,7 @@ public function testGetFields()
         );
     }
 
-    public function testGetFieldsAsCamelCase()
+    public function testGetFieldsAsCamelCase(): void
     {
         $this->assertEquals(
             $this->fieldRetriever->getFields($this->class, 'camel'),
@@ -84,7 +85,7 @@ public function testGetFieldsAsCamelCase()
         );
     }
 
-    public function testGetFieldsAndCopyKeys()
+    public function testGetFieldsAndCopyKeys(): void
     {
         $this->assertEquals(
             $this->fieldRetriever->getFields($this->class, 'camel', true),

diff --git a/Tests/Util/ReaderTest.php b/Tests/Util/ReaderTest.php
@@ -17,13 +17,13 @@ class ReaderTest extends TestCase
      */
     protected $reader;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->reader = new Reader();
         $this->reader->open(__DIR__.'/../import.csv');
     }
 
-    public function testGetHeaders()
+    public function testGetHeaders(): void
     {
         $this->assertEquals(
             [
@@ -35,7 +35,7 @@ public function testGetHeaders()
         );
     }
 
-    public function testGetRow()
+    public function testGetRow(): void
     {
         $this->assertEquals(
             [
@@ -63,7 +63,7 @@ public function testGetRow()
         );
     }
 
-    public function testGetRows()
+    public function testGetRows(): void
     {
         $this->assertEquals(
             [
@@ -82,8 +82,8 @@ public function testGetRows()
         );
     }
 
-    public function testGetAll()
+    public function testGetAll(): void
     {
-        $this->assertEquals(3, count($this->reader->getAll()));
+        $this->assertCount(3, $this->reader->getAll());
     }
 }
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "require": {
         "php": "^7.2.0",
         "ext-json": "*",
-        "avro/case-bundle": "*"
+        "misatotremor/case-bundle": "^0.4.1"
     },
     "require-dev": {
         "twig/twig": "*",