File upload fixes (#56)

* Some work on files upload refactor * Fixes after files upload refactor * Croppa fixes
GrupaZero · Mar 20, 2017 · 57e18e7 · 57e18e7
1 parent f53b93d
commit 57e18e7
Show file tree

Hide file tree

Showing 13 changed files with 399 additions and 64 deletions.
diff --git a/.env.example b/.env.example
@@ -65,4 +65,4 @@ S3_SECRET=
 S3_REGION=
 S3_BUCKET=
 
-UPLOAD_DIR=uploads
+UPLOAD_DISK=uploads
diff --git a/.env.testing b/.env.testing
@@ -36,4 +36,6 @@ MAIL_ENCRYPTION=null
 
 PUSHER_APP_ID=
 PUSHER_KEY=
-PUSHER_SECRET=
+PUSHER_SECRET=
+
+UPLOAD_DISK=test
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -5,6 +5,8 @@
 use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider;
 use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
 use Illuminate\Support\ServiceProvider;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -15,6 +17,16 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        if(env('APP_ENV') === 'testing'){
+            // Use null adapter for tests
+            app('filesystem')->extend(
+                'nullAdapter',
+                function () {
+                    return new Filesystem(new NullAdapter());
+                }
+            );
+        }
+
         view()->composer(
             'includes.disqus.disqus',
             function ($view) {

diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
         "gzero/cms": "dev-master",
         "gzero/api": "dev-master",
         "gzero/admin": "dev-master",
-        "predis/predis": "^1.1"
+        "predis/predis": "^1.1",
+        "league/flysystem-aws-s3-v3": "^1.0"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "2.2.*",