Merge pull request #6 from Charlie-Lucas/master

🐛 remove attachment uploader service doctrine dependency

Author: paulandrieux

EventListener/AttachmentUploadListener.php

@@ -4,6 +4,7 @@
 
 use AppVentus\Awesome\SpoolMailerBundle\Entity\Attachment;
 use AppVentus\Awesome\SpoolMailerBundle\Utils\AttachmentUploader;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
@@ -33,7 +34,7 @@ public function prePersist(LifecycleEventArgs $args)
     {
         $entity = $args->getEntity();
 
-        $this->uploadFile($entity);
+        $this->uploadFile($entity, $args->getEntityManager());
     }
 
     /**
@@ -43,19 +44,20 @@ public function preUpdate(PreUpdateEventArgs $args)
     {
         $entity = $args->getEntity();
 
-        $this->uploadFile($entity);
+        $this->uploadFile($entity, $args->getEntityManager());
     }
 
     /**
      * @param $entity
+     * @param EntityManager $em
      */
-    private function uploadFile($entity)
+    private function uploadFile($entity, EntityManager $em)
     {
         if (!$entity instanceof Attachment) {
             return;
         }
 
-        $this->uploader->upload($entity);
+        $this->uploader->upload($entity, $em);
     }
 
     /**

Resources/config/services.yml

@@ -29,7 +29,6 @@ services:
         arguments:
             - '%spool_mailer.attachments_directory%'
             - '%kernel.root_dir%'
-            - '@doctrine'
 
     spool.doctrine_attachment_listener:
         class: AppVentus\Awesome\SpoolMailerBundle\EventListener\AttachmentUploadListener

Utils/AttachmentUploader.php

@@ -2,9 +2,8 @@
 namespace AppVentus\Awesome\SpoolMailerBundle\Utils;
 
 use AppVentus\Awesome\SpoolMailerBundle\Entity\Attachment;
-use Doctrine\Bundle\DoctrineBundle\Registry as DoctrineRegistry;
+use Doctrine\ORM\EntityManager;
 use Gedmo\Exception\UploadableDirectoryNotFoundException;
-use Swift_FileStream;
 
 /**
  * Class AttachmentUploader
@@ -15,31 +14,29 @@ class AttachmentUploader {
 
     private $targetDir;
     private $rootDir;
-    private $em;
 
     /**
      * AttachmentUploader constructor.
      *
      * @param                                          $targetDir
      * @param                                          $rootDir
-     * @param \Doctrine\Bundle\DoctrineBundle\Registry $registry
      */
-    public function __construct($targetDir, $rootDir, DoctrineRegistry $registry)
+    public function __construct($targetDir, $rootDir)
     {
         $this->targetDir = $targetDir;
         $this->rootDir = $rootDir;
-        $this->em = $registry->getManager();
     }
 
     /**
      * @param \AppVentus\Awesome\SpoolMailerBundle\Entity\Attachment $attachment
+     * @param EntityManager $em
      */
-    public function upload(Attachment $attachment)
+    public function upload(Attachment $attachment, EntityManager $em)
     {
         if ($swiftAttachment = $attachment->getSwiftAttachment())
         {
             /** @var Attachment $duplicatedAttachment */
-            $duplicatedAttachment = $this->em->getRepository(Attachment::class)->findOneBy(['swiftAttachmentId' => $attachment->getSwiftAttachmentId()]);
+            $duplicatedAttachment = $em->getRepository(Attachment::class)->findOneBy(['swiftAttachmentId' => $attachment->getSwiftAttachmentId()]);
             if (!$duplicatedAttachment)
             {
                 $fileName = md5(uniqid('', true)).'_'.$swiftAttachment->getFilename();