Merge pull request #228 from szepeviktor/phpstan1

database/factories/AddressFactory.php

@@ -11,7 +11,7 @@ class AddressFactory extends Factory
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Address::class;
 

database/factories/CartFactory.php

@@ -6,12 +6,15 @@
 use Cone\Bazar\Models\Cart;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class CartFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Cart::class;
 

database/factories/CategoryFactory.php

@@ -11,7 +11,7 @@ class CategoryFactory extends Factory
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Category::class;
 

database/factories/ItemFactory.php

@@ -5,12 +5,15 @@
 use Cone\Bazar\Models\Item;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class ItemFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Item::class;
 

database/factories/OrderFactory.php

@@ -7,12 +7,15 @@
 use Cone\Bazar\Models\Transaction;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class OrderFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Order::class;
 

database/factories/ProductFactory.php

@@ -8,12 +8,15 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class ProductFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Product::class;
 

database/factories/PropertyFactory.php

@@ -6,12 +6,15 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class PropertyFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Property::class;
 

database/factories/PropertyValueFactory.php

@@ -5,12 +5,15 @@
 use Cone\Bazar\Models\PropertyValue;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class PropertyValueFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = PropertyValue::class;
 

database/factories/ShippingFactory.php

@@ -6,12 +6,15 @@
 use Cone\Bazar\Support\Facades\Shipping as Manager;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class ShippingFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Shipping::class;
 

database/factories/TransactionFactory.php

@@ -6,12 +6,15 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Date;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class TransactionFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Transaction::class;
 

database/factories/VariantFactory.php

@@ -7,12 +7,15 @@
 use Cone\Root\Models\Meta;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 class VariantFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
-     * @var string
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
      */
     protected $model = Variant::class;
 

phpstan.neon.dist

@@ -13,3 +13,13 @@ parameters:
     checkMissingIterableValueType: false
     ignoreErrors:
         - '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model::#'
+        # Incorrect framework types
+        -
+            path: 'src/Traits/HasPrices.php'
+            message: '#^Parameter \#2 \$type of method Illuminate\\Database\\Eloquent\\Model::getMorphs\(\) expects string, null given\.$#'
+            count: 2
+        -
+            path: 'src/Traits/HasPrices.php'
+            message: '#^Parameter \#3 \$id of method Illuminate\\Database\\Eloquent\\Model::getMorphs\(\) expects string, null given\.$#'
+            count: 2
+

src/Models/Address.php

@@ -20,7 +20,7 @@ class Address extends Model implements Contract
     /**
      * The accessors to append to the model's array form.
      *
-     * @var array
+     * @var list<string>
      */
     protected $appends = [
         'name',
@@ -62,7 +62,7 @@ class Address extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'address_secondary',

src/Models/Cart.php

@@ -50,7 +50,7 @@ class Cart extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'currency',
@@ -101,6 +101,8 @@ public function getMorphClass(): string
 
     /**
      * Get the order for the cart.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\Cone\Bazar\Models\Order, \Cone\Bazar\Models\Cart>
      */
     public function order(): BelongsTo
     {

src/Models/Category.php

@@ -22,7 +22,7 @@ class Category extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'description',

src/Models/Item.php

@@ -26,7 +26,7 @@ class Item extends Model implements Contract
     /**
      * The accessors to append to the model's array form.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $appends = [
         'subtotal',
@@ -60,7 +60,7 @@ class Item extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'buyable_id',
@@ -75,7 +75,7 @@ class Item extends Model implements Contract
     /**
      * The attributes that should be hidden for arrays.
      *
-     * @var array
+     * @var list<string>
      */
     protected $hidden = [
         'itemable',

src/Models/Order.php

@@ -51,7 +51,7 @@ class Order extends Model implements Contract
     /**
      * The accessors to append to the model's array form.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $appends = [
         'formatted_discount',
@@ -87,7 +87,7 @@ class Order extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'currency',

src/Models/Product.php

@@ -36,7 +36,7 @@ class Product extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'description',

src/Models/Property.php

@@ -20,7 +20,7 @@ class Property extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'name',

src/Models/PropertyValue.php

@@ -18,7 +18,7 @@ class PropertyValue extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'name',

src/Models/Shipping.php

@@ -47,7 +47,7 @@ class Shipping extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'cost',

src/Models/Transaction.php

@@ -28,7 +28,7 @@ class Transaction extends Model implements Contract
     /**
      * The accessors to append to the model's array form.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $appends = [
         'driver_name',
@@ -47,7 +47,7 @@ class Transaction extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'amount',
@@ -90,6 +90,8 @@ public function getMorphClass(): string
 
     /**
      * Get the order for the transaction.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\Cone\Bazar\Models\Order, \Cone\Bazar\Models\Transaction>
      */
     public function order(): BelongsTo
     {

src/Models/Variant.php

@@ -36,7 +36,7 @@ class Variant extends Model implements Contract
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var list<string>
      */
     protected $fillable = [
         'alias',

src/Traits/InteractsWithItemables.php

@@ -20,6 +20,8 @@ public function items(): MorphMany
 
     /**
      * Get the products for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough<\Cone\Bazar\Models\Order>
      */
     public function orders(): HasManyThrough
     {
@@ -30,6 +32,8 @@ public function orders(): HasManyThrough
 
     /**
      * Get the carts for the product.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough<\Cone\Bazar\Models\Cart>
      */
     public function carts(): HasManyThrough
     {