Merge pull request #24 from soap/develop

Develop
soap · Nov 12, 2024 · 08c602a · 08c602a
2 parents b3fc740 + 50c8d33
commit 08c602a
Show file tree

Hide file tree

Showing 48 changed files with 428 additions and 530 deletions.
diff --git a/.github/workflows/run-tests.yml b/.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:

diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
@@ -0,0 +1 @@
+{"version":"pest_2.36.0","defects":[],"times":{"P\\Tests\\Feature\\UserTest::__pest_evaluable_user_can_have_address":0.097,"P\\Tests\\Unit\\DatabaseSeederTest::__pest_evaluable_seeder_command_is_working":0.092,"P\\Tests\\Unit\\DatabaseSeederTest::__pest_evaluable_seeder_commands_are_working":0.08}}
diff --git a/composer.json b/composer.json
@@ -20,23 +20,23 @@
         }
     ],
     "require": {
-        "php": "^8.1|^8.2",
-        "illuminate/contracts": "^10.0|^11.0",
-        "illuminate/support": "^10.0|^11.0",
-        "laravel/pint": "^1.17",
-        "spatie/laravel-package-tools": "^1.9.2"
+        "php": "^8.2|^8.3",
+        "illuminate/contracts": "^10.0||^11.0",
+        "illuminate/support": "^10.0||^11.0",
+        "spatie/laravel-package-tools": "^1.16"
     },
     "require-dev": {
-        "nunomaduro/collision": "^6.0|^7.0",
-        "larastan/larastan": "^2.0.1",
+        "larastan/larastan": "^2.9",
+        "laravel/pint": "^1.17",
+        "nunomaduro/collision": "^8.1.1|^7.10",
         "orangehill/iseed": "^3.0",
-        "orchestra/testbench": "^8.0|^9.0",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.1",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "orchestra/testbench": "^8.22||^9.0",
+        "pestphp/pest": "^2.34",
+        "pestphp/pest-plugin-arch": "^2.7",
+        "pestphp/pest-plugin-laravel": "^2.3",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {
@@ -48,14 +48,32 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Soap\\ThaiAddresses\\Tests\\": "tests/src",
-            "Soap\\ThaiAddresses\\Tests\\Database\\": "tests/database"
+            "Soap\\ThaiAddresses\\Tests\\": "tests",
+            "Workbench\\App\\": "workbench/app/",
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
+            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
         }
     },
     "scripts": {
         "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest",
-        "test-coverage": "vendor/bin/pest --coverage"
+        "test-coverage": "vendor/bin/pest --coverage",
+        "post-autoload-dump": [
+            "@clear",
+            "@prepare"
+        ],
+        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
+        "prepare": "@php vendor/bin/testbench package:discover --ansi",
+        "build": "@php vendor/bin/testbench workbench:build --ansi",
+        "serve": [
+            "Composer\\Config::disableProcessTimeout",
+            "@build",
+            "@php vendor/bin/testbench serve --ansi"
+        ],
+        "lint": [
+            "@php vendor/bin/pint --ansi",
+            "@php vendor/bin/phpstan analyse --verbose --ansi"
+        ]
     },
     "config": {
         "sort-packages": true,
@@ -70,7 +88,7 @@
                 "Soap\\ThaiAddresses\\ThaiAddressesServiceProvider"
             ],
             "aliases": {
-                "ThaiProvinces": "Soap\\ThaiAddresses\\Facades\\ThaiAddresses"
+                "ThaiAddresses": "Soap\\ThaiAddresses\\Facades\\ThaiAddresses"
             }
         }
     },

diff --git a/database/migrations/create_addresses_table.php b/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);
     }
 };
diff --git a/database/migrations/create_thai_districts_table.php b/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);
     }
 };
diff --git a/database/migrations/create_thai_geographies_table.php b/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);
     }
 };
diff --git a/database/migrations/create_thai_provinces_table.php b/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);
     }
 };
diff --git a/database/migrations/create_thai_subdistricts_table.php b/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);
     }
 };
diff --git a/database/seeders/DistrictSeeder.php b/database/seeders/DistrictSeeder.php
@@ -11,7 +11,11 @@ class DistrictSeeder extends Seeder
     public function run()
     {
         District::query()->delete();
-        $json = File::get(base_path('vendor/soap/thai-addresses/database/seeders/data/districts.json'));
+        if (File::exists(base_path('vendor/soap/thai-addresses/database/seeders/data/districts.json'))) {
+            $json = File::get(base_path('vendor/soap/thai-addresses/database/seeders/data/districts.json'));
+        } else {
+            $json = File::get(realpath('database/seeders/data/districts.json'));
+        }
         $districts = json_decode($json);
 
         foreach ($districts as $item) {

diff --git a/database/seeders/GeographySeeder.php b/database/seeders/GeographySeeder.php
@@ -11,7 +11,11 @@ class GeographySeeder extends Seeder
     public function run()
     {
         Geography::query()->delete();
-        $json = File::get(base_path('vendor/soap/thai-addresses/database/seeders/data/geographies.json'));
+        if (File::exists(base_path('/vendor/soap/thai-addresses/database/seeders/data/geographies.json'))) {
+            $json = File::get(base_path('/vendor/soap/thai-addresses/database/seeders/data/geographies.json'));
+        } else {
+            $json = File::get(__DIR__.'/data/geographies.json');
+        }
         $geographies = json_decode($json);
 
         foreach ($geographies as $item) {

diff --git a/database/seeders/ProvinceSeeder.php b/database/seeders/ProvinceSeeder.php
@@ -12,7 +12,12 @@ class ProvinceSeeder extends Seeder
     public function run()
     {
         Province::query()->delete();
-        $json = File::get(base_path('vendor/soap/thai-addresses/database/seeders/data/provinces.json'));
+        if (File::exists(base_path('/vendor/soap/thai-addresses/database/seeders/data/provinces.json'))) {
+            $json = File::get(base_path('/vendor/soap/thai-addresses/database/seeders/data/provinces.json'));
+        } else {
+            $json = File::get(__DIR__.'/data/provinces.json');
+        }
+
         $provinces = json_decode($json);
 
         foreach ($provinces as $item) {

diff --git a/database/seeders/SubdistrictSeeder.php b/database/seeders/SubdistrictSeeder.php
@@ -11,7 +11,12 @@ class SubdistrictSeeder extends Seeder
     public function run()
     {
         Subdistrict::query()->delete();
-        $json = File::get(base_path('vendor/soap/thai-addresses/database/seeders/data/subdistricts.json'));
+        if (File::exists(base_path('/vendor/soap/thai-addresses/database/seeders/data/subdistricts.json'))) {
+            $json = File::get(base_path('/vendor/soap/thai-addresses/database/seeders/data/subdistricts.json'));
+        } else {
+            $json = File::get(__DIR__.'/data/subdistricts.json');
+        }
+
         $subdistricts = json_decode($json);
 
         foreach ($subdistricts as $item) {

diff --git a/phpstan.neon.dist b/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
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,43 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="Soap Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
-    <php>
-        <env name="DB_CONNECTION" value="testing"/>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Unit Test Suite">
+      <directory>tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Feature Test Suite">
+      <directory>tests/Feature</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <php>
+    <env name="DB_CONNECTION" value="testing"/>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Facades/ThaiAddresses.php b/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;
     }
 }
diff --git a/src/Models/Address.php b/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);
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"version":"pest_2.36.0","defects":[],"times":{"P\\Tests\\Feature\\UserTest::__pest_evaluable_user_can_have_address":0.097,"P\\Tests\\Unit\\DatabaseSeederTest::__pest_evaluable_seeder_command_is_working":0.092,"P\\Tests\\Unit\\DatabaseSeederTest::__pest_evaluable_seeder_commands_are_working":0.08}}