Remove uneeded dependency

[MAILPOET-3075]

lib/Config/Populator.php

@@ -34,7 +34,6 @@ use MailPoet\Subscription\Captcha;
 use MailPoet\Util\Helpers;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoetVendor\Carbon\Carbon;
-use MailPoetVendor\Doctrine\ORM\EntityManager;
 
 class Populator {
   public $prefix;
@@ -56,11 +55,6 @@ class Populator {
   /** @var FormsRepository */
   private $formsRepository;
 
-  /**
-   * @var EntityManager
-   */
-  private $entityManager;
-
   public function __construct(
     SettingsController $settings,
     WPFunctions $wp,
@@ -68,7 +62,6 @@ class Populator {
     ReferralDetector $referralDetector,
     FeaturesController $flagsController,
     FormsRepository $formsRepository,
-    EntityManager $entityManager,
     FormFactory $formFactory
   ) {
     $this->settings = $settings;
@@ -159,7 +152,6 @@ class Populator {
     ];
     $this->flagsController = $flagsController;
     $this->formsRepository = $formsRepository;
-    $this->entityManager = $entityManager;
   }
 
   public function up() {
@@ -743,7 +735,7 @@ class Populator {
       }
       $form->setSettings($settings);
     }
-    $this->entityManager->flush();
+    $this->formsRepository->flush();
   }
 
   private function moveGoogleAnalyticsFromPremium() {

tests/integration/API/JSON/v1/SetupTest.php

@@ -16,7 +16,6 @@ use MailPoet\Settings\SettingsController;
 use MailPoet\Settings\SettingsRepository;
 use MailPoet\Subscription\Captcha;
 use MailPoet\WP\Functions as WPFunctions;
-use MailPoetVendor\Doctrine\ORM\EntityManager;
 
 class SetupTest extends \MailPoetTest {
   public function _before() {
@@ -41,7 +40,6 @@ class SetupTest extends \MailPoetTest {
       $referralDetector,
       $featuresController,
       $this->diContainer->get(FormsRepository::class),
-      $this->diContainer->get(EntityManager::class),
       $this->diContainer->get(FormFactory::class)
     );
     $router = new Setup($wp, new Activator($settings, $populator));

tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php

@@ -43,7 +43,6 @@ use MailPoet\Subscription\SubscriptionUrlFactory;
 use MailPoet\Tasks\Sending as SendingTask;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoetVendor\Carbon\Carbon;
-use MailPoetVendor\Doctrine\ORM\EntityManager;
 use MailPoetVendor\Idiorm\ORM;
 
 class SendingQueueTest extends \MailPoetTest {
@@ -82,7 +81,6 @@ class SendingQueueTest extends \MailPoetTest {
       $referralDetector,
       $featuresController,
       $this->diContainer->get(FormsRepository::class),
-      $this->diContainer->get(EntityManager::class),
       $this->diContainer->get(FormFactory::class)
     );
     $populator->up();

tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php

@@ -16,7 +16,6 @@ use MailPoet\Settings\SettingsController;
 use MailPoet\Settings\SettingsRepository;
 use MailPoet\Subscription\Captcha;
 use MailPoet\WP\Functions as WPFunctions;
-use MailPoetVendor\Doctrine\ORM\EntityManager;
 use MailPoetVendor\Idiorm\ORM;
 
 class MailerTest extends \MailPoetTest {
@@ -40,7 +39,6 @@ class MailerTest extends \MailPoetTest {
       $referralDetector,
       $featuresController,
       $this->diContainer->get(FormsRepository::class),
-      $this->diContainer->get(EntityManager::class),
       $this->diContainer->get(FormFactory::class)
     );
     $populator->up();

tests/integration/Newsletter/ShortcodesTest.php

@@ -21,7 +21,6 @@ use MailPoet\Subscribers\LinkTokens;
 use MailPoet\Subscription\Captcha;
 use MailPoet\Subscription\SubscriptionUrlFactory;
 use MailPoet\WP\Functions as WPFunctions;
-use MailPoetVendor\Doctrine\ORM\EntityManager;
 use MailPoetVendor\Idiorm\ORM;
 
 require_once(ABSPATH . 'wp-admin/includes/user.php');
@@ -52,7 +51,6 @@ class ShortcodesTest extends \MailPoetTest {
       $referralDetector,
       $featuresController,
       $this->diContainer->get(FormsRepository::class),
-      $this->diContainer->get(EntityManager::class),
       $this->diContainer->get(FormFactory::class)
     );
     $populator->up();

tests/integration/Subscription/UrlTest.php

@@ -16,7 +16,6 @@ use MailPoet\Subscribers\LinkTokens;
 use MailPoet\Subscription\Captcha;
 use MailPoet\Subscription\SubscriptionUrlFactory;
 use MailPoet\WP\Functions as WPFunctions;
-use MailPoetVendor\Doctrine\ORM\EntityManager;
 
 class UrlTest extends \MailPoetTest {
 
@@ -38,7 +37,6 @@ class UrlTest extends \MailPoetTest {
       $referralDetector,
       $featuresController,
       $this->diContainer->get(FormsRepository::class),
-      $this->diContainer->get(EntityManager::class),
       $this->diContainer->get(FormFactory::class)
     );
     $populator->up();