Fixing phpstan

bildvitta · Aug 19, 2024 · e4288b3 · e4288b3
1 parent f5e101c
commit e4288b3
Show file tree

Hide file tree

Showing 12 changed files with 268 additions and 124 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,12 +12,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [8.0]
-        laravel: [8.*]
+        os: [ubuntu-latest]
+        php: [8.3]
+        laravel: [11.*]
         stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 8.*
+          - laravel: 11.*
             testbench: ^6.23
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
@@ -30,7 +30,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, sockets
           coverage: none
 
       - name: Setup problem matchers

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ testbench.yaml
 vendor
 node_modules
 .php-cs-fixer.cache
+.phpunit.cache
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -6,6 +6,7 @@
 $finder = Finder::create()
     ->exclude('bootstrap')
     ->exclude('storage')
+    ->exclude('build')
     ->in(__DIR__);
 
 $config = new Config();

diff --git a/composer.json b/composer.json
@@ -17,23 +17,24 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1",
+        "php": "^7.4|^8.0|^8.1",
         "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
         "bildvitta/sp-produto": "^0.1",
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "require-dev": {
-        "nunomaduro/collision": "^5.10",
-        "nunomaduro/larastan": "^1.0",
-        "orchestra/testbench": "^6.22",
-        "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",
-        "spatie/laravel-ray": "^1.26",
-        "friendsofphp/php-cs-fixer": "^3.1"
+        "nunomaduro/collision": "^8.1.1||^7.10.0",
+        "larastan/larastan": "^2.9",
+        "orchestra/testbench": "^9.0.0||^8.22.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.3",
+        "spatie/laravel-ray": "^1.35",
+        "friendsofphp/php-cs-fixer": "^3.1",
+        "laravel/pint": "^1.14"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,13 +2,11 @@ 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,39 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/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"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
 >
     <testsuites>
-        <testsuite name="iss-vendas Test Suite">
+        <testsuite name="VendorName Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+    <logging>
+        <junit outputFile="build/report.junit.xml" />
+    </logging>
+    <source>
         <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>
+    </source>
 </phpunit>
diff --git a/src/Models/PersonalizationSale/Additives/PersonalizationAdditive.php b/src/Models/PersonalizationSale/Additives/PersonalizationAdditive.php
@@ -2,14 +2,104 @@
 
 namespace Bildvitta\IssVendas\Models\PersonalizationSale\Additives;
 
+use Bildvitta\IssVendas\Models\PersonalizationSale\PersonalizationSale;
+use Bildvitta\IssVendas\Models\Produto\Personalization;
+use Bildvitta\IssVendas\Models\Sale;
 use Bildvitta\IssVendas\Traits\UsesVendasDB;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 
+/**
+ * App\Models\PersonalizationSale\Additives\PersonalizationAdditive
+ *
+ * @property int $id
+ * @property string $uuid
+ * @property string $additive_type
+ * @property string $status
+ * @property string|null $legal_document_status
+ * @property int $sale_id
+ * @property int $personalization_sale_id
+ * @property string|null $attachment
+ * @property string|null $personalization_description
+ * @property int $code
+ * @property string|null $document_uuid
+ * @property int $creator_id
+ * @property float|null $actual_value
+ * @property float|null $additive_value
+ * @property float|null $amount
+ * @property bool|null $incc
+ * @property string|null $operation
+ * @property string|null $discount_form
+ * @property string|null $bank
+ * @property string|null $bank_agency
+ * @property string|null $bank_account
+ * @property bool $is_integrated
+ * @property \Illuminate\Support\Carbon|null $integration_sent_date
+ * @property \Illuminate\Support\Carbon|null $integration_date
+ * @property object|null $added_personalizations
+ * @property object|null $removed_personalizations
+ * @property object|null $new_personalizations
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read User $creator
+ * @property-read Collection $final_added_personalizations
+ * @property-read Collection $final_personalizations
+ * @property-read Collection $final_removed_personalizations
+ * @property-read Collection $get_added_personalizations
+ * @property-read Collection $get_new_personalizations
+ * @property-read Collection $get_removed_personalizations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PersonalizationSale\Additives\PersonalizationAdditivePeriodicity> $periodicities
+ * @property-read int|null $periodicities_count
+ * @property-read PersonalizationSale $personalization_sale
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Personalization> $personalizations
+ * @property-read int|null $personalizations_count
+ * @property-read Sale $sale
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive onlyTrashed()
+ * @method static Builder|BaseModel pagination()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive query()
+ * @method static Builder|BaseModel search()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereActualValue($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereAddedPersonalizations($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereAdditiveType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereAdditiveValue($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereAmount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereAttachment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereBank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereBankAccount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereBankAgency($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereCreatorId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereDiscountForm($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereDocumentUuid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereIncc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereIntegrationDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereIntegrationSentDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereIsIntegrated($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereLegalDocumentStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereNewPersonalizations($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereOperation($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive wherePersonalizationDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive wherePersonalizationSaleId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereRemovedPersonalizations($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereSaleId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive whereUuid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationAdditive withoutTrashed()
+ * @mixin \Eloquent
+ */
 class PersonalizationAdditive extends Model
 {
     use UsesVendasDB;
@@ -118,10 +208,10 @@ public function personalization_sale(): BelongsTo
         return $this->belongsTo(PersonalizationSale::class, 'personalization_sale_id', 'id');
     }
 
-    public function creator(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'creator_id', 'id')->withTrashed();
-    }
+    // public function creator(): BelongsTo
+    // {
+    //     return $this->belongsTo(User::class, 'creator_id', 'id')->withTrashed();
+    // }
 
     public function personalizations(): BelongsToMany
     {

diff --git a/src/Models/PersonalizationSale/PersonalizationSale.php b/src/Models/PersonalizationSale/PersonalizationSale.php
@@ -2,6 +2,7 @@
 
 namespace Bildvitta\IssVendas\Models\PersonalizationSale;
 
+use Bildvitta\IssVendas\Models\PersonalizationSale\Additives\PersonalizationAdditive;
 use Bildvitta\IssVendas\Models\Produto\Personalization;
 use Bildvitta\IssVendas\Models\Sale;
 use Bildvitta\IssVendas\Traits\UsesVendasDB;
@@ -11,6 +12,69 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+/**
+ * App\Models\PersonalizationSale\PersonalizationSale
+ *
+ * @property int $id
+ * @property string $uuid
+ * @property string $type
+ * @property string $status
+ * @property int $sale_id
+ * @property float $amount
+ * @property bool $incc
+ * @property string|null $attachment
+ * @property string|null $personalization_description
+ * @property int $code
+ * @property bool $integration
+ * @property string|null $legal_document_status
+ * @property string|null $document_uuid
+ * @property int|null $mega_code
+ * @property \Illuminate\Support\Carbon|null $sent_date
+ * @property \Illuminate\Support\Carbon|null $integration_date
+ * @property int $creator_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read User $creator
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PersonalizationSale\PersonalizationSaleDescription> $descriptions
+ * @property-read int|null $descriptions_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Personalization> $final_personalizations
+ * @property-read int|null $final_personalizations_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PersonalizationSale\PersonalizationSalePeriodicity> $periodicities
+ * @property-read int|null $periodicities_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Personalization> $personalizations
+ * @property-read int|null $personalizations_count
+ * @property-read Sale $sale
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale onlyTrashed()
+ * @method static Builder|BaseModel pagination()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale query()
+ * @method static Builder|BaseModel search()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereAmount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereAttachment($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereCreatorId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereDocumentUuid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereIncc($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereIntegration($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereIntegrationDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereLegalDocumentStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereMegaCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale wherePersonalizationDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereSaleId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereSentDate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale whereUuid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|PersonalizationSale withoutTrashed()
+ * @mixin \Eloquent
+ */
 class PersonalizationSale extends Model
 {
     use UsesVendasDB;
@@ -85,10 +149,10 @@ public function sale(): BelongsTo
         return $this->belongsTo(Sale::class)->withoutGlobalScopes();
     }
 
-    public function creator(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'creator_id', 'id');
-    }
+    // public function creator(): BelongsTo
+    // {
+    //     return $this->belongsTo(User::class, 'creator_id', 'id');
+    // }
 
     public function personalizations(): BelongsToMany
     {

diff --git a/src/Models/Produto/Personalization.php b/src/Models/Produto/Personalization.php
@@ -8,6 +8,24 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+/**
+ * App\Models\Produto\Personalization
+ *
+ * @property int $id
+ * @property string $uuid
+ * @property string $name
+ * @property string|null $value
+ * @property string $description
+ * @property bool $is_active
+ * @property int $real_estate_development_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Produto\Environment> $environments
+ * @property-read int|null $environments_count
+ * @property-read \App\Models\Produto\RealEstateDevelopment $real_estate_development
+ * @mixin \Eloquent
+ */
 class Personalization extends Model
 {
     use UsesVendasDB;
@@ -39,8 +57,8 @@ public function environments(): BelongsToMany
         return $this->belongsToMany(Environment::class, prefixTableName('environment_personalization'), 'personalization_id', 'environment_id');
     }
 
-    public function real_estate_development(): BelongsTo
-    {
-        return $this->belongsTo(RealEstateDevelopment::class, 'real_estate_development_id', 'id');
-    }
+    // public function real_estate_development(): BelongsTo
+    // {
+    //     return $this->belongsTo(RealEstateDevelopment::class, 'real_estate_development_id', 'id');
+    // }
 }