Implemented FlySystem for FileSystem abstraction

README.md

@@ -4,6 +4,8 @@ This component simplifies file validation and uploading.
 
 ## Usage
 
+See http://flysystem.thephpleague.com/ for information on adapters.
+
 Assume a file is uploaded with this HTML form:
 
 ```html
@@ -17,7 +19,10 @@ When the HTML form is submitted, the server-side PHP code can validate and uploa
 
 ```php
 <?php
-$storage = new \Upload\Storage\FileSystem('/path/to/directory');
+use \League\Flysystem\Filesystem;
+use \League\Flysystem\Adapter\Local as Adapter;
+
+$storage = new Filesystem(new Adapter(__DIR__.'/path/to/directory'));
 $file = new \Upload\File('foo', $storage);
 
 // Optionally you can rename the file on upload

composer.json

@@ -14,7 +14,8 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "ext-fileinfo": "*"
+        "ext-fileinfo": "*",
+        "league/flysystem": "0.5.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"

src/Upload/File.php

@@ -60,7 +60,7 @@ class File implements \ArrayAccess, \IteratorAggregate, \Countable
 
     /**
      * Storage delegate
-     * @var \Upload\StorageInterface
+     * @var \League\Flysystem\Filesystem
      */
     protected $storage;
 
@@ -109,12 +109,12 @@ class File implements \ArrayAccess, \IteratorAggregate, \Countable
     /**
      * Constructor
      *
-     * @param  string                    $key     The $_FILES[] key
-     * @param  \Upload\StorageInterface  $storage The upload delegate instance
-     * @throws \RuntimeException                  If file uploads are disabled in the php.ini file
-     * @throws \InvalidArgumentException          If $_FILES[] does not contain key
+     * @param  string                        $key     The $_FILES[] key
+     * @param  \League\Flysystem\Filesystem  $storage The upload delegate instance
+     * @throws \RuntimeException                      If file uploads are disabled in the php.ini file
+     * @throws \InvalidArgumentException              If $_FILES[] does not contain key
      */
-    public function __construct($key, \Upload\StorageInterface $storage)
+    public function __construct($key, \League\Flysystem\Filesystem $storage)
     {
         // Check if file uploads are allowed
         if (ini_get('file_uploads') == false) {
@@ -372,19 +372,26 @@ public function __call($name, $arguments)
     /**
      * Upload file (delegated to storage object)
      *
+     * @param  bool   $overwrite If file should overwrite existing file.
      * @return bool
      * @throws \Upload\Exception If validation fails
      * @throws \Upload\Exception If upload fails
      */
-    public function upload()
+    public function upload($overwrite = false)
     {
         if ($this->isValid() === false) {
             throw new \Upload\Exception('File validation failed');
         }
 
         foreach ($this->objects as $fileInfo) {
             $this->applyCallback('beforeUpload', $fileInfo);
-            $this->storage->upload($fileInfo);
+
+            if ($overwrite === false && $this->storage->has($fileInfo->getNameWithExtension())) {
+                throw new \Upload\Exception('File already exists', $fileInfo);
+            }
+
+            $this->storage->put($fileInfo->getNameWithExtension(), $fileInfo->getContents());
+
             $this->applyCallback('afterUpload', $fileInfo);
         }
 

src/Upload/FileInfo.php

@@ -78,6 +78,16 @@ public function __construct($filePathname, $newName = null)
         parent::__construct($filePathname);
     }
 
+    /**
+     * Get the file contents
+     *
+     * @return string
+     */
+    public function getContents()
+    {
+        return file_get_contents($this->getRealPath());
+    }
+
     /**
      * Get file name (without extension)
      *

src/Upload/FileInfoInterface.php

@@ -41,6 +41,8 @@ interface FileInfoInterface
 {
     public function getPathname();
 
+    public function getContents();
+
     public function getName();
 
     public function setName($name);

tests/FileTest.php

@@ -1,4 +1,6 @@
 <?php
+use League\Flysystem\Adapter\Local as Adapter;
+
 class FileTest extends PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -23,9 +25,9 @@ public function setUp()
 
         // Mock storage
         $this->storage = $this->getMock(
-            '\Upload\Storage\FileSystem',
+            '\League\Flysystem\Filesystem',
             array('upload'),
-            array($this->assetsDirectory)
+            array(new Adapter($this->assetsDirectory))
         );
         $this->storage
             ->expects($this->any())
@@ -121,7 +123,7 @@ public function testCallbacks()
         $file->afterValidate($callbackAfterValidate);
         $file->beforeUpload($callbackBeforeUpload);
         $file->afterUpload($callbackAfterUpload);
-        $file->upload();
+        $file->upload(true);
     }
 
     /********************************************************************************
@@ -231,7 +233,7 @@ public function testWillUploadIfValid()
     {
         $file = new \Upload\File('single', $this->storage);
         $this->assertTrue($file->isValid());
-        $this->assertTrue($file->upload());
+        $this->assertTrue($file->upload(true));
     }
 
     /**