Decoupled the path of default.png

kreta · Sep 8, 2015 · 9dd05b0 · 9dd05b0
1 parent 18dca16
commit 9dd05b0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/Bundle/UserBundle/Resources/config/factories.yml b/Bundle/UserBundle/Resources/config/factories.yml
@@ -12,3 +12,4 @@ services:
             - %kreta_user.user.class%
             - @kreta_media.factory.media
             - @kreta_user.uploader.image_user
+            - '../../../Bundle/UserBundle/Resources/public/img/'
diff --git a/Component/User/Factory/UserFactory.php b/Component/User/Factory/UserFactory.php
@@ -22,7 +22,6 @@
  */
 class UserFactory
 {
-    const DEFAULT_PHOTO_PATH = '/../../../Bundle/UserBundle/Resources/public/img/';
     const DEFAULT_PHOTO_FILENAME = 'default.png';
 
     /**
@@ -39,6 +38,13 @@ class UserFactory
      */
     protected $mediaFactory;
 
+    /**
+     * The path.
+     *
+     * @var string|null
+     */
+    protected $path;
+
     /**
      * The uploader.
      *
@@ -52,11 +58,13 @@ class UserFactory
      * @param string                                                            $className    The class name
      * @param \Kreta\Component\Media\Factory\MediaFactory                       $mediaFactory The media factory
      * @param \Kreta\Component\Media\Uploader\Interfaces\MediaUploaderInterface $uploader     The uploader
+     * @param string|null                                                       $path         The path, by default null
      */
-    public function __construct($className, MediaFactory $mediaFactory, MediaUploaderInterface $uploader)
+    public function __construct($className, MediaFactory $mediaFactory, MediaUploaderInterface $uploader, $path = null)
     {
         $this->className = $className;
         $this->mediaFactory = $mediaFactory;
+        $this->path = $path;
         $this->uploader = $uploader;
     }
 
@@ -79,19 +87,21 @@ public function create($email, $username, $firstName, $lastName, $enabled = fals
             $user->setConfirmationToken(sprintf('%s%s', uniqid('kreta'), unixtojd()));
         }
 
-        $photo = $this->mediaFactory->create(
-            new UploadedFile(
-                __DIR__ . self::DEFAULT_PHOTO_PATH . self::DEFAULT_PHOTO_FILENAME, self::DEFAULT_PHOTO_FILENAME
-            )
-        );
-        $this->uploader->upload($photo);
+        if (null !== $this->path) {
+            $photo = $this->mediaFactory->create(
+                new UploadedFile(
+                    __DIR__ . '/' . $this->path . self::DEFAULT_PHOTO_FILENAME, self::DEFAULT_PHOTO_FILENAME
+                )
+            );
+            $this->uploader->upload($photo);
+            $user->setPhoto($photo);
+        }
 
         return $user
             ->setUsername($username)
             ->setFirstName($firstName)
             ->setLastName($lastName)
             ->setEmail($email)
-            ->setEnabled($enabled)
-            ->setPhoto($photo);
+            ->setEnabled($enabled);
     }
 }
diff --git a/Component/User/spec/Kreta/Component/User/Factory/UserFactorySpec.php b/Component/User/spec/Kreta/Component/User/Factory/UserFactorySpec.php
@@ -12,7 +12,6 @@
 namespace spec\Kreta\Component\User\Factory;
 
 use Kreta\Component\Media\Factory\MediaFactory;
-use Kreta\Component\Media\Model\Interfaces\MediaInterface;
 use Kreta\Component\Media\Uploader\Interfaces\MediaUploaderInterface;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
@@ -34,12 +33,8 @@ function it_is_initializable()
         $this->shouldHaveType('Kreta\Component\User\Factory\UserFactory');
     }
 
-    function it_creates_a_user(MediaFactory $mediaFactory, MediaInterface $photo, MediaUploaderInterface $uploader)
+    function it_creates_a_user()
     {
-        $mediaFactory->create(Argument::type('Symfony\Component\HttpFoundation\File\UploadedFile'))
-            ->shouldBeCalled()->willReturn($photo);
-        $uploader->upload($photo)->shouldBeCalled();
-
         $this->create('kreta@kreta.com', 'user', 'First Name', 'Last Name', false)
             ->shouldReturnAnInstanceOf('Kreta\Component\User\Model\Interfaces\UserInterface');
     }