SilvertipSoftware · aksonnic · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
@@ -20,17 +20,9 @@ jobs:
         run: |
           composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-      - name: PHP Lint
+      - name: Code Validation
         run: |
-          composer run lint-php
-
-      - name: Check code style
-        run: |
-          composer run cs
-
-      - name: Check PHP compatibility
-        run: |
-          composer run cscompat8
+          composer run code-validate
 
   phpunit:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ when updating laravel version:
  - MethodCallingRule comes back
  - HasTraits booting/initialize of traits
  - getForeignKey -> getForeignKeyName for BelongsTo
-- WithJson can use Resources
+ - WithJson can use Resources
 
 
 # Laravel Support Package

diff --git a/composer.json b/composer.json
@@ -23,15 +23,19 @@
     },
     "scripts": {
         "check-all": [
+            "@code-validate",
+            "@ut"
+        ],
+        "code-validate": [
             "@lint",
             "@cs",
             "@stan",
-            "@ut"
+            "@cscompat81"
         ],
         "cs": "vendor/bin/phpcs --standard=devops/style --report-width=80 --colors .",
         "lint": "vendor/bin/parallel-lint --exclude .git --exclude vendor --colors .",
         "stan": "vendor/bin/phpstan analyse --configuration=devops/phpstan.neon",
         "ut": "vendor/bin/phpunit",
-        "cscompat81": "vendor/bin/phpcs --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --colors --runtime-set testVersion 8.1- --ignore=blade.php src tests"
+        "cscompat81": "vendor/bin/phpcs --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --colors --runtime-set testVersion 8.1- --ignore=tests/views/ src tests"
     }
 }
diff --git a/devops/containers/compose.env b/devops/containers/compose.env
@@ -0,0 +1 @@
+APP_SERVICE=support
diff --git a/devops/containers/compose.yml b/devops/containers/compose.yml
@@ -0,0 +1,17 @@
+version: '3'
+name: support
+
+x-var-check:
+    - SUPPORT_PATH: ${SUPPORT_PATH?missing}
+
+services:
+    support:
+        image: vpf/support-php8.2-alpine3.19
+        build:
+            context: ${SUPPORT_PATH}
+            dockerfile: ./devops/containers/dev/Dockerfile
+        volumes:
+            - type: bind
+              source: ${SUPPORT_PATH}
+              target: /var/www/html
+
diff --git a/devops/containers/dev/Dockerfile b/devops/containers/dev/Dockerfile
@@ -0,0 +1,19 @@
+FROM php:8.2-fpm-alpine3.19
+
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
+RUN install-php-extensions \
+    bz2 \
+    calendar \
+    exif \
+    gd \
+    gettext \
+    intl \
+    pcntl \
+    pdo_mysql \
+    shmop \
+    sockets \
+    zip
+
+
+# install composer
+COPY --from=composer:2.5 /usr/bin/composer /usr/bin/composer
diff --git a/devops/phpstan.neon b/devops/phpstan.neon
@@ -6,7 +6,6 @@ parameters:
     paths:
         - ../src
 
-    checkGenericClassInNonGenericObjectType: false
     reportUnmatchedIgnoredErrors: false
 
     ignoreErrors:

diff --git a/src/Blade/FormBuilder.php b/src/Blade/FormBuilder.php
@@ -113,7 +113,7 @@ public function checkBox(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -139,7 +139,7 @@ public function collectionCheckBoxes(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -165,7 +165,7 @@ public function collectionRadioButtons(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -270,7 +270,7 @@ public function fileField(string $method, array $options = []): HtmlString {
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -532,7 +532,7 @@ public function yieldingButton(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      * @return HtmlStringGenerator
@@ -562,7 +562,7 @@ public function yieldingCollectionCheckBoxes(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      * @return HtmlStringGenerator
@@ -710,7 +710,7 @@ protected function yieldingFieldsForNestedModel(string $name, ?object $object, a
     }
 
     /**
-     * @param array<mixed>|Model|Collection|null $association
+     * @param array<mixed>|Model|Collection<array-key, mixed>|null $association
      * @param OptionHash $options
      * @return HtmlStringGenerator
      */

diff --git a/src/Blade/FormOptionsHelper.php b/src/Blade/FormOptionsHelper.php
@@ -22,7 +22,7 @@ trait FormOptionsHelper {
     use TagHelper;
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -58,7 +58,7 @@ public static function collectionCheckBoxes(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -94,7 +94,7 @@ public static function collectionRadioButtons(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -120,7 +120,7 @@ public static function collectionSelect(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -152,7 +152,7 @@ public static function groupedCollectionSelect(
     }
 
     /**
-     * @param array<mixed>|Collection $groupedOptions
+     * @param array<mixed>|Collection<array-key, mixed> $groupedOptions
      * @param OptionHash $options
      */
     public static function groupedOptionsForSelect(
@@ -191,7 +191,7 @@ public static function groupedOptionsForSelect(
     }
 
     /**
-     * @param string|array<mixed>|Collection $container
+     * @param string|array<mixed>|Collection<array-key, mixed> $container
      */
     public static function optionsForSelect(
         string|array|Collection|null $container,
@@ -237,7 +237,7 @@ public static function optionsForSelect(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder $collection
      */
     public static function optionsFromCollectionForSelect(
         array|Collection|QueryBuilder $collection,
@@ -267,7 +267,7 @@ public static function optionsFromCollectionForSelect(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder $collection
      */
     public static function optionGroupsFromCollectionForSelect(
         array|Collection|QueryBuilder $collection,
@@ -307,7 +307,7 @@ public static function optionGroupsFromCollectionForSelect(
     }
 
     /**
-     * @param string|Stringable|array<mixed>|Collection|null $choices
+     * @param string|Stringable|array<mixed>|Collection<array-key, mixed>|null $choices
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      */
@@ -416,7 +416,7 @@ public static function weekdaySelect(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      * @return HtmlStringGenerator
@@ -453,7 +453,7 @@ public static function yieldingCollectionCheckBoxes(
     }
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      * @return HtmlStringGenerator
@@ -490,7 +490,7 @@ public static function yieldingCollectionRadioButtons(
     }
 
     /**
-     * @param string|Stringable|array<mixed>|Collection|null $choices
+     * @param string|Stringable|array<mixed>|Collection<array-key, mixed>|null $choices
      * @param OptionHash $options
      * @param OptionHash $htmlOptions
      * @return HtmlStringGenerator
@@ -576,7 +576,7 @@ protected static function extractSelectedAndDisabled(mixed $selected): array {
     }
 
     /**
-     * @param array<mixed>|Collection $collection
+     * @param array<mixed>|Collection<array-key, mixed> $collection
      */
     protected static function extractValuesFromCollection(
         array|Collection $collection,

diff --git a/src/Blade/Tags/CollectionHelpers.php b/src/Blade/Tags/CollectionHelpers.php
@@ -16,7 +16,7 @@
 trait CollectionHelpers {
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder|null $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder|null $collection
      * @param array<string,mixed> $options
      * @param array<string,mixed> $htmlOptions
      */

diff --git a/src/Blade/Tags/CollectionSelect.php b/src/Blade/Tags/CollectionSelect.php
@@ -13,7 +13,7 @@
 class CollectionSelect extends Base {
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder $collection
      * @param array<string,mixed> $options
      * @param array<string,mixed> $htmlOptions
      */

diff --git a/src/Blade/Tags/GroupedCollectionSelect.php b/src/Blade/Tags/GroupedCollectionSelect.php
@@ -13,7 +13,7 @@
 class GroupedCollectionSelect extends Base {
 
     /**
-     * @param array<mixed>|Collection|QueryBuilder $collection
+     * @param array<mixed>|Collection<array-key, mixed>|QueryBuilder $collection
      * @param array<string,mixed> $options
      * @param array<string,mixed> $htmlOptions
      */

diff --git a/src/Eloquent/AutosavesRelations.php b/src/Eloquent/AutosavesRelations.php
@@ -182,7 +182,7 @@ protected function pushAutosavedModels(?array $models, string $relationName, arr
     }
 
     /**
-     * @param Collection|Model|array<Model>|null $value
+     * @param Collection<array-key, Model>|Model|array<Model>|null $value
      * @param array<string,mixed> $pushOptions
      */
     protected function pushAutosavedRelation(

diff --git a/src/Eloquent/FluentModel.php b/src/Eloquent/FluentModel.php
@@ -8,14 +8,17 @@
 use Illuminate\Support\Str;
 use SilvertipSoftware\LaravelSupport\Libs\StrongParameters\Parameters;
 
+/**
+ * @extends Fluent<string, mixed>
+ */
 class FluentModel extends Fluent implements ModelContract {
     use HasEvents,
         Naming,
         Translation,
         Validation;
 
     /**
-     * @param array<string,mixed>|Arrayable $attributes
+     * @param array<string, mixed>|Arrayable<string, mixed> $attributes
      */
     public function __construct(array|Arrayable $attributes = []) {
         parent::__construct([]);
@@ -25,7 +28,7 @@ public function __construct(array|Arrayable $attributes = []) {
     }
 
     /**
-     * @param array<string,mixed>|Arrayable $attributes
+     * @param array<string, mixed>|Arrayable<string, mixed> $attributes
      */
     public function fill(array|Arrayable $attributes): static {
         $attributes = $attributes instanceof Arrayable

diff --git a/src/Eloquent/Model.php b/src/Eloquent/Model.php
@@ -20,7 +20,7 @@ class Model extends EloquentModel implements ModelContract {
     protected $guarded = [];
 
     /**
-     * @param array<string,mixed>|Arrayable $attributes
+     * @param array<string, mixed>|Arrayable<string, mixed> $attributes
      */
     public function __construct(array|Arrayable $attributes = []) {
         $attributes = $attributes instanceof Arrayable

diff --git a/src/Eloquent/Naming/Name.php b/src/Eloquent/Naming/Name.php
@@ -8,6 +8,9 @@
 use Illuminate\Support\Fluent;
 use Illuminate\Support\Str;
 
+/**
+ * @extends Fluent<string, mixed>
+ */
 class Name extends Fluent {
 
     public static string|Closure $rootModelNamespace = 'App\\Models';

diff --git a/src/Eloquent/Transactions.php b/src/Eloquent/Transactions.php
@@ -12,7 +12,7 @@
 trait Transactions {
 
     /**
-     * @param array<string, mixed>|Arrayable $attributes
+     * @param array<string, mixed>|Arrayable<string, mixed> $attributes
      */
     public static function createOrFail(array|Arrayable $attributes = []): static {
         $attrs = $attributes instanceof Arrayable
@@ -62,7 +62,7 @@ public function saveOrFail(array $options = []): bool {
     }
 
     /**
-     * @param array<string, mixed>|Arrayable $attributes
+     * @param array<string, mixed>|Arrayable<string, mixed> $attributes
      * @param array<string, mixed> $options
      */
     public function update(array|Arrayable $attributes = [], array $options = []) {
@@ -77,7 +77,7 @@ public function update(array|Arrayable $attributes = [], array $options = []) {
     }
 
     /**
-     * @param array<string, mixed>|Arrayable $attributes
+     * @param array<string, mixed>|Arrayable<string, mixed> $attributes
      * @param array<string, mixed> $options
      */
     public function updateOrFail(array|Arrayable $attributes = [], array $options = []) {

diff --git a/src/Libs/StrongParameters/Parameters.php b/src/Libs/StrongParameters/Parameters.php
@@ -14,6 +14,10 @@
 use RuntimeException;
 use SilvertipSoftware\LaravelSupport\Libs\ArrUtils;
 
+/**
+ * @implements ArrayAccess<string, mixed>
+ * @implements Arrayable<string, mixed>
+ */
 class Parameters implements Arrayable, ArrayAccess, Jsonable, JsonSerializable {
 
     /** @var array<array<string,mixed>|Parameters> */
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ parameters: @@
         paths:
             - ../src
-        checkGenericClassInNonGenericObjectType: false
         reportUnmatchedIgnoredErrors: false
         ignoreErrors:
@@ Expand Down @@