Merge pull request #7773 from laboro/fix/CRM-5489_1.9_revert

CRM-5489: Oro transport uses User's SMTP instead of the specified Send
oroinc · Jun 29, 2016 · 48eab16 · 48eab16
2 parents 58e9844 + 6fbb77d
commit 48eab16
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Functional/DataFixtures/LoadEmailData.php b/src/Oro/Bundle/EmailBundle/Tests/Functional/DataFixtures/LoadEmailData.php
@@ -9,7 +9,7 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 
-use Oro\Bundle\EmailBundle\Tools\EmailOriginHelper;
+use Oro\Bundle\EmailBundle\Mailer\Processor;
 use Oro\Bundle\EmailBundle\Model\FolderType;
 use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder;
 use Oro\Bundle\EmailBundle\Entity\Email;
@@ -27,9 +27,9 @@ class LoadEmailData extends AbstractFixture implements ContainerAwareInterface,
     protected $emailEntityBuilder;
 
     /**
-     * @var EmailOriginHelper
+     * @var Processor
      */
-    protected $emailOriginHelper;
+    protected $processor;
 
     /**
      * @var ContainerInterface
@@ -55,7 +55,7 @@ public function setContainer(ContainerInterface $container = null)
 
         $this->container = $container;
         $this->emailEntityBuilder = $container->get('oro_email.email.entity.builder');
-        $this->emailOriginHelper = $container->get('oro_email.tools.email_origin_helper');
+        $this->processor = $container->get('oro_email.mailer.processor');
     }
 
     /**
@@ -97,7 +97,7 @@ protected function loadEmailsDemo(ObjectManager $om)
         foreach ($this->templates as $index => $template) {
             $owner = $this->getReference('simple_user');
             $simpleUser2 = $this->getReference('simple_user2');
-            $origin = $this->emailOriginHelper->getEmailOrigin($owner->getEmail());
+            $origin = $this->processor->getEmailOrigin($owner->getEmail());
 
             $emailUser = $this->emailEntityBuilder->emailUser(
                 $template['Subject'],