changed upload source flow

src/SimplePhoto.php

@@ -127,6 +127,7 @@ public function uploadFromFilePath($file, array $options = array())
      */
     public function upload(PhotoSourceInterface $photoSource, array $options = array())
     {
+        $photoSource->process();
         if ($photoSource->isValid() == false) {
             // No need to go further if source is invalid
             return false;
@@ -181,27 +182,6 @@ public function upload(PhotoSourceInterface $photoSource, array $options = array
         return false;
     }
 
-    /**
-     * Legacy Upload Photo
-     *
-     * @param mixed $photoData
-     * @param array $options Options available
-     * <pre>
-     * transform: options for transforming photo before saving
-     * storage: storage system to save photo
-     * </pre>
-     * @param PhotoSourceInterface $photoSource
-     * @return int Photo ID
-     * @deprecated
-     */
-    public function uploadFrom(
-        $photoData,
-        PhotoSourceInterface $photoSource,
-        array $options = array()
-    ) {
-        return $this->upload($photoSource->process($photoData), $options);
-    }
-
     /**
      * @param int $photoId PhotoID
      * @param array $options

src/Source/FilePathSource.php

@@ -25,18 +25,14 @@ class FilePathSource implements PhotoSourceInterface
 
     public function __construct($file = null)
     {
-        if ($file != null) {
-            $this->process($file);
-        }
+        $this->file = $file;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function process($file)
+    public function process()
     {
-        $this->file = $file;
-
         return $this;
     }
 
@@ -69,6 +65,6 @@ public function getMime()
      */
     public function isValid()
     {
-        return true;
+        return is_file($this->file);
     }
 }

src/Source/PhotoSourceInterface.php

@@ -19,11 +19,9 @@ interface PhotoSourceInterface
     /**
      * Process the file input data
      *
-     * @param $photoData
-     *
      * @return PhotoSourceInterface
      */
-    public function process($photoData);
+    public function process();
 
     /**
      * Name of file

src/Source/PhpFileUploadSource.php

@@ -22,18 +22,14 @@ class PhpFileUploadSource implements PhotoSourceInterface
 
     public function __construct($fileData)
     {
-        if ($fileData != null) {
-            $this->process($fileData);
-        }
+        $this->fileData = $fileData;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function process($fileData)
+    public function process()
     {
-        $this->fileData = $fileData;
-
         return $this;
     }
 

src/Source/SymfonyFileUploadSource.php

@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the SimplePhoto package.
+ *
+ * (c) Laju Morrison <morrelinko@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SimplePhoto\Source;
+
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+/**
+ * @author Laju Morrison <morrelinko@gmail.com>
+ */
+class SymfonyFileUploadSource implements PhotoSourceInterface
+{
+    /**
+     * @var \Symfony\Component\HttpFoundation\File\UploadedFile
+     */
+    protected $file;
+
+    /**
+     * Construct
+     *
+     * @param UploadedFile $file
+     */
+    public function __construct(UploadedFile $file)
+    {
+        $this->file = $file;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function process()
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return $this->file->getClientOriginalName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFile()
+    {
+        return $this->file->getRealPath();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMime()
+    {
+        return $this->file->getMimeType();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isValid()
+    {
+        return $this->file->isValid();
+    }
+}

src/Source/UrlSource.php

@@ -16,6 +16,11 @@
  */
 class UrlSource implements PhotoSourceInterface
 {
+    /**
+     * @var string
+     */
+    protected $url;
+
     /**
      * @var string
      */
@@ -38,21 +43,19 @@ class UrlSource implements PhotoSourceInterface
 
     public function __construct($url)
     {
-        if ($url != null) {
-            $this->process($url);
-        }
+        $this->url = $url;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function process($url)
+    public function process()
     {
-        $this->name = basename($url);
+        $this->name = basename($this->url);
         $this->path = tempnam(sys_get_temp_dir(), 'sp_url');
         $fp = fopen($this->path, 'w+');
 
-        $ch = curl_init($url);
+        $ch = curl_init($this->url);
 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, false);
         curl_setopt($ch, CURLOPT_HEADER, false);

tests/SimplePhoto/SimplePhotoTest.php

@@ -158,9 +158,8 @@ public function testUploadFromPhpFileUpload()
     public function testUploadAndTransformSize()
     {
         // Same as $this->simplePhoto->uploadFromFilePath()
-        $photoId = $this->simplePhoto->uploadFrom(
-            $this->photoSourceFile,
-            new FilePathSource()
+        $photoId = $this->simplePhoto->upload(
+            new FilePathSource($this->photoSourceFile)
         );
 
         $photo = $this->simplePhoto->get($photoId, array(