feat: upgrade installation package

.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":{"CustomD\\Addressable\\Tests\\Feature\\ServiceProviderTest::it_has_provides_method":4,"CustomD\\Addressable\\Tests\\Feature\\ServiceProviderTest::it_is_a_service_provider":4},"times":{"CustomD\\Addressable\\Tests\\Feature\\ServiceProviderTest::it_has_provides_method":0.233,"CustomD\\Addressable\\Tests\\Feature\\ServiceProviderTest::it_is_a_service_provider":0.016}}

composer.json

@@ -37,15 +37,21 @@
   ],
   "require": {
     "php": "^8.0.0",
-    "illuminate/console": "^9.0.0 || ^10.0.0",
-    "illuminate/database": "^9.0.0 || ^10.0.0",
-    "illuminate/support": "^9.0.0 || ^10.0.0",
+    "illuminate/console": "^9.0.0",
+    "illuminate/database": "^9.0.0",
+    "illuminate/support": "^9.0.0",
     "jackpopp/geodistance": "^1.2.0",
-    "rinvex/countries": "^8.0.0"
+    "rinvex/countries": "^8.0.0",
+    "spatie/laravel-package-tools": "^1.9.2"
   },
   "require-dev": {
-    "codedungeon/phpunit-result-printer": "^0.31.0",
-    "illuminate/container": "^9.0.0 || ^10.0.0",
+    "illuminate/container": "^9.0.0",
+    "nunomaduro/collision": "^6.0",
+    "nunomaduro/larastan": "^2.0.1",
+    "orchestra/testbench": "^7.0",
+    "phpstan/extension-installer": "^1.1",
+    "phpstan/phpstan-deprecation-rules": "^1.0",
+    "phpstan/phpstan-phpunit": "^1.0",
     "phpunit/phpunit": "^9.5.0"
   },
   "autoload": {
@@ -59,12 +65,16 @@
     }
   },
   "scripts": {
+    "analyse": "vendor/bin/phpstan analyse",
     "test": "vendor/bin/phpunit"
   },
   "config": {
     "sort-packages": true,
     "preferred-install": "dist",
-    "optimize-autoloader": true
+    "optimize-autoloader": true,
+    "allow-plugins": {
+      "phpstan/extension-installer": true
+    }
   },
   "extra": {
     "laravel": {

database/migrations/2020_01_01_000001_create_addresses_table.php → database/migrations/create_addresses_table.php.stub

@@ -6,7 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateAddressesTable extends Migration
+return new class extends Migration
 {
     public function up()
     {
@@ -35,4 +35,4 @@ public function down()
     {
         Schema::dropIfExists(config('addressable.tables.addresses'));
     }
-}
+};

phpstan.neon.dist

@@ -1,6 +1,13 @@
 includes:
-- ./vendor/nunomaduro/larastan/extension.neon
+    - phpstan-baseline.neon
+
 parameters:
-  level: 5
-  paths:
-  - src
+    level: 5
+    paths:
+        - src
+        - config
+        - database
+    tmpDir: build/phpstan
+    checkOctaneCompatibility: true
+    checkModelProperties: true
+    checkMissingIterableValueType: false

phpunit.xml.dist

@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutCoversAnnotation="true"
-         printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
+<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="Custom D Addresssable Unit Test Suite">
             <directory suffix="Test.php">./tests/Unit</directory>

src/AddressesServiceProvider.php

@@ -5,36 +5,27 @@
 namespace CustomD\Addressable;
 
 use CustomD\Addressable\Models\Address;
-use Illuminate\Support\ServiceProvider;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-class AddressesServiceProvider extends ServiceProvider
+class AddressesServiceProvider extends PackageServiceProvider
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function register()
+    public function configurePackage(Package $package): void
     {
-        // Merge config
-        $this->mergeConfigFrom(realpath(__DIR__.'/../../config/config.php'), 'addressable');
 
-        $this->app->singleton('addressable.addresss', config('addressable.models.address'));
-
-        if(config('addressable.models.address') !== Address::class) {
-            $this->app->alias('addressable.models.address', Address::class);
-        }
+        $package
+            ->name('addressable')
+            ->hasConfigFile()
+            ->hasMigration('create_addresses_table.php');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function boot()
+    public function packageRegistered()
     {
-        $this->publishes([
-            __DIR__.'/../config/config.php' => config_path('addressable.php')
-        ], 'config');
 
-        $this->publishes([
-            __DIR__.'/../database/migrations/' => database_path('migrations')
-        ], 'migrations');
+        $this->app->singleton('addressable.addresss', config('addressable.models.address'));
+
+        if (config('addressable.models.address') !== Address::class) {
+            $this->app->alias('addressable.models.address', Address::class);
+        }
     }
 }

src/Models/Address.php

@@ -70,9 +70,6 @@ class Address extends Model
     use SoftDeletes;
     use GeoDistanceTrait;
 
-    protected $latColumn = 'latitude';
-
-    protected $lngColumn = 'longitude';
 
     /**
      * {@inheritdoc}
@@ -98,21 +95,21 @@ class Address extends Model
      * {@inheritdoc}
      */
     protected $casts = [
-        'addressable_id' => 'integer',
+        'addressable_id'   => 'integer',
         'addressable_type' => 'string',
-        'label' => 'string',
-        'given_name' => 'string',
-        'family_name' => 'string',
-        'organization' => 'string',
-        'country_code' => 'string',
-        'street' => 'string',
-        'state' => 'string',
-        'city' => 'string',
-        'postal_code' => 'string',
-        'latitude' => 'float',
-        'longitude' => 'float',
-        'is_primary' => 'boolean',
-        'deleted_at' => 'datetime',
+        'label'            => 'string',
+        'given_name'       => 'string',
+        'family_name'      => 'string',
+        'organization'     => 'string',
+        'country_code'     => 'string',
+        'street'           => 'string',
+        'state'            => 'string',
+        'city'             => 'string',
+        'postal_code'      => 'string',
+        'latitude'         => 'float',
+        'longitude'        => 'float',
+        'is_primary'       => 'boolean',
+        'deleted_at'       => 'datetime',
     ];
 
     /**
@@ -139,6 +136,10 @@ public function __construct(array $attributes = [])
     {
         $this->setTable(config('addressable.tables.addresses'));
 
+        $this->latColumn = 'latitude';
+
+        $this->lngColumn = 'longitude';
+
         parent::__construct($attributes);
     }
 

tests/Feature/ServiceProviderTest.php

@@ -5,10 +5,10 @@
 namespace CustomD\Addressable\Tests\Feature;
 
 use ReflectionClass;
-use PHPUnit\Framework\TestCase;
+use Orchestra\Testbench\TestCase;
 use Illuminate\Container\Container;
 use Illuminate\Support\ServiceProvider;
-use CustomD\Addressable\Providers\AddressesServiceProvider;
+use CustomD\Addressable\AddressesServiceProvider;
 
 class ServiceProviderTest extends TestCase
 {