Laravel 9 support (#29)

* bump packages version * update github actions workflow * raise phpstan level to maximum * first attempt to fix phpstan errors * move stubs directory * fix mixed generic types on HasMany relations * update factories to new format * do not load factories to testbench * apply laravel/pint code styles * update readme
corcel · Jun 25, 2022 · 55b1811 · 55b1811
1 parent 3b8ffaf
commit 55b1811
Show file tree

Hide file tree

Showing 50 changed files with 704 additions and 366 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,9 +17,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.3"
-          - "7.4"
           - "8.0"
+          - "8.1"
         operating-system:
           - ubuntu-latest
           - windows-latest

diff --git a/README.md b/README.md
@@ -24,10 +24,11 @@ Some meta values are collected into helper classes:
 
 ## Compatibility list
 
-| Corcel WooCommerce                                    | Laravel        | PHP version   |
-| ----------------------------------------------------- | -------------- | ------------- |
-| [1.x](https://github.com/corcel/woocommerce/tree/1.x) | 6.x, 7.x       | >= 7.2        |
-| 2.x (master)                                          | 6.x, 7.x, 8.x  | >= 7.3 \| 8.0 |
+| Corcel WooCommerce                                    | Laravel        | PHP version   | Supported          |
+| ----------------------------------------------------- | -------------- | ------------- | ------------------ |
+| 3.x (master)                                          | 9.x            | >= 8.0.3      | :white_check_mark: |
+| [2.x](https://github.com/corcel/woocommerce/tree/2.x) | 6.x, 7.x, 8.x  | >= 7.3 \| 8.0 | :white_check_mark: |
+| [1.x](https://github.com/corcel/woocommerce/tree/1.x) | 6.x, 7.x       | >= 7.2        | :x:                |
 
 ## Installation
 

diff --git a/composer.json b/composer.json
@@ -11,18 +11,18 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "illuminate/database": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "jgrossi/corcel": "^3.0|^4.0|^5.0",
-        "nesbot/carbon": "^2.0"
+        "php": "^8.0.3",
+        "illuminate/database": "^9.0",
+        "illuminate/support": "^9.0",
+        "jgrossi/corcel": "^6.0",
+        "nesbot/carbon": "^2.53.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0|^5.0|^6.0",
-        "phpstan/phpstan": "^0.12.46",
+        "orchestra/testbench": "^7.0",
+        "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.4",
-        "laravel/legacy-factories": "^1.0",
-        "nunomaduro/larastan": "^0.7.13"
+        "nunomaduro/larastan": "^2.0",
+        "laravel/pint": "^0.2.0"
     },
     "autoload": {
         "psr-4": {
@@ -31,7 +31,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Tests\\": "tests/",
+            "Database\\Factories\\": "tests/database/factories/"
         }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -6,12 +6,12 @@ parameters:
         - src
         - tests
 
-    level: 8
+    level: max
 
     noUnnecessaryCollectionCall: false
 
     stubFiles:
-        - tests/stubs/Taxonomy.php.stub
+        - stubs/Corcel.stub
 
     ignoreErrors:
         -

diff --git a/src/Model/Builder/OrderBuilder.php b/src/Model/Builder/OrderBuilder.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Corcel\WooCommerce\Model\Builder;
@@ -97,7 +98,7 @@ public function status($status): PostBuilder
         ];
 
         if (in_array($status, $builtin)) {
-            $status = 'wc-' . $status;
+            $status = 'wc-'.$status;
         }
 
         return parent::status($status);

diff --git a/src/Model/Customer.php b/src/Model/Customer.php
@@ -1,45 +1,65 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Corcel\WooCommerce\Model;
 
 use Corcel\Model\User;
 use Corcel\WooCommerce\Traits\AddressesTrait;
 use Corcel\WooCommerce\Traits\HasRelationsThroughMeta;
+use Database\Factories\CustomerFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * @property int                                       $order_count
- * @property \Illuminate\Database\Eloquent\Collection  $orders
+ * @property int         $order_count
+ * @property Collection  $orders
  */
 class Customer extends User
 {
+    use HasFactory;
     use AddressesTrait;
+
+    /**
+     * @use HasRelationsThroughMeta<\Illuminate\Database\Eloquent\Model>
+     */
     use HasRelationsThroughMeta;
 
     /**
      * @inheritDoc
      *
-     * @var  string[]
+     * @var  array<string>
      */
     protected $appends = [
         'order_count',
     ];
 
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return CustomerFactory
+     */
+    protected static function newFactory(): CustomerFactory
+    {
+        return CustomerFactory::new();
+    }
+
     /**
      * Get order count attribute.
      *
      * @return  int
      */
     protected function getOrderCountAttribute(): int
     {
-        return (int) $this->getMeta('_order_count');
+        $count = $this->getMeta('_order_count');
+
+        return is_numeric($count) ? (int) $count : 0;
     }
 
     /**
      * Get the related orders.
      *
-     * @return  \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return  HasMany<\Illuminate\Database\Eloquent\Model>
      */
     public function orders(): HasMany
     {

diff --git a/src/Model/Item.php b/src/Model/Item.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Corcel\WooCommerce\Model;
@@ -7,6 +8,8 @@
 use Corcel\Concerns\MetaFields;
 use Corcel\Model;
 use Corcel\WooCommerce\Model\Meta\ItemMeta;
+use Database\Factories\ItemFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
@@ -31,13 +34,14 @@
  */
 class Item extends Model
 {
+    use HasFactory;
     use Aliases;
     use MetaFields;
 
     /**
      * The model aliases.
      *
-     * @var  string[][]|string[]
+     * @var  array<string, string>|array<string, array<string, string>>
      */
     protected static $aliases = [
         'id'           => 'order_item_id',
@@ -50,7 +54,7 @@ class Item extends Model
     /**
      * @inheritDoc
      *
-     * @var  string[]
+     * @var  array<string>
      */
     protected $appends = [
         'quantity',
@@ -82,70 +86,92 @@ class Item extends Model
      */
     public $timestamps = false;
 
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return ItemFactory
+     */
+    protected static function newFactory(): ItemFactory
+    {
+        return ItemFactory::new();
+    }
+
     /**
      * Get the line subtotal attribute.
      *
      * @return  string|null
      */
-    protected function getLineSubtotalAttribute()
+    protected function getLineSubtotalAttribute(): ?string
     {
-        return $this->getMeta('_line_subtotal');
+        $lineSubtotal = $this->getMeta('_line_subtotal');
+
+        return is_scalar($lineSubtotal) ? (string) $lineSubtotal : null;
     }
 
     /**
      * Get the line subtotal tax attribute.
      *
      * @return  string|null
      */
-    protected function getLineSubtotalTaxAttribute()
+    protected function getLineSubtotalTaxAttribute(): ?string
     {
-        return $this->getMeta('_line_subtotal_tax');
+        $lineSubtotalTax = $this->getMeta('_line_subtotal_tax');
+
+        return is_scalar($lineSubtotalTax) ? (string) $lineSubtotalTax : null;
     }
 
     /**
      * Get the line tax attribute.
      *
      * @return  string|null
      */
-    protected function getLineTaxAttribute()
+    protected function getLineTaxAttribute(): ?string
     {
-        return $this->getMeta('_line_tax');
+        $lineTax = $this->getMeta('_line_tax');
+
+        return is_scalar($lineTax) ? (string) $lineTax : null;
     }
 
     /**
      * Get the line total attribute.
      *
      * @return  string|null
      */
-    protected function getLineTotalAttribute()
+    protected function getLineTotalAttribute(): ?string
     {
-        return $this->getMeta('_line_total');
+        $lineTotal = $this->getMeta('_line_total');
+
+        return is_scalar($lineTotal) ? (string) $lineTotal : null;
     }
 
     /**
      * Get the quantity attribute.
      *
      * @return  string|null
      */
-    protected function getQuantityAttribute()
+    protected function getQuantityAttribute(): ?string
     {
-        return $this->getMeta('_qty');
+        $quantity = $this->getMeta('_qty');
+
+        return is_scalar($quantity) ? (string) $quantity : null;
     }
 
     /**
      * Get the tax class attribute.
      *
      * @return  string|null
      */
-    protected function getTaxClassAttribute()
+    protected function getTaxClassAttribute(): ?string
     {
-        return $this->getMeta('_tax_class');
+        $taxClass = $this->getMeta('_tax_class');
+
+        return is_scalar($taxClass) ? (string) $taxClass : null;
     }
 
     /**
      * @inheritDoc
      *
-     * @return  \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return  HasMany<ItemMeta>
      */
     public function meta(): HasMany
     {
@@ -155,7 +181,7 @@ public function meta(): HasMany
     /**
      * Get the related order.
      *
-     * @return  \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return  BelongsTo<Order, Item>
      */
     public function order(): BelongsTo
     {
@@ -165,7 +191,7 @@ public function order(): BelongsTo
     /**
      * Get the related product.
      *
-     * @return  \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return  BelongsTo<Product, Item>
      */
     public function product(): BelongsTo
     {

diff --git a/src/Model/Meta/ItemMeta.php b/src/Model/Meta/ItemMeta.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Corcel\WooCommerce\Model\Meta;