Fix ObjectManager usage

.phpunit.result.cache

@@ -1 +1 @@
-C:37:"PHPUnit\Runner\DefaultTestResultCache":1154:{a:2:{s:7:"defects";a:1:{s:52:"Avro\CsvBundle\Tests\Import\ImporterTest::testImport";i:4;}s:5:"times";a:14:{s:84:"Avro\CsvBundle\Tests\DependencyInjection\ConfigurationTest::testGetConfigTreeBuilder";d:0.013;s:58:"Avro\CsvBundle\Tests\Doctrine\ImporterTest::testGetHeaders";d:0.025;s:62:"Avro\CsvBundle\Tests\Doctrine\ImporterTest::testGetFormHeaders";d:0;s:63:"Avro\CsvBundle\Tests\Export\Doctrine\ORM\ExporterTest::testInit";d:0.009;s:69:"Avro\CsvBundle\Tests\Export\Doctrine\ORM\ExporterTest::testArrayToCsv";d:0;s:69:"Avro\CsvBundle\Tests\Export\Doctrine\ORM\ExporterTest::testGetContent";d:0;s:52:"Avro\CsvBundle\Tests\Import\ImporterTest::testImport";d:0.061;s:59:"Avro\CsvBundle\Tests\Util\FieldRetrieverTest::testGetFields";d:0.022;s:70:"Avro\CsvBundle\Tests\Util\FieldRetrieverTest::testGetFieldsAsCamelCase";d:0;s:70:"Avro\CsvBundle\Tests\Util\FieldRetrieverTest::testGetFieldsAndCopyKeys";d:0;s:52:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetHeaders";d:0.001;s:48:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetRow";d:0;s:49:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetRows";d:0;s:48:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetAll";d:0;}}}
+C:37:"PHPUnit\Runner\DefaultTestResultCache":1298:{a:2:{s:7:"defects";a:3:{s:52:"Avro\CsvBundle\Tests\Import\ImporterTest::testImport";i:4;s:58:"Avro\CsvBundle\Tests\Doctrine\ImporterTest::testGetHeaders";i:4;s:62:"Avro\CsvBundle\Tests\Doctrine\ImporterTest::testGetFormHeaders";i:4;}s:5:"times";a:14:{s:84:"Avro\CsvBundle\Tests\DependencyInjection\ConfigurationTest::testGetConfigTreeBuilder";d:0.011;s:58:"Avro\CsvBundle\Tests\Doctrine\ImporterTest::testGetHeaders";d:0.016;s:62:"Avro\CsvBundle\Tests\Doctrine\ImporterTest::testGetFormHeaders";d:0;s:63:"Avro\CsvBundle\Tests\Export\Doctrine\ORM\ExporterTest::testInit";d:0.009;s:69:"Avro\CsvBundle\Tests\Export\Doctrine\ORM\ExporterTest::testArrayToCsv";d:0;s:69:"Avro\CsvBundle\Tests\Export\Doctrine\ORM\ExporterTest::testGetContent";d:0;s:52:"Avro\CsvBundle\Tests\Import\ImporterTest::testImport";d:0.015;s:59:"Avro\CsvBundle\Tests\Util\FieldRetrieverTest::testGetFields";d:0.009;s:70:"Avro\CsvBundle\Tests\Util\FieldRetrieverTest::testGetFieldsAsCamelCase";d:0;s:70:"Avro\CsvBundle\Tests\Util\FieldRetrieverTest::testGetFieldsAndCopyKeys";d:0;s:52:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetHeaders";d:0;s:48:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetRow";d:0;s:49:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetRows";d:0;s:48:"Avro\CsvBundle\Tests\Util\ReaderTest::testGetAll";d:0.001;}}}

CHANGELOG.txt

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.5.1
+-----
+
+ * Fix ObjectManager usage
+
 0.5.0
 -----
 

Import/Importer.php

@@ -13,7 +13,7 @@
 use Avro\CsvBundle\Event\RowAddedEvent;
 use Avro\CsvBundle\Event\RowErrorEvent;
 use Avro\CsvBundle\Util\Reader;
-use Doctrine\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Mapping\MappingException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -62,7 +62,7 @@ class Importer implements ImporterInterface
      */
     protected $caseConverter;
     /**
-     * @var ObjectManager
+     * @var EntityManagerInterface
      */
     protected $objectManager;
     /**
@@ -74,10 +74,10 @@ class Importer implements ImporterInterface
      * @param Reader                   $reader        The csv reader
      * @param EventDispatcherInterface $dispatcher    The event dispatcher
      * @param CaseConverter            $caseConverter The case Converter
-     * @param ObjectManager            $objectManager The Doctrine Object Manager
+     * @param EntityManagerInterface   $objectManager The Doctrine Object Manager
      * @param int                      $batchSize     The batch size before flushing the om
      */
-    public function __construct(Reader $reader, EventDispatcherInterface $dispatcher, CaseConverter $caseConverter, ObjectManager $objectManager, $batchSize)
+    public function __construct(Reader $reader, EventDispatcherInterface $dispatcher, CaseConverter $caseConverter, EntityManagerInterface $objectManager, $batchSize)
     {
         $this->reader = $reader;
         $this->dispatcher = $dispatcher;

Tests/Doctrine/ImporterTest.php

@@ -11,7 +11,7 @@
 use Avro\CsvBundle\Doctrine\Importer;
 use Avro\CsvBundle\Tests\TestEntity;
 use Avro\CsvBundle\Util\Reader;
-use Doctrine\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -40,7 +40,7 @@ public function setUp(): void
                 ]
             );
         $reader = new Reader();
-        $objectManager = $this->createMock(ObjectManager::class);
+        $objectManager = $this->createMock(EntityManagerInterface::class);
         $dispatcher = $this->createMock(EventDispatcherInterface::class);
 
         $this->class = TestEntity::class;

Tests/Import/ImporterTest.php

@@ -11,7 +11,7 @@
 use Avro\CsvBundle\Import\Importer;
 use Avro\CsvBundle\Tests\TestEntity;
 use Avro\CsvBundle\Util\Reader;
-use Doctrine\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use PHPUnit\Framework\TestCase;
 use stdClass;
@@ -73,7 +73,7 @@ static function ($value) use ($assocs) {
         $metadata
             ->method('getAssociationMapping')
             ->willReturn([]);
-        $objectManager = $this->createMock(ObjectManager::class);
+        $objectManager = $this->createMock(EntityManagerInterface::class);
         $objectManager
             ->method('getClassMetadata')
             ->willReturn($metadata);

composer.json

@@ -26,7 +26,7 @@
         "misatotremor/case-bundle": "^0.4.1"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^1.12|^2.1.0",
+        "doctrine/doctrine-bundle": "^1.12|^2.0",
         "doctrine/orm": "^2.7",
         "symfony/event-dispatcher": "^4.3|^5.0",
         "symfony/form": "^4.0|^5.0",