Merge remote-tracking branch 'origin/master' into email-verification

app/Services/FileManagerService.php

@@ -12,7 +12,6 @@ use App\Models\File as UserFile;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
-use Madnest\Madzipper\Facades\Madzipper;
 use League\Flysystem\FileNotFoundException;
 use App\Http\Requests\FileFunctions\RenameItemRequest;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -63,7 +62,8 @@ class FileManagerService
         $zip_name = Str::random(16) . '-' . Str::slug($requested_folder->name) . '.zip';
 
         // Create zip
-        $zip = Madzipper::make($disk_local->path("zip/$zip_name"));
+        $zipper = new \Madnest\Madzipper\Madzipper;
+        $zip = $zipper->make($disk_local->path("zip/$zip_name"));
 
         // Add files to zip
         foreach ($files as $file) {
@@ -77,7 +77,7 @@ class FileManagerService
         }
 
         // Close zip
-        $zip->close();
+        //$zip->close();
 
         // Delete temporary files
         if (! is_storage_driver('local')) {
@@ -122,7 +122,8 @@ class FileManagerService
         $zip_name = Str::random(16) . '.zip';
 
         // Create zip
-        $zip = Madzipper::make($disk_local->path("zip/$zip_name"));
+        $zipper = new \Madnest\Madzipper\Madzipper;
+        $zip = $zipper->make($disk_local->path("zip/$zip_name"));
 
         // Add files to zip
         $files->each(function ($file) use ($zip, $disk_local) {
@@ -134,7 +135,7 @@ class FileManagerService
         });
 
         // Close zip
-        $zip->close();
+        //$zip->close();
 
         // Delete temporary files
         if (! is_storage_driver('local')) {

app/Services/HelperService.php

@@ -125,7 +125,7 @@ class HelperService
      */
     public function move_file_to_external_storage($file, $user_id): void
     {
-        $disk_local = Storage::disk('local');
+        $disk_local = \Storage::disk('local');
 
         // Get file size
         $filesize = $disk_local->size("files/$user_id/$file");
@@ -145,7 +145,7 @@ class HelperService
             // TODO: replace local files with temp folder
             $uploader = new MultipartUploader($client, config('filesystems.disks.local.root') . "/files/$user_id/$file", [
                 'bucket' => $adapter->getBucket(),
-                'key' => "/files/$user_id/$file",
+                'key' => "files/$user_id/$file",
             ]);
 
             try {
@@ -156,7 +156,7 @@ class HelperService
                 Log::error($e->getMessage());
 
                 // Delete file after error
-                $disk_local->delete("/files/$user_id/$file");
+                $disk_local->delete("files/$user_id/$file");
 
                 throw new HttpException(409, $e->getMessage());
             }
@@ -167,7 +167,7 @@ class HelperService
         }
 
         // Delete file after upload
-        $disk_local->delete("/files/$user_id/$file");
+        $disk_local->delete("files/$user_id/$file");
     }
 
     /**

app/Services/SchedulerService.php

@@ -19,7 +19,7 @@ class SchedulerService
             ->get()
             ->each(function ($zip) {
                 // Delete zip file
-                \Storage::disk('local')->delete("zip/$zip->basename");
+                Storage::disk('local')->delete("zip/$zip->basename");
 
                 // Delete zip record
                 $zip->delete();

app/Services/StripeService.php

@@ -13,6 +13,8 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class StripeService
 {
+    private \Cartalyst\Stripe\Stripe $stripe;
+
     /**
      * Stripe Service constructor.
      */
@@ -115,9 +117,8 @@ class StripeService
      *
      * @param $request
      * @param $user
-     * @return mixed
      */
-    public function registerNewPaymentMethod($request, $user)
+    public function registerNewPaymentMethod($request, $user): void
     {
         // Clear cached payment methods
         cache_forget_many([
@@ -139,10 +140,8 @@ class StripeService
      *
      * @param $request
      * @param $user
-     * @param $paymentMethod
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function createOrReplaceSubscription($request, $user)
+    public function createOrReplaceSubscription($request, $user): void
     {
         try {
             // Get payment method
@@ -198,7 +197,9 @@ class StripeService
     public function getPlans()
     {
         // Get stripe plans
-        $stripe_plans = $this->stripe->plans()->all();
+        $stripe_plans = $this->stripe->plans()->all([
+            'limit' => 100,
+        ]);
 
         // Plans container
         $plans = [];
@@ -227,7 +228,9 @@ class StripeService
     public function getActivePlans()
     {
         // Get stripe plans
-        $stripe_plans = $this->stripe->plans()->all();
+        $stripe_plans = $this->stripe->plans()->all([
+            'limit' => 100,
+        ]);
 
         // Plans container
         $plans = [];