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

app/Http/Controllers/Admin/DashboardController.php

@@ -1,7 +1,6 @@
 <?php
 namespace App\Http\Controllers\Admin;
 
-use DB;
 use App\Models\User;
 use ByteUnits\Metric;
 use App\Services\StripeService;
@@ -11,9 +10,8 @@ use App\Http\Resources\UsersCollection;
 
 class DashboardController extends Controller
 {
-    /**
-     * @param StripeService $stripe
-     */
+    private StripeService $stripe;
+
     public function __construct(StripeService $stripe)
     {
         $this->stripe = $stripe;
@@ -32,7 +30,7 @@ class DashboardController extends Controller
 
         // Get total storage usage
         $storage_usage = Metric::bytes(
-            DB::table('files')->sum('filesize')
+            \DB::table('files')->sum('filesize')
         )->format();
 
         return [

app/Http/Controllers/Admin/InvoiceController.php

@@ -9,9 +9,8 @@ use App\Http\Resources\InvoiceAdminCollection;
 
 class InvoiceController extends Controller
 {
-    /**
-     * @param StripeService $stripe
-     */
+    private StripeService $stripe;
+
     public function __construct(StripeService $stripe)
     {
         $this->stripe = $stripe;

app/Http/Controllers/Admin/PagesController.php

@@ -12,6 +12,8 @@ use Illuminate\Contracts\Routing\ResponseFactory;
 
 class PagesController extends Controller
 {
+    private $demo;
+
     public function __construct()
     {
         $this->demo = resolve(DemoService::class);

app/Http/Controllers/Admin/PlanController.php

@@ -18,12 +18,13 @@ use Illuminate\Contracts\Routing\ResponseFactory;
 
 class PlanController extends Controller
 {
-    /**
-     * @param StripeService $stripe
-     */
-    public function __construct(StripeService $stripe)
+    private StripeService $stripe;
+
+    private DemoService $demo;
+
+    public function __construct()
     {
-        $this->stripe = $stripe;
+        $this->stripe = resolve(StripeService::class);
         $this->demo = resolve(DemoService::class);
     }
 

app/Http/Controllers/Admin/SettingController.php

@@ -12,9 +12,8 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class SettingController extends Controller
 {
-    /**
-     * SettingController constructor.
-     */
+    private $demo;
+
     public function __construct()
     {
         $this->demo = resolve(DemoService::class);

app/Http/Controllers/Admin/UserController.php

@@ -23,6 +23,8 @@ use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
 
 class UserController extends Controller
 {
+    private StripeService $stripe;
+
     public function __construct(StripeService $stripe)
     {
         $this->stripe = $stripe;