Fix PHPStan errors

.github/workflows/run-tests.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.2]
+        php: [8.2, 8.3]
         laravel: [10.*, 11.*]
         stability: [prefer-stable]
         include:

composer.json

@@ -20,23 +20,23 @@
         }
     ],
     "require": {
-        "php": "^8.1|^8.2",
+        "php": "^8.2|^8.3",
         "illuminate/contracts": "^10.0|^11.0",
         "illuminate/support": "^10.0|^11.0",
         "laravel/pint": "^1.17",
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "require-dev": {
-        "nunomaduro/collision": "^6.0|^7.0",
         "larastan/larastan": "^2.0.1",
+        "nunomaduro/collision": "^6.0|^7.0",
         "orangehill/iseed": "^3.0",
-        "orchestra/testbench": "^8.0|^9.0",
+        "orchestra/testbench": "*",
         "pestphp/pest": "^1.21",
         "pestphp/pest-plugin-laravel": "^1.1",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5|^10",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {

database/migrations/create_addresses_table.php

@@ -9,8 +9,8 @@
 {
     public function up()
     {
-        Schema::create(ThaiAddresses::getAddressTableName(), function (Blueprint $table) {
-            // Columns
+        $table = ThaiAddresses::getAddressTableName();
+        Schema::create($table, function (Blueprint $table) {
             $table->id('id');
             $table->morphs('addressable');
 
@@ -36,6 +36,7 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists(ThaiAddresses::getAddressTableName());
+        $table = ThaiAddresses::getAddressTableName();
+        Schema::dropIfExists($table);
     }
 };

database/migrations/create_thai_districts_table.php

@@ -9,7 +9,8 @@
 {
     public function up()
     {
-        Schema::create(ThaiAddresses::getDistrictTableName(), function (Blueprint $table) {
+        $table = ThaiAddresses::getDistrictTableName();
+        Schema::create($table, function (Blueprint $table) {
             $table->id();
 
             // add fields
@@ -24,6 +25,7 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists(ThaiAddresses::getDistrictTableName());
+        $table = ThaiAddresses::getDistrictTableName();
+        Schema::dropIfExists($table);
     }
 };

database/migrations/create_thai_geographies_table.php

@@ -9,11 +9,10 @@
 {
     public function up()
     {
-        Schema::create(ThaiAddresses::getGeographyTableName(), function (Blueprint $table) {
+        $table = ThaiAddresses::getGeographyTableName();
+        Schema::create($table, function (Blueprint $table) {
             $table->id();
 
-            // add fields
-
             $table->string('name_en');
             $table->string('name_th');
             $table->timestamps();
@@ -22,6 +21,7 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists(ThaiAddresses::getGeographyTableName());
+        $table = ThaiAddresses::getGeographyTableName();
+        Schema::dropIfExists($table);
     }
 };

database/migrations/create_thai_provinces_table.php

@@ -9,7 +9,8 @@
 {
     public function up()
     {
-        Schema::create(ThaiAddresses::getProvinceTableName(), function (Blueprint $table) {
+        $table = ThaiAddresses::getProvinceTableName();
+        Schema::create($table, function (Blueprint $table) {
 
             $table->id();
             // add fields
@@ -23,6 +24,7 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists(ThaiAddresses::getProvinceTableName());
+        $table = ThaiAddresses::getProvinceTableName();
+        Schema::dropIfExists($table);
     }
 };

database/migrations/create_thai_subdistricts_table.php

@@ -9,10 +9,9 @@
 {
     public function up()
     {
-        Schema::create(ThaiAddresses::getSubdistrictTableName(), function (Blueprint $table) {
+        $table = ThaiAddresses::getSubdistrictTableName();
+        Schema::create($table, function (Blueprint $table) {
             $table->id();
-
-            // add fields
             $table->string('zip_code');
             $table->string('name_th');
             $table->string('name_en');
@@ -24,6 +23,7 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists(ThaiAddresses::getSubdistrictTableName());
+        $table = ThaiAddresses::getSubdistrictTableName();
+        Schema::dropIfExists($table);
     }
 };

phpstan.neon.dist

@@ -2,13 +2,12 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 4
+    level: 5
     paths:
         - src
         - config
         - database
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
 

src/Facades/ThaiAddresses.php

@@ -5,17 +5,15 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \Soap\ThaiProvinces\ThaiProvinces
+ * @see \Soap\ThaiProvinces\ThaiAddesses
  */
 class ThaiAddresses extends Facade
 {
     /**
      * Alias of dynamic class, need to be registered in service provider
-     *
-     * @return string
      */
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor(): string
     {
-        return 'thai-addresses';
+        return \Soap\ThaiAddresses\ThaiAddresses::class;
     }
 }

src/Models/Address.php

@@ -48,11 +48,9 @@ class Address extends Model
         'deleted_at' => 'datetime',
     ];
 
-    public function __construct(array $attributes = [])
+    public function getTable()
     {
-        parent::__construct($attributes);
-
-        $this->table = ThaiAddresses::getAddressTableName();
+        return ThaiAddresses::getAddressTableName();
     }
 
     /**
@@ -63,10 +61,7 @@ public function addressable(): MorphTo
         return $this->morphTo('addressable', 'addressable_type', 'addressable_id', 'id');
     }
 
-    /**
-     * @return BelongsTo
-     */
-    public function subdistrict()
+    public function subdistrict(): BelongsTo
     {
         return $this->belongsTo(Subdistrict::class);
     }

src/Models/District.php

@@ -3,6 +3,8 @@
 namespace Soap\ThaiAddresses\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Soap\ThaiAddresses\Facades\ThaiAddresses;
 
 class District extends Model
@@ -13,19 +15,17 @@ class District extends Model
         'code',
     ];
 
-    public function __construct(array $attributes = [])
+    public function getTable()
     {
-        parent::__construct($attributes);
-
-        $this->table = ThaiAddresses::getDistrictTableName();
+        return ThaiAddresses::getDistrictTableName();
     }
 
-    public function province()
+    public function province(): BelongsTo
     {
         return $this->belongsTo(Province::class);
     }
 
-    public function subdistricts()
+    public function subdistricts(): HasMany
     {
         return $this->hasMany(Subdistrict::class);
     }

src/Models/Geography.php

@@ -3,6 +3,7 @@
 namespace Soap\ThaiAddresses\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Soap\ThaiAddresses\Facades\ThaiAddresses;
 
 /**
@@ -16,14 +17,12 @@ class Geography extends Model
         'name_en',
     ];
 
-    public function __construct(array $attributes = [])
+    public function getTable()
     {
-        parent::__construct($attributes);
-
-        $this->table = ThaiAddresses::getGeographyTableName();
+        return ThaiAddresses::getGeographyTableName();
     }
 
-    public function provinces()
+    public function provinces(): HasMany
     {
         return $this->hasMany(Province::class);
     }

src/Models/Province.php

@@ -3,6 +3,8 @@
 namespace Soap\ThaiAddresses\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Soap\ThaiAddresses\Facades\ThaiAddresses;
 
 class Province extends Model
@@ -13,19 +15,17 @@ class Province extends Model
         'code',
     ];
 
-    public function __construct(array $attributes = [])
+    public function getTable()
     {
-        parent::__construct($attributes);
-
-        $this->table = ThaiAddresses::getProvinceTableName();
+        return ThaiAddresses::getProvinceTableName();
     }
 
-    public function geography()
+    public function geography(): BelongsTo
     {
         return $this->belongsTo(Geography::class);
     }
 
-    public function districts()
+    public function districts(): HasMany
     {
         return $this->hasMany(District::class);
     }

src/Models/Subdistrict.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Soap\ThaiAddresses\Facades\ThaiAddresses;
 
 class Subdistrict extends Model
@@ -16,19 +18,17 @@ class Subdistrict extends Model
         'name_en',
     ];
 
-    public function __construct(array $attributes = [])
+    public function getTable()
     {
-        parent::__construct($attributes);
-
-        $this->table = ThaiAddresses::getSubdistrictTableName();
+        return ThaiAddresses::getSubdistrictTableName();
     }
 
-    public function district()
+    public function district(): BelongsTo
     {
         return $this->belongsTo(District::class);
     }
 
-    public function addresses()
+    public function addresses(): HasMany
     {
         return $this->hasMany(Address::class);
     }