Auth::getUser() -> Auth::user()

OFFLINE-GmbH · Aug 31, 2024 · 9d5da54 · 9d5da54
1 parent cae8643
commit 9d5da54
Show file tree

Hide file tree

Showing 29 changed files with 56 additions and 54 deletions.
diff --git a/classes/cart/DiscountApplier.php b/classes/cart/DiscountApplier.php
@@ -147,7 +147,7 @@ private function productIsInCart(int $productId): bool
 
     private function userBelongsToCustomerGroup(int $customerGroupId): bool
     {
-        $group = optional(Auth::getUser())->customer_group();
+        $group = optional(Auth::user())->customer_group();
 
         if (! $group) {
             return false;

diff --git a/classes/customer/DefaultSignInHandler.php b/classes/customer/DefaultSignInHandler.php
@@ -56,7 +56,7 @@ protected function login(array $data)
         // RainLab.User 3.0 compatibility
         if (class_exists(Setting::class)) {
             if (Auth::attempt(['email' => $credentials['login'], 'password' => $credentials['password']], true)) {
-                $user = Auth::getUser();
+                $user = Auth::user();
             } else {
                 throw new AuthException('rainlab.user::lang.account.invalid_login');
             }

diff --git a/classes/downloads/VirtualProductFileDownload.php b/classes/downloads/VirtualProductFileDownload.php
@@ -31,7 +31,7 @@ public function handle(string $key)
 
         // Redirect the user to the login page if a session is required but
         // no user is logged in.
-        if ($product->file_session_required && ! Auth::getUser()) {
+        if ($product->file_session_required && ! Auth::user()) {
             return $this->redirectToLogin();
         }
 
@@ -69,7 +69,7 @@ public function handle(string $key)
         // If no file is around, return and log an error. The site admin needs to fix this!
         Log::error(
             '[OFFLINE.Mall] A virtual product without a file attachment has been purchased. You need to fix this!',
-            ['grant' => $grant, 'product' => $product, 'user' => Auth::getUser()]
+            ['grant' => $grant, 'product' => $product, 'user' => Auth::user()]
         );
 
         return response($this->trans('not_found'), 500);

diff --git a/classes/pricing/concerns/ApplyDiscounts.php b/classes/pricing/concerns/ApplyDiscounts.php
@@ -168,7 +168,7 @@ protected function productIsInCart(int $id): bool
     protected function userBelongsToCustomerGroup(int $id): bool
     {
         /** @ignore @disregard facade alias for \RainLab\User\Classes\AuthManager */
-        $group = optional(Auth::getUser())->customer_group();
+        $group = optional(Auth::user())->customer_group();
 
         return $group ? $group->where('id', $id)->exists() : false;
     }

diff --git a/classes/traits/FilteredTaxes.php b/classes/traits/FilteredTaxes.php
@@ -56,7 +56,7 @@ public function getFilteredTaxes($taxes)
      */
     public function getCartCountryId()
     {
-        $cart = Cart::byUser(Auth::getUser());
+        $cart = Cart::byUser(Auth::user());
 
         if (!$cart) {
             return null;

diff --git a/classes/traits/UserSpecificPrice.php b/classes/traits/UserSpecificPrice.php
@@ -10,7 +10,7 @@ trait UserSpecificPrice
 {
     public function getUserSpecificPrice(Price $original)
     {
-        $group = optional(Auth::getUser())->customer_group;
+        $group = optional(Auth::user())->customer_group;
 
         if (! $this->hasUserSpecificPrice()) {
             return $this->checkDiscount($group, $original);
@@ -51,7 +51,7 @@ protected function checkDiscount(?CustomerGroup $group, Price $original): ?Price
     protected function hasUserSpecificPrice(): bool
     {
         return ! app()->runningInBackend()
-            && optional(Auth::getUser())->offline_mall_customer_group_id !== null
+            && optional(Auth::user())->offline_mall_customer_group_id !== null
             && $this->customer_group_prices->count() > 0;
     }
 }
diff --git a/classes/traits/cart/Discounts.php b/classes/traits/cart/Discounts.php
@@ -32,7 +32,7 @@ public function applyDiscount(Discount $discount, int $discountCodeLimit = 0)
         }
 
         $previousOrderDiscounts = collect();
-        $customer = optional(Auth::getUser())->customer;
+        $customer = optional(Auth::user())->customer;
 
         if (optional($customer)->orders) {
             $previousOrderDiscounts = $customer->orders->map(fn ($order) => array_get($order, 'discounts.0.discount.id'));

diff --git a/components/AddressForm.php b/components/AddressForm.php
@@ -132,14 +132,14 @@ public function getSetOptions()
      */
     public function setData()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (! $user) {
             return false;
         }
 
         $this->setVar('setAddressAs', $this->property('set'));
-        $this->setVar('cart', Cart::byUser(Auth::getUser()));
+        $this->setVar('cart', Cart::byUser(Auth::user()));
         $this->setVar('countries', Country::getNameList());
         $this->setVar('useState', GeneralSettings::get('use_state', true));
 
@@ -180,7 +180,7 @@ public function onRun()
     public function onSubmit()
     {
         $this->setData();
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (! $user) {
             return $this->controller->run('404');

diff --git a/components/AddressList.php b/components/AddressList.php
@@ -82,7 +82,7 @@ public function defineProperties()
      */
     public function init()
     {
-        if ($user = Auth::getUser()) {
+        if ($user = Auth::user()) {
             $this->addresses = $user->customer->addresses;
             $this->defaultBillingAddressId = $user->customer->default_billing_address_id;
             $this->defaultShippingAddressId = $user->customer->default_shipping_address_id;
@@ -128,7 +128,7 @@ public function onChangeDefaultBillingAddress()
     public function updateDefaultAddressFromUser(string $type)
     {
         $id = $this->decode(post('id'));
-        $user = Auth::getUser();
+        $user = Auth::user();
         $customer = $user->customer;
         $cart = Cart::byUser($user);
 
@@ -160,7 +160,7 @@ public function updateDefaultAddressFromUser(string $type)
     public function onDelete()
     {
         $id = $this->decode(post('id'));
-        $user = Auth::getUser();
+        $user = Auth::user();
         $customer = $user->customer;
         $cart = Cart::byUser($user);
         $address = Address::byCustomer($customer)->where('id', $id)->first();
@@ -174,7 +174,7 @@ public function onDelete()
         }
 
         $address->delete();
-        $this->addresses = Auth::getUser()->load('customer')->customer->addresses;
+        $this->addresses = Auth::user()->load('customer')->customer->addresses;
 
         $defaultAddress = Address::byCustomer($customer)->first();
 

diff --git a/components/AddressSelector.php b/components/AddressSelector.php
@@ -117,7 +117,7 @@ public function getTypeOptions()
      */
     public function init()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
         $this->setVar('cart', Cart::byUser($user));
     }
 
@@ -130,7 +130,7 @@ public function onRun()
     {
         $this->setData();
 
-        if (Auth::getUser() && $this->addresses->count() < 1) {
+        if (Auth::user() && $this->addresses->count() < 1) {
             Flash::warning(trans('offline.mall::frontend.flash.missing_address'));
 
             $url = $this->controller->pageUrl($this->addressPage, [
@@ -152,7 +152,7 @@ public function onRun()
      */
     public function onChangeAddress()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
         $this->setData();
 
         $this->setVar('addresses', Address::byCustomer($user->customer)->get());
@@ -167,7 +167,7 @@ public function onChangeAddress()
      */
     public function onUpdateAddress()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
         $this->setData();
 
         $data  = post();
@@ -208,7 +208,7 @@ public function onUpdateAddress()
      */
     protected function setData()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (! $user) {
             return;

diff --git a/components/Cart.php b/components/Cart.php
@@ -163,7 +163,7 @@ public function onRun()
      */
     public function setData()
     {
-        $cart = CartModel::byUser(Auth::getUser());
+        $cart = CartModel::byUser(Auth::user());
         $cart->loadMissing(['products', 'products.custom_field_values', 'discounts']);
 
         if ($cart->shipping_method_id === null) {
@@ -189,7 +189,7 @@ public function onUpdateQuantity()
     {
         $id = $this->decode(input('id'));
 
-        $cart    = CartModel::byUser(Auth::getUser());
+        $cart    = CartModel::byUser(Auth::user());
         $product = $this->getProductFromCart($cart, $id);
 
         if (!$product) {
@@ -216,7 +216,7 @@ public function onRemoveProduct()
     {
         $id = $this->decode(input('id'));
 
-        $cart = CartModel::byUser(Auth::getUser());
+        $cart = CartModel::byUser(Auth::user());
 
         $product = $this->getProductFromCart($cart, $id);
 
@@ -246,7 +246,7 @@ public function onRemoveDiscountCode()
     {
         $id = $this->decode(input('id'));
 
-        $cart = CartModel::byUser(Auth::getUser());
+        $cart = CartModel::byUser(Auth::user());
 
         $cart->removeDiscountCodeById($id);
 

diff --git a/components/Checkout.php b/components/Checkout.php
@@ -240,7 +240,7 @@ public function stepUrl($step, $params = [])
      */
     protected function setData()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (! $user) {
             return;

diff --git a/components/CustomerProfile.php b/components/CustomerProfile.php
@@ -59,7 +59,7 @@ public function defineProperties()
     public function init()
     {
         /** @ignore @disregard facade alias for \RainLab\User\Classes\AuthManager */
-        $this->user = Auth::getUser();
+        $this->user = Auth::user();
     }
 
     /**

diff --git a/components/DiscountApplier.php b/components/DiscountApplier.php
@@ -55,7 +55,7 @@ public function defineProperties()
     public function onApplyDiscount()
     {
         $code = strtoupper(post('code'));
-        $cart = Cart::byUser(Auth::getUser());
+        $cart = Cart::byUser(Auth::user());
 
         try {
             $cart->applyDiscountByCode($code, (int)$this->property('discountCodeLimit'));

diff --git a/components/OrdersList.php b/components/OrdersList.php
@@ -66,7 +66,7 @@ public function defineProperties()
      */
     public function init()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (!$user || !$user->customer) {
             return;
@@ -81,7 +81,7 @@ public function init()
 
     public function onCancelOrder()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (! $user) {
             return;

diff --git a/components/PaymentMethodSelector.php b/components/PaymentMethodSelector.php
@@ -234,7 +234,7 @@ public function renderPaymentForm()
      */
     protected function setData()
     {
-        $user = Auth::getUser();
+        $user = Auth::user();
 
         if (! $user) {
             return;

diff --git a/components/Product.php b/components/Product.php
@@ -552,7 +552,7 @@ function (Variant $variant) {
      */
     protected function addToCart(ProductModel $product, $quantity, $variant, $values, array $serviceOptions = [])
     {
-        $cart = Cart::byUser(Auth::getUser());
+        $cart = Cart::byUser(Auth::user());
 
         $serviceOptions = array_filter($serviceOptions);
 

diff --git a/components/ProductReviews.php b/components/ProductReviews.php
@@ -100,7 +100,7 @@ public function setData()
         $this->accountPage      = GeneralSettings::get('account_page');
         $this->isModerated      = ReviewSettings::get('moderated');
 
-        if (Auth::getUser()) {
+        if (Auth::user()) {
             $this->canReview = true;
         } else {
             $this->canReview = ReviewSettings::get('allow_anonymous', false);
@@ -122,8 +122,8 @@ public function setData()
             ->when($this->property('variant'), function ($q) {
                 $q->where('variant_id', $this->property('variant'));
             })
-            ->when(optional(Auth::getUser())->customer, function ($q) {
-                $q->where('customer_id', Auth::getUser()->customer->id);
+            ->when(optional(Auth::user())->customer, function ($q) {
+                $q->where('customer_id', Auth::user()->customer->id);
             }, function ($q) {
                 $q->where('user_hash', Review::getUserHash());
             })
@@ -162,7 +162,7 @@ public function onCreate()
             $review->fill($data);
             $review->product_id  = $this->property('product');
             $review->variant_id  = $this->property('variant');
-            $review->customer_id = optional(optional(Auth::getUser())->customer)->id;
+            $review->customer_id = optional(optional(Auth::user())->customer)->id;
 
             if (! $this->isModerated) {
                 $review->approved_at = now();

diff --git a/components/Products.php b/components/Products.php
@@ -280,7 +280,7 @@ public function onAddToCart()
                 ->firstOrFail();
         }
 
-        $cart     = CartModel::byUser(Auth::getUser());
+        $cart     = CartModel::byUser(Auth::user());
         $quantity = (int)post('quantity', $product->quantity_default ?? 1);
 
         if ($quantity < 1) {

diff --git a/components/QuickCheckout.php b/components/QuickCheckout.php
@@ -366,7 +366,7 @@ public function onRemoveProduct()
     {
         $id = $this->decode(input('id'));
 
-        $cart = Cart::byUser(FrontendAuth::getUser());
+        $cart = Cart::byUser(FrontendAuth::user());
 
         $product = $this->getProductFromCart($cart, $id);
 
@@ -392,7 +392,7 @@ public function onRemoveDiscountCode()
     {
         $id = $this->decode(input('id'));
 
-        $cart = Cart::byUser(Auth::getUser());
+        $cart = Cart::byUser(Auth::user());
 
         $cart->removeDiscountCodeById($id);
 
@@ -478,7 +478,7 @@ protected function setData()
         $this->currentPage = $this->page->page->getBaseFileName();
         $this->setVar('accountPage', GeneralSettings::get('account_page'));
 
-        $this->setVar('user', Auth::getUser());
+        $this->setVar('user', Auth::user());
 
         $cart = Cart::byUser($this->user);
 
@@ -531,11 +531,11 @@ protected function setData()
      */
     protected function getCustomerMethods()
     {
-        if (! optional(Auth::getUser())->customer) {
+        if (! optional(Auth::user())->customer) {
             return collect([]);
         }
 
-        return optional(Auth::getUser()->customer->payment_methods)->groupBy('payment_method_id');
+        return optional(Auth::user()->customer->payment_methods)->groupBy('payment_method_id');
     }
 
     /**

diff --git a/components/ShippingMethodSelector.php b/components/ShippingMethodSelector.php
@@ -150,7 +150,7 @@ public function onChangeMethod()
     protected function setData()
     {
         $this->skipIfOnlyOneAvailable = (bool)$this->property('skipIfOnlyOneAvailable');
-        $this->setVar('cart', Cart::byUser(Auth::getUser()));
+        $this->setVar('cart', Cart::byUser(Auth::user()));
         $this->setVar('methods', ShippingMethod::getAvailableByCart($this->cart));
         $this->setVar('shippingSelectionBeforePayment', GeneralSettings::get('shipping_selection_before_payment', false));	// Needed by themes
     }