From 7424f88e21bd8a51fc52c3db38a8719c8568aadc Mon Sep 17 00:00:00 2001 From: Kenneth Sese Date: Sat, 18 Feb 2023 00:32:43 -0600 Subject: [PATCH 1/4] Fixes header cell sort icon spacing --- .../tables/resources/views/components/header-cell.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tables/resources/views/components/header-cell.blade.php b/packages/tables/resources/views/components/header-cell.blade.php index 8f49651e0e..acce1f60fb 100644 --- a/packages/tables/resources/views/components/header-cell.blade.php +++ b/packages/tables/resources/views/components/header-cell.blade.php @@ -14,7 +14,7 @@ @endif type="button" @class([ - 'flex items-center w-full px-4 py-2 whitespace-nowrap space-x-1 rtl:space-x-reverse font-medium text-sm text-gray-600', + 'flex items-center w-full px-4 py-2 whitespace-nowrap font-medium text-sm text-gray-600', 'dark:text-gray-300' => config('tables.dark_mode'), 'cursor-default' => ! $sortable, match ($alignment) { @@ -48,7 +48,7 @@ Date: Sat, 18 Feb 2023 11:02:07 +0000 Subject: [PATCH 2/4] Update phpstan.yml --- .github/workflows/phpstan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 51d634ac3a..d54fd73216 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -40,4 +40,4 @@ jobs: composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "filament/support" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Run PHPStan - run: ./vendor/bin/phpstan --error-format=github + run: ./vendor/bin/phpstan From a6e213e761552e843a2836bfad005d3678a36de0 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Sat, 18 Feb 2023 11:07:07 +0000 Subject: [PATCH 3/4] fix CI --- composer.lock | 92 +++++++++---------- packages/admin/src/Facades/Filament.php | 4 +- .../src/Concerns/HasStateBindingModifiers.php | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/composer.lock b/composer.lock index f3cf14df49..c630bd1739 100644 --- a/composer.lock +++ b/composer.lock @@ -128,16 +128,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.258.11", + "version": "3.259.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5e339f47f86db7ed5f5afcda345d30ac1713aed3" + "reference": "096711644ebe5c956a97ef449fa2cb3b66443c25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5e339f47f86db7ed5f5afcda345d30ac1713aed3", - "reference": "5e339f47f86db7ed5f5afcda345d30ac1713aed3", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/096711644ebe5c956a97ef449fa2cb3b66443c25", + "reference": "096711644ebe5c956a97ef449fa2cb3b66443c25", "shasum": "" }, "require": { @@ -216,9 +216,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.258.11" + "source": "https://github.com/aws/aws-sdk-php/tree/3.259.0" }, - "time": "2023-02-15T20:08:42+00:00" + "time": "2023-02-17T19:21:38+00:00" }, { "name": "blade-ui-kit/blade-heroicons", @@ -2340,16 +2340,16 @@ }, { "name": "laravel/framework", - "version": "v10.0.0", + "version": "v10.0.3", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "be2ddb5c31b0b9ebc2738d9f37a9d4c960aa3199" + "reference": "0bd303853444de33f4fcb16d13bd7574030aa3d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/be2ddb5c31b0b9ebc2738d9f37a9d4c960aa3199", - "reference": "be2ddb5c31b0b9ebc2738d9f37a9d4c960aa3199", + "url": "https://api.github.com/repos/laravel/framework/zipball/0bd303853444de33f4fcb16d13bd7574030aa3d4", + "reference": "0bd303853444de33f4fcb16d13bd7574030aa3d4", "shasum": "" }, "require": { @@ -2536,7 +2536,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-02-14T15:12:47+00:00" + "time": "2023-02-16T22:03:27+00:00" }, { "name": "laravel/pint", @@ -4177,16 +4177,16 @@ }, { "name": "nunomaduro/larastan", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/larastan.git", - "reference": "14f631348ead3e245651606931863b4f218d1f78" + "reference": "238fdbfba3aae133cdec73e99826c9b0232141f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/14f631348ead3e245651606931863b4f218d1f78", - "reference": "14f631348ead3e245651606931863b4f218d1f78", + "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/238fdbfba3aae133cdec73e99826c9b0232141f7", + "reference": "238fdbfba3aae133cdec73e99826c9b0232141f7", "shasum": "" }, "require": { @@ -4249,7 +4249,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/larastan/issues", - "source": "https://github.com/nunomaduro/larastan/tree/2.4.0" + "source": "https://github.com/nunomaduro/larastan/tree/2.4.1" }, "funding": [ { @@ -4269,7 +4269,7 @@ "type": "patreon" } ], - "time": "2023-01-11T11:57:44+00:00" + "time": "2023-02-05T12:19:17+00:00" }, { "name": "nunomaduro/termwind", @@ -4359,24 +4359,24 @@ }, { "name": "orchestra/testbench", - "version": "v8.0.0", + "version": "v8.0.1", "source": { "type": "git", "url": "https://github.com/orchestral/testbench.git", - "reference": "800f9b91d6ce9d6fd0c5775463e0aa7d536b52d2" + "reference": "533e33d7051cba2d7f21d7e3e2dfc9975691636e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench/zipball/800f9b91d6ce9d6fd0c5775463e0aa7d536b52d2", - "reference": "800f9b91d6ce9d6fd0c5775463e0aa7d536b52d2", + "url": "https://api.github.com/repos/orchestral/testbench/zipball/533e33d7051cba2d7f21d7e3e2dfc9975691636e", + "reference": "533e33d7051cba2d7f21d7e3e2dfc9975691636e", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", "fakerphp/faker": "^1.21", - "laravel/framework": ">=10.0.0 <10.1.0", + "laravel/framework": ">=10.0.3 <10.1.0", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": ">=8.0.0 <8.1.0", + "orchestra/testbench-core": ">=8.0.1 <8.1.0", "php": "^8.1", "phpunit/phpunit": "^9.6 || ^10.0.7", "spatie/laravel-ray": "^1.32", @@ -4408,22 +4408,22 @@ ], "support": { "issues": "https://github.com/orchestral/testbench/issues", - "source": "https://github.com/orchestral/testbench/tree/v8.0.0" + "source": "https://github.com/orchestral/testbench/tree/v8.0.1" }, - "time": "2023-02-14T15:35:53+00:00" + "time": "2023-02-17T09:26:46+00:00" }, { "name": "orchestra/testbench-core", - "version": "v8.0.0", + "version": "v8.0.1", "source": { "type": "git", "url": "https://github.com/orchestral/testbench-core.git", - "reference": "4b9e7932665c52889a6727e4a6235affea8bb925" + "reference": "e7a2de7c6cd8fa8f221caa63e64499068a484c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/4b9e7932665c52889a6727e4a6235affea8bb925", - "reference": "4b9e7932665c52889a6727e4a6235affea8bb925", + "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/e7a2de7c6cd8fa8f221caa63e64499068a484c9c", + "reference": "e7a2de7c6cd8fa8f221caa63e64499068a484c9c", "shasum": "" }, "require": { @@ -4432,11 +4432,11 @@ }, "require-dev": { "fakerphp/faker": "^1.21", - "laravel/framework": "^10.0", - "laravel/pint": "^1.4", + "laravel/framework": "^10.0.3", + "laravel/pint": "^1.5", "mockery/mockery": "^1.5.1", "orchestra/canvas": "^8.0", - "phpstan/phpstan": "^1.9.14", + "phpstan/phpstan": "^1.9.17", "phpunit/phpunit": "^9.6 || ^10.0.7", "spatie/laravel-ray": "^1.32", "symfony/process": "^6.2", @@ -4446,7 +4446,7 @@ "suggest": { "brianium/paratest": "Allow using parallel tresting (^6.4 || ^7.0).", "fakerphp/faker": "Allow using Faker for testing (^1.21).", - "laravel/framework": "Required for testing (^10.0).", + "laravel/framework": "Required for testing (^10.0.3).", "mockery/mockery": "Allow using Mockery for testing (^1.5.1).", "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^6.4 || ^7.0).", "orchestra/testbench-browser-kit": "Allow using legacy Laravel BrowserKit for testing (^8.0).", @@ -4497,7 +4497,7 @@ "issues": "https://github.com/orchestral/testbench/issues", "source": "https://github.com/orchestral/testbench-core" }, - "time": "2023-02-14T04:54:05+00:00" + "time": "2023-02-17T09:16:02+00:00" }, { "name": "pestphp/pest", @@ -5238,16 +5238,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.17", + "version": "1.9.18", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2" + "reference": "f2d5cf71be91172a57c649770b73c20ebcffb0bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2", - "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f2d5cf71be91172a57c649770b73c20ebcffb0bf", + "reference": "f2d5cf71be91172a57c649770b73c20ebcffb0bf", "shasum": "" }, "require": { @@ -5277,7 +5277,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.17" + "source": "https://github.com/phpstan/phpstan/tree/1.9.18" }, "funding": [ { @@ -5293,7 +5293,7 @@ "type": "tidelift" } ], - "time": "2023-02-08T12:25:00+00:00" + "time": "2023-02-17T15:01:27+00:00" }, { "name": "phpunit/php-code-coverage", @@ -7776,16 +7776,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "10.7.10", + "version": "10.7.11", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "5c9fb62f8d4019e7fc2741d9812849661d78ed15" + "reference": "a6d562d2226c2b339db8299a3a02bacd031edabf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/5c9fb62f8d4019e7fc2741d9812849661d78ed15", - "reference": "5c9fb62f8d4019e7fc2741d9812849661d78ed15", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/a6d562d2226c2b339db8299a3a02bacd031edabf", + "reference": "a6d562d2226c2b339db8299a3a02bacd031edabf", "shasum": "" }, "require": { @@ -7868,7 +7868,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/10.7.10" + "source": "https://github.com/spatie/laravel-medialibrary/tree/10.7.11" }, "funding": [ { @@ -7880,7 +7880,7 @@ "type": "github" } ], - "time": "2023-01-19T07:58:23+00:00" + "time": "2023-02-17T08:44:20+00:00" }, { "name": "spatie/laravel-package-tools", diff --git a/packages/admin/src/Facades/Filament.php b/packages/admin/src/Facades/Filament.php index d69ed110d5..0d7c2825c5 100644 --- a/packages/admin/src/Facades/Filament.php +++ b/packages/admin/src/Facades/Filament.php @@ -26,9 +26,9 @@ use Illuminate\Support\Facades\Facade; * @method static array getStyles() * @method static Htmlable getThemeLink() * @method static string | null getUrl() - * @method static string | null getUserAvatarUrl(Authenticatable $user) + * @method static string | null getUserAvatarUrl(Model | Authenticatable $user) * @method static array getUserMenuItems() - * @method static string getUserName(Authenticatable $user) + * @method static string getUserName(Model | Authenticatable $user) * @method static array getWidgets() * @method static void globalSearchProvider(string $provider) * @method static void navigation(\Closure $builder) diff --git a/packages/forms/src/Concerns/HasStateBindingModifiers.php b/packages/forms/src/Concerns/HasStateBindingModifiers.php index 97d1ec1aa2..c6c4c3b683 100644 --- a/packages/forms/src/Concerns/HasStateBindingModifiers.php +++ b/packages/forms/src/Concerns/HasStateBindingModifiers.php @@ -65,7 +65,7 @@ trait HasStateBindingModifiers return $this->getContainer()->getStateBindingModifiers(); } - if (($this instanceof ComponentContainer) && $this->getParentComponent()) { + if ($this->getParentComponent()) { return $this->getParentComponent()->getStateBindingModifiers(); } From f356ba9dfc3854ea459baa55ce446cf0bcba3320 Mon Sep 17 00:00:00 2001 From: danharrin Date: Sat, 18 Feb 2023 11:09:35 +0000 Subject: [PATCH 4/4] chore: fix code style --- packages/forms/src/Concerns/HasStateBindingModifiers.php | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/forms/src/Concerns/HasStateBindingModifiers.php b/packages/forms/src/Concerns/HasStateBindingModifiers.php index c6c4c3b683..db89a4134b 100644 --- a/packages/forms/src/Concerns/HasStateBindingModifiers.php +++ b/packages/forms/src/Concerns/HasStateBindingModifiers.php @@ -2,7 +2,6 @@ namespace Filament\Forms\Concerns; -use Filament\Forms\ComponentContainer; use Filament\Forms\Components\Component; use Illuminate\Support\Str;