Merged in fix/entity_manager_injection (pull request #5)

Removing the entityManager injection
synolia · Dec 5, 2016 · 52ce724 · 52ce724
2 parents 4e9f49c + 95d5689
commit 52ce724
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/ImportExport/Strategy/ProductStrategy.php b/ImportExport/Strategy/ProductStrategy.php
@@ -3,7 +3,6 @@
 namespace Synolia\Bundle\OroneoBundle\ImportExport\Strategy;
 
 use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\EntityManager;
 use Oro\Bundle\EntityConfigBundle\Config\ConfigManager;
 use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 use Oro\Bundle\LocaleBundle\Entity\LocalizedFallbackValue;
@@ -26,9 +25,6 @@ class ProductStrategy extends Strategy
     /** @var ConfigManager */
     protected $configManager;
 
-    /** @var EntityManager */
-    protected $entityManager;
-
     /** @var BusinessUnitRepository */
     protected $businessUnitRepo;
 
@@ -47,6 +43,10 @@ class ProductStrategy extends Strategy
     public function setDoctrineHelper(DoctrineHelper $doctrineHelper)
     {
         $this->doctrineHelper = $doctrineHelper;
+
+        $this->businessUnitRepo = $doctrineHelper->getEntityRepositoryForClass('OroOrganizationBundle:BusinessUnit');
+        $this->productUnitRepo  = $doctrineHelper->getEntityRepositoryForClass('OroProductBundle:ProductUnit');
+        $this->categoryRepo     = $doctrineHelper->getEntityRepositoryForClass('OroCatalogBundle:Category');
     }
 
     /**
@@ -57,18 +57,6 @@ public function setConfigManager(ConfigManager $configManager)
         $this->configManager = $configManager;
     }
 
-    /**
-     * @param EntityManager $entityManager
-     */
-    public function setEntityManager(EntityManager $entityManager)
-    {
-        $this->entityManager    = $entityManager;
-
-        $this->businessUnitRepo = $entityManager->getRepository('OroOrganizationBundle:BusinessUnit');
-        $this->productUnitRepo  = $entityManager->getRepository('OroProductBundle:ProductUnit');
-        $this->categoryRepo     = $entityManager->getRepository('OroCatalogBundle:Category');
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -121,8 +109,7 @@ public function afterProcessEntity($entity)
             }
 
             $category->addProduct($entity);
-
-            $this->entityManager->persist($category);
+            $this->doctrineHelper->getEntityManagerForClass(get_class($category))->persist($category);
         }
 
         $metadata  = $this->doctrineHelper->getEntityMetadata($this->localizedFallbackValueClass);

diff --git a/Resources/config/import_export.yml b/Resources/config/import_export.yml
@@ -95,7 +95,6 @@ services:
         parent: oro_product.importexport.strategy.product
         calls:
             - [setConfigManager, ['@oro_entity_config.config_manager']]
-            - [setEntityManager, ['@doctrine.orm.entity_manager']]
             - [setDoctrineHelper, ['@oro_entity.doctrine_helper']]
 
     synolia.import.strategy.product_file: