had to lower interface requirements for the controllers

mitom · mitom · commit 85dd84a75777 · 2013-10-10T16:36:49.000+02:00
diff --git a/Uploader/Storage/FilesystemStorage.php b/Uploader/Storage/FilesystemStorage.php
@@ -4,7 +4,7 @@
 
 use Oneup\UploaderBundle\Uploader\File\FilesystemFile;
 
-class FilesystemStorage implements FilesystemStorageInterface
+class FilesystemStorage implements StorageInterface
 {
     protected $directory;
 
@@ -13,7 +13,7 @@ public function __construct($directory)
         $this->directory = $directory;
     }
 
-    public function upload(FilesystemFile $file, $name, $path = null)
+    public function upload($file, $name, $path = null)
     {
         $path = is_null($path) ? $name : sprintf('%s/%s', $path, $name);
         $path = sprintf('%s/%s', $this->directory, $path);
diff --git a/Uploader/Storage/FilesystemStorageInterface.php b/Uploader/Storage/FilesystemStorageInterface.php
diff --git a/Uploader/Storage/GaufretteStorage.php b/Uploader/Storage/GaufretteStorage.php
@@ -19,7 +19,7 @@ public function __construct(Filesystem $filesystem, $bufferSize, $streamWrapperP
         $this->streamWrapperPrefix = $streamWrapperPrefix;
     }
 
-    public function upload(FileInterface $file, $name, $path = null)
+    public function upload($file, $name, $path = null)
     {
         $path = is_null($path) ? $name : sprintf('%s/%s', $path, $name);
 
diff --git a/Uploader/Storage/OrphanageStorage.php b/Uploader/Storage/OrphanageStorage.php
@@ -3,6 +3,7 @@
 namespace Oneup\UploaderBundle\Uploader\Storage;
 
 use Oneup\UploaderBundle\Uploader\File\FileInterface;
+use Oneup\UploaderBundle\Uploader\File\FilesystemFile;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\Finder\Finder;
@@ -28,7 +29,7 @@ public function __construct(StorageInterface $storage, SessionInterface $session
         $this->type = $type;
     }
 
-    public function upload(FileInterface $file, $name, $path = null)
+    public function upload($file, $name, $path = null)
     {
         if(!$this->session->isStarted())
             throw new \RuntimeException('You need a running session in order to run the Orphanage.');
diff --git a/Uploader/Storage/StorageInterface.php b/Uploader/Storage/StorageInterface.php
@@ -9,9 +9,9 @@ interface StorageInterface
     /**
      * Uploads a File instance to the configured storage.
      *
-     * @param FileInterface $file
+     * @param               $file
      * @param string        $name
      * @param string        $path
      */
-    public function upload(FileInterface $file, $name, $path = null);
+    public function upload($file, $name, $path = null);
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Oneup\UploaderBundle\Uploader\File\FilesystemFile;`
`6`	`6`
`7`		`-class FilesystemStorage implements FilesystemStorageInterface`
	`7`	`+class FilesystemStorage implements StorageInterface`
`8`	`8`	`{`
`9`	`9`	`protected $directory;`
`10`	`10`
`@@ -13,7 +13,7 @@ public function __construct($directory)`
`13`	`13`	`$this->directory = $directory;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function upload(FilesystemFile $file, $name, $path = null)`
	`16`	`+ public function upload($file, $name, $path = null)`
`17`	`17`	`{`
`18`	`18`	`$path = is_null($path) ? $name : sprintf('%s/%s', $path, $name);`
`19`	`19`	`$path = sprintf('%s/%s', $this->directory, $path);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct(Filesystem $filesystem, $bufferSize, $streamWrapperP`
`19`	`19`	`$this->streamWrapperPrefix = $streamWrapperPrefix;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function upload(FileInterface $file, $name, $path = null)`
	`22`	`+ public function upload($file, $name, $path = null)`
`23`	`23`	`{`
`24`	`24`	`$path = is_null($path) ? $name : sprintf('%s/%s', $path, $name);`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Oneup\UploaderBundle\Uploader\Storage;`
`4`	`4`
`5`	`5`	`use Oneup\UploaderBundle\Uploader\File\FileInterface;`
	`6`	`+use Oneup\UploaderBundle\Uploader\File\FilesystemFile;`
`6`	`7`	`use Symfony\Component\HttpFoundation\Session\SessionInterface;`
`7`	`8`	`use Symfony\Component\HttpFoundation\File\File;`
`8`	`9`	`use Symfony\Component\Finder\Finder;`
`@@ -28,7 +29,7 @@ public function __construct(StorageInterface $storage, SessionInterface $session`
`28`	`29`	`$this->type = $type;`
`29`	`30`	`}`
`30`	`31`
`31`		`- public function upload(FileInterface $file, $name, $path = null)`
	`32`	`+ public function upload($file, $name, $path = null)`
`32`	`33`	`{`
`33`	`34`	`if(!$this->session->isStarted())`
`34`	`35`	`throw new \RuntimeException('You need a running session in order to run the Orphanage.');`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ interface StorageInterface`
`9`	`9`	`/**`
`10`	`10`	`* Uploads a File instance to the configured storage.`
`11`	`11`	`*`
`12`		`- * @param FileInterface $file`
	`12`	`+ * @param $file`
`13`	`13`	`* @param string $name`
`14`	`14`	`* @param string $path`
`15`	`15`	`*/`
`16`		`- public function upload(FileInterface $file, $name, $path = null);`
	`16`	`+ public function upload($file, $name, $path = null);`
`17`	`17`	`}`