Update FUNDING.yml (#218)

* Update FUNDING.yml * fix code formatting --------- Co-authored-by: mckenziearts <[email protected]>
shopperlabs · Aug 22, 2023 · 7aa868a · 7aa868a
1 parent b8c8927
commit 7aa868a
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 39 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-open_collective: shopperlabs
+github: mckenziearts
diff --git a/src/Contracts/ReviewRateable.php b/src/Contracts/ReviewRateable.php
@@ -35,9 +35,9 @@ public function sumRating();
 
     public function ratingPercent(int $max = 5): float;
 
-    public function rating(array $data, Model $author, ?Model $parent = null);
+    public function rating(array $data, Model $author, Model $parent = null);
 
-    public function updateRating(int $id, array $data, ?Model $parent = null);
+    public function updateRating(int $id, array $data, Model $parent = null);
 
     public function getAllRatings(int $id, string $sort = 'desc');
 

diff --git a/src/Helpers/helpers.php b/src/Helpers/helpers.php
@@ -142,7 +142,7 @@ function shopper_currency(): string
     /**
      * Return money format.
      */
-    function shopper_money_format($amount, ?string $currency = null): string
+    function shopper_money_format($amount, string $currency = null): string
     {
         $money = new Money($amount, new Currency($currency ?? shopper_currency()));
         $currencies = new ISOCurrencies();

diff --git a/src/Http/Controllers/Auth/ResetPasswordController.php b/src/Http/Controllers/Auth/ResetPasswordController.php
@@ -23,7 +23,7 @@ public function __construct()
         $this->middleware('guest');
     }
 
-    public function showResetForm(Request $request, ?string $token = null): View
+    public function showResetForm(Request $request, string $token = null): View
     {
         return view('shopper::auth.passwords.reset-password')->with(
             ['token' => $token, 'email' => $request->email]

diff --git a/src/Http/Livewire/Orders/Browse.php b/src/Http/Livewire/Orders/Browse.php
@@ -14,27 +14,27 @@ class Browse extends Component
 {
     public function render(): View
     {
-//        $order = Order::query()->create([
-//            'number' => generate_number(),
-//            'price_amount' => 28600,
-//            'currency' => shopper_currency(),
-//            'shipping_total' => 50,
-//            'shipping_method' => 'Vero Shop',
-//            'shipping_address_id' => 1,
-//            'payment_method_id' => 1,
-//            'user_id' => 2,
-//        ]);
-//
-//        $product = Product::find(3);
-//        OrderItem::query()->create([
-//            'name' => $product->name,
-//            'sku' => $product->sku,
-//            'quantity' => 2,
-//            'unit_price_amount' => $product->price_amount,
-//            'order_id' => $order->id,
-//            'product_id' => $product->id,
-//            'product_type' => config('shopper.system.models.product'),
-//        ]);
+        //        $order = Order::query()->create([
+        //            'number' => generate_number(),
+        //            'price_amount' => 28600,
+        //            'currency' => shopper_currency(),
+        //            'shipping_total' => 50,
+        //            'shipping_method' => 'Vero Shop',
+        //            'shipping_address_id' => 1,
+        //            'payment_method_id' => 1,
+        //            'user_id' => 2,
+        //        ]);
+        //
+        //        $product = Product::find(3);
+        //        OrderItem::query()->create([
+        //            'name' => $product->name,
+        //            'sku' => $product->sku,
+        //            'quantity' => 2,
+        //            'unit_price_amount' => $product->price_amount,
+        //            'order_id' => $order->id,
+        //            'product_id' => $product->id,
+        //            'product_type' => config('shopper.system.models.product'),
+        //        ]);
 
         return view('shopper::livewire.orders.browse', [
             'total' => Order::query()->count(),

diff --git a/src/Http/Livewire/Settings/Integrations/Browse.php b/src/Http/Livewire/Settings/Integrations/Browse.php
@@ -49,7 +49,7 @@ public function mount(): void
     /**
      * Confirmation modal.
      */
-    public function confirmationEnable(string $provider, ?string $message = null): void
+    public function confirmationEnable(string $provider, string $message = null): void
     {
         $this->currentProvider = $provider;
         $this->confirmModalActivation = true;

diff --git a/src/Models/Shop/Product/Attribute.php b/src/Models/Shop/Product/Attribute.php
@@ -4,11 +4,11 @@
 
 namespace Shopper\Framework\Models\Shop\Product;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Shopper\Framework\Models\Traits\HasSlug;
-use Illuminate\Database\Eloquent\Builder;
 
 class Attribute extends Model
 {

diff --git a/src/Models/Shop/Product/Brand.php b/src/Models/Shop/Product/Brand.php
@@ -60,7 +60,7 @@ public function registerMediaCollections(): void
             ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png']);
     }
 
-    public function registerMediaConversions(?Media $media = null): void
+    public function registerMediaConversions(Media $media = null): void
     {
         $this->addMediaConversion('thumb200x200')
             ->fit(Manipulations::FIT_CROP, 200, 200);

diff --git a/src/Models/Shop/Product/Category.php b/src/Models/Shop/Product/Category.php
@@ -62,7 +62,7 @@ public function registerMediaCollections(): void
             ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png']);
     }
 
-    public function registerMediaConversions(?Media $media = null): void
+    public function registerMediaConversions(Media $media = null): void
     {
         $this->addMediaConversion('thumb200x200')
             ->fit(Manipulations::FIT_CROP, 200, 200);

diff --git a/src/Models/Shop/Product/Collection.php b/src/Models/Shop/Product/Collection.php
@@ -59,7 +59,7 @@ public function registerMediaCollections(): void
             ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png']);
     }
 
-    public function registerMediaConversions(?Media $media = null): void
+    public function registerMediaConversions(Media $media = null): void
     {
         $this->addMediaConversion('thumb200x200')
             ->fit(Manipulations::FIT_CROP, 200, 200);

diff --git a/src/Models/Shop/Product/Product.php b/src/Models/Shop/Product/Product.php
@@ -131,7 +131,7 @@ public function registerMediaCollections(): void
             ->useFallbackUrl(url(shopper_prefix() . '/images/product_placeholder.jpg'));
     }
 
-    public function registerMediaConversions(?Media $media = null): void
+    public function registerMediaConversions(Media $media = null): void
     {
         $this->addMediaConversion('thumb200x200')
             ->fit(Manipulations::FIT_CROP, 200, 200);

diff --git a/src/Models/Traits/HasSlug.php b/src/Models/Traits/HasSlug.php
@@ -36,7 +36,7 @@ protected function generateUniqueSlug(string $value): string
         return $slug;
     }
 
-    private function slugExists(string $slug, ?int $ignoreId = null): bool
+    private function slugExists(string $slug, int $ignoreId = null): bool
     {
         $query = $this->where('slug', $slug);
 

diff --git a/src/Models/Traits/HasStock.php b/src/Models/Traits/HasStock.php
@@ -17,7 +17,7 @@ public function getStockAttribute(): int
         return $this->stock();
     }
 
-    public function stock(?DateTimeInterface $date = null): int
+    public function stock(DateTimeInterface $date = null): int
     {
         $date = $date ? $date : Carbon::now();
 
@@ -30,7 +30,7 @@ public function stock(?DateTimeInterface $date = null): int
             ->sum('quantity');
     }
 
-    public function stockInventory(int $inventoryId, ?string $date = null): int
+    public function stockInventory(int $inventoryId, string $date = null): int
     {
         $date = $date ?: Carbon::now();
 
@@ -59,7 +59,7 @@ public function mutateStock(int $inventoryId, int $quantity = 1, array $argument
         return $this->createStockMutation($quantity, $inventoryId, $arguments);
     }
 
-    public function clearStock(?int $inventoryId = null, ?int $newQuantity = null, array $arguments = []): bool
+    public function clearStock(int $inventoryId = null, int $newQuantity = null, array $arguments = []): bool
     {
         $this->inventoryHistories()->delete();
 

diff --git a/src/Models/Traits/ReviewRateable.php b/src/Models/Traits/ReviewRateable.php
@@ -157,12 +157,12 @@ public function ratingPercent(int $max = 5): float
         return round($quantity * $max > 0 ? ((int) $total * 100) / $quantity : 0, 1);
     }
 
-    public function rating(array $data, Model $author, ?Model $parent = null): Review
+    public function rating(array $data, Model $author, Model $parent = null): Review
     {
         return (new Review())->createRating($this, $data, $author);
     }
 
-    public function updateRating($id, $data, ?Model $parent = null): Review
+    public function updateRating($id, $data, Model $parent = null): Review
     {
         return (new Review())->updateRating($id, $data);
     }

diff --git a/src/Models/User/Permission.php b/src/Models/User/Permission.php
@@ -37,7 +37,7 @@ public static function groups(): array
     /**
      * Generate permissions for the group name.
      */
-    public static function generate(string $item, ?string $group = null): void
+    public static function generate(string $item, string $group = null): void
     {
         self::query()->firstOrCreate([
             'name' => 'browse_' . $item,