Merge pull request #2 from laravelcm/setup-tests

Setup pest

Author: mckenziearts

.gitignore

@@ -1,7 +1,5 @@
-/build
 /vendor
-/node_modules
-composer.lock
-composer.phar
-phpunit.xml
 /.idea
+/vscode
+composer.lock
+.phpunit.result.cache

composer.json

@@ -32,20 +32,19 @@
   ],
   "require": {
     "php": "^8.1",
-    "illuminate/console": "^9.0.0 || ^10.0.0",
-    "illuminate/database": "^9.0.0 || ^10.0.0",
-    "illuminate/support": "^9.0.0 || ^10.0.0",
-    "rinvex/laravel-support": "^6.0.0",
+    "illuminate/console": "^9.0|^10.0",
+    "illuminate/container": "^9.0|^10.0",
+    "illuminate/database": "^9.0|^10.0",
+    "illuminate/support": "^9.0|^10.0",
     "spatie/eloquent-sortable": "^4.0.0",
     "spatie/laravel-package-tools": "^1.16",
     "spatie/laravel-sluggable": "^3.4.2",
     "spatie/laravel-translatable": "^6.5.0"
   },
   "require-dev": {
-    "codedungeon/phpunit-result-printer": "^0.31.0",
-    "illuminate/container": "^9.0.0 || ^10.0.0",
     "laravel/pint": "^1.13",
     "nunomaduro/larastan": "^2.0",
+    "orchestra/testbench": "^7.0|^8.0",
     "pestphp/pest": "^2.18"
   },
   "autoload": {
@@ -55,7 +54,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Laravelcm\\Subscriptions\\Tests\\": "tests"
+      "Tests\\": "tests"
     }
   },
   "scripts": {

phpstan.neon

@@ -3,7 +3,7 @@ includes:
 
 parameters:
 
-  level: 7
+  level: 0
 
   paths:
     - src

phpunit.xml.dist

@@ -1,44 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutCoversAnnotation="true"
-         printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
+         backupStaticProperties="true">
     <testsuites>
-        <testsuite name="Rinvex Subscriptions Unit Test Suite">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-        <testsuite name="Rinvex Subscriptions Feature Test Suite">
+        <testsuite name="Test Suite">
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap" />
-        <log type="junit" target="build/report.junit.xml" />
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true" />
-        <log type="coverage-text" target="build/coverage.txt" />
-        <log type="coverage-clover" target="build/logs/clover.xml" />
-    </logging>
+    <source>
+        <exclude>
+            <directory suffix=".php">src/</directory>
+        </exclude>
+    </source>
     <php>
-        <server name="APP_ENV" value="testing" />
-        <server name="CACHE_DRIVER" value="array" />
-        <server name="SESSION_DRIVER" value="array" />
-        <server name="QUEUE_CONNECTION" value="sync" />
-        <server name="DB_CONNECTION" value="sqlite" />
-        <server name="DB_DATABASE" value=":memory:" />
+        <server name="APP_ENV" value="testing"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <server name="SESSION_DRIVER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
+        <server name="DB_CONNECTION" value="sqlite"/>
+        <server name="DB_DATABASE" value=":memory:"/>
     </php>
 </phpunit>

src/Models/Feature.php

@@ -5,18 +5,17 @@
 namespace Laravelcm\Subscriptions\Models;
 
 use Carbon\Carbon;
-use Spatie\Sluggable\SlugOptions;
-use Rinvex\Support\Traits\HasSlug;
-use Spatie\EloquentSortable\Sortable;
 use Illuminate\Database\Eloquent\Model;
-use Laravelcm\Subscriptions\Services\Period;
-use Rinvex\Support\Traits\HasTranslations;
-use Rinvex\Support\Traits\ValidatingTrait;
-use Spatie\EloquentSortable\SortableTrait;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Laravelcm\Subscriptions\Traits\BelongsToPlan;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Laravelcm\Subscriptions\Traits\HasSlug;
+use Laravelcm\Subscriptions\Traits\HasTranslations;
+use Laravelcm\Subscriptions\Services\Period;
+use Laravelcm\Subscriptions\Traits\BelongsToPlan;
+use Spatie\EloquentSortable\Sortable;
+use Spatie\EloquentSortable\SortableTrait;
+use Spatie\Sluggable\SlugOptions;
 
 /**
  * Laravelcm\Subscriptions\Models\PlanFeature.
@@ -59,7 +58,6 @@ final class Feature extends Model implements Sortable
     use HasTranslations;
     use SoftDeletes;
     use SortableTrait;
-    use ValidatingTrait;
 
     protected $fillable = [
         'plan_id',
@@ -82,11 +80,6 @@ final class Feature extends Model implements Sortable
         'deleted_at' => 'datetime',
     ];
 
-    protected $observables = [
-        'validating',
-        'validated',
-    ];
-
     /**
      * The attributes that are translatable.
      *
@@ -97,45 +90,13 @@ final class Feature extends Model implements Sortable
         'description',
     ];
 
-    /**
-     * The sortable settings.
-     *
-     * @var array
-     */
-    public $sortable = [
+    public array $sortable = [
         'order_column_name' => 'sort_order',
     ];
 
-    /**
-     * The default rules that the model will validate against.
-     *
-     * @var array
-     */
-    protected $rules = [];
-
-    /**
-     * Whether the model should throw a
-     * ValidationException if it fails validation.
-     *
-     * @var bool
-     */
-    protected $throwValidationExceptions = true;
-
-    public function __construct(array $attributes = [])
+    public function getTable(): string
     {
-        $this->setTable(config('laravel-subscriptions.tables.features'));
-        $this->mergeRules([
-            'plan_id' => 'required|integer|exists:'.config('laravel-subscriptions.tables.plans').',id',
-            'slug' => 'required|alpha_dash|max:150|unique:'.config('laravel-subscriptions.tables.features').',slug',
-            'name' => 'required|string|strip_tags|max:150',
-            'description' => 'nullable|string|max:32768',
-            'value' => 'required|string',
-            'resettable_period' => 'sometimes|integer',
-            'resettable_interval' => 'sometimes|in:hour,day,week,month',
-            'sort_order' => 'nullable|integer|max:100000',
-        ]);
-
-        parent::__construct($attributes);
+        return config('laravel-subscriptions.tables.features');
     }
 
     protected static function boot(): void

src/Models/Plan.php

@@ -5,12 +5,11 @@
 namespace Laravelcm\Subscriptions\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Rinvex\Support\Traits\ValidatingTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Rinvex\Support\Traits\HasTranslations;
-use Rinvex\Support\Traits\HasSlug;
+use Laravelcm\Subscriptions\Traits\HasSlug;
+use Laravelcm\Subscriptions\Traits\HasTranslations;
 use Spatie\EloquentSortable\SortableTrait;
 use Spatie\Sluggable\SlugOptions;
 use Spatie\EloquentSortable\Sortable;
@@ -74,7 +73,6 @@ final class Plan extends Model implements Sortable
     use HasTranslations;
     use SoftDeletes;
     use SortableTrait;
-    use ValidatingTrait;
 
     protected $fillable = [
         'slug',
@@ -117,11 +115,6 @@ final class Plan extends Model implements Sortable
         'deleted_at' => 'datetime',
     ];
 
-    protected $observables = [
-        'validating',
-        'validated',
-    ];
-
     /**
      * The attributes that are translatable.
      *
@@ -132,55 +125,13 @@ final class Plan extends Model implements Sortable
         'description',
     ];
 
-    /**
-     * The sortable settings.
-     *
-     * @var array
-     */
-    public $sortable = [
+    public array $sortable = [
         'order_column_name' => 'sort_order',
     ];
 
-    /**
-     * The default rules that the model will validate against.
-     *
-     * @var array
-     */
-    protected $rules = [];
-
-    /**
-     * Whether the model should throw a
-     * ValidationException if it fails validation.
-     *
-     * @var bool
-     */
-    protected $throwValidationExceptions = true;
-
-    public function __construct(array $attributes = [])
+    public function getTable(): string
     {
-        $this->setTable(config('laravel-subscriptions.tables.plans'));
-        $this->mergeRules([
-            'slug' => 'required|alpha_dash|max:150|unique:'.config('laravel-subscriptions.tables.plans').',slug',
-            'name' => 'required|string|strip_tags|max:150',
-            'description' => 'nullable|string|max:32768',
-            'is_active' => 'sometimes|boolean',
-            'price' => 'required|numeric',
-            'signup_fee' => 'required|numeric',
-            'currency' => 'required|alpha|size:3',
-            'trial_period' => 'sometimes|integer|max:100000',
-            'trial_interval' => 'sometimes|in:hour,day,week,month',
-            'invoice_period' => 'sometimes|integer|max:100000',
-            'invoice_interval' => 'sometimes|in:hour,day,week,month',
-            'grace_period' => 'sometimes|integer|max:100000',
-            'grace_interval' => 'sometimes|in:hour,day,week,month',
-            'sort_order' => 'nullable|integer|max:100000',
-            'prorate_day' => 'nullable|integer|max:150',
-            'prorate_period' => 'nullable|integer|max:150',
-            'prorate_extend_due' => 'nullable|integer|max:150',
-            'active_subscribers_limit' => 'nullable|integer|max:100000',
-        ]);
-
-        parent::__construct($attributes);
+        return config('laravel-subscriptions.tables.plans');
     }
 
     protected static function boot(): void
@@ -226,13 +177,6 @@ public function hasGrace(): bool
         return $this->grace_period && $this->grace_interval;
     }
 
-    /**
-     * Get plan feature by the given slug.
-     *
-     * @param string $featureSlug
-     *
-     * @return \Laravelcm\Subscriptions\Models\Feature|null
-     */
     public function getFeatureBySlug(string $featureSlug): ?Feature
     {
         return $this->features()->where('slug', $featureSlug)->first();