Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.js
#	public/chunks/app-billings.js
#	public/chunks/app-email.js
#	public/chunks/app-index.js
#	public/chunks/app-language.js
#	public/chunks/app-others.js
#	public/chunks/app-payments.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/contact-us.js
#	public/chunks/dashboard.js
#	public/chunks/database.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/installation-disclaimer.js
#	public/chunks/invoices.js
#	public/chunks/page-edit.js
#	public/chunks/pages.js
#	public/chunks/plan-create.js
#	public/chunks/plan-delete.js
#	public/chunks/plan-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/settings-create-payment-methods.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-password.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/authenticate.js
#	public/chunks/shared/file-browser.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/chunks/sign-up.js
#	public/chunks/stripe-credentials.js
#	public/chunks/subscription-plans.js
#	public/chunks/subscription-service.js
#	public/chunks/upgrade-billing.js
#	public/chunks/upgrade-plan.js
#	public/chunks/user-create.js
#	public/chunks/user-delete.js
#	public/chunks/user-detail.js
#	public/chunks/user-invoices.js
#	public/chunks/user-password.js
#	public/chunks/user-storage.js
#	public/chunks/user-subscription.js
#	public/chunks/user.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/helpers.js

app/Http/Controllers/Admin/DashboardController.php

@@ -11,9 +11,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 +31,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;

app/Http/Controllers/App/AppFunctionsController.php

@@ -25,11 +25,13 @@ class AppFunctionsController extends Controller
      *
      * @var array
      */
-    private $blacklist = [
+    private array $blacklist = [
         'purchase_code',
         'license',
     ];
 
+    private StripeService $stripe;
+
     public function __construct(StripeService $stripe)
     {
         $this->stripe = $stripe;

app/Http/Controllers/User/PaymentMethodsController.php

@@ -15,6 +15,10 @@ use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
 
 class PaymentMethodsController extends Controller
 {
+    private StripeService $stripe;
+
+    private DemoService $demo;
+
     public function __construct(StripeService $stripe)
     {
         $this->stripe = $stripe;