diff --git a/composer.lock b/composer.lock index e6f16d72..d1207be1 100644 --- a/composer.lock +++ b/composer.lock @@ -871,16 +871,16 @@ }, { "name": "doctrine/dbal", - "version": "3.7.0", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf" + "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/00d03067f07482f025d41ab55e4ba0db5eca2cdf", - "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/5b7bd66c9ff58c04c5474ab85edce442f8081cb2", + "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2", "shasum": "" }, "require": { @@ -964,7 +964,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.7.0" + "source": "https://github.com/doctrine/dbal/tree/3.7.1" }, "funding": [ { @@ -980,7 +980,7 @@ "type": "tidelift" } ], - "time": "2023-09-26T20:56:55+00:00" + "time": "2023-10-06T05:06:20+00:00" }, { "name": "doctrine/deprecations", @@ -1480,7 +1480,7 @@ }, { "name": "filament/actions", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/actions.git", @@ -1530,16 +1530,16 @@ }, { "name": "filament/filament", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/panels.git", - "reference": "2b117b084052bfe81b23aadf090ddeba684ddcf5" + "reference": "baec6443c3da947a85eab748fe46bd48fe88499b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/panels/zipball/2b117b084052bfe81b23aadf090ddeba684ddcf5", - "reference": "2b117b084052bfe81b23aadf090ddeba684ddcf5", + "url": "https://api.github.com/repos/filamentphp/panels/zipball/baec6443c3da947a85eab748fe46bd48fe88499b", + "reference": "baec6443c3da947a85eab748fe46bd48fe88499b", "shasum": "" }, "require": { @@ -1591,20 +1591,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2023-10-06T15:56:56+00:00" + "time": "2023-10-09T13:12:32+00:00" }, { "name": "filament/forms", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/forms.git", - "reference": "81ee2d2ef6322f53442fd27c8e40d925e1594ce2" + "reference": "259f89de086d99bf4188fb1757d22ac99967b530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/forms/zipball/81ee2d2ef6322f53442fd27c8e40d925e1594ce2", - "reference": "81ee2d2ef6322f53442fd27c8e40d925e1594ce2", + "url": "https://api.github.com/repos/filamentphp/forms/zipball/259f89de086d99bf4188fb1757d22ac99967b530", + "reference": "259f89de086d99bf4188fb1757d22ac99967b530", "shasum": "" }, "require": { @@ -1647,20 +1647,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2023-10-06T15:56:53+00:00" + "time": "2023-10-09T12:12:48+00:00" }, { "name": "filament/infolists", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/infolists.git", - "reference": "76bd92dff0c7798e09bcd7b6905e76ecaef193d5" + "reference": "fdb2a8eae8630db29f2582377d857df864034e93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/infolists/zipball/76bd92dff0c7798e09bcd7b6905e76ecaef193d5", - "reference": "76bd92dff0c7798e09bcd7b6905e76ecaef193d5", + "url": "https://api.github.com/repos/filamentphp/infolists/zipball/fdb2a8eae8630db29f2582377d857df864034e93", + "reference": "fdb2a8eae8630db29f2582377d857df864034e93", "shasum": "" }, "require": { @@ -1698,11 +1698,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2023-10-06T15:56:51+00:00" + "time": "2023-10-08T18:26:45+00:00" }, { "name": "filament/notifications", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/notifications.git", @@ -1754,7 +1754,7 @@ }, { "name": "filament/spatie-laravel-translatable-plugin", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/spatie-laravel-translatable-plugin.git", @@ -1799,16 +1799,16 @@ }, { "name": "filament/support", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/support.git", - "reference": "6c4358cf11b8f09effcaaa995b4e553e7c1a94c8" + "reference": "cd368ba90c88789c06c108728fb820637c9226e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/support/zipball/6c4358cf11b8f09effcaaa995b4e553e7c1a94c8", - "reference": "6c4358cf11b8f09effcaaa995b4e553e7c1a94c8", + "url": "https://api.github.com/repos/filamentphp/support/zipball/cd368ba90c88789c06c108728fb820637c9226e0", + "reference": "cd368ba90c88789c06c108728fb820637c9226e0", "shasum": "" }, "require": { @@ -1852,20 +1852,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2023-10-06T15:56:48+00:00" + "time": "2023-10-09T13:12:22+00:00" }, { "name": "filament/tables", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/tables.git", - "reference": "f661731442a1af2819f3581b05cca38c91db54d0" + "reference": "98024d53a0e15a32dde1cdb5e86aca73605ba04a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/tables/zipball/f661731442a1af2819f3581b05cca38c91db54d0", - "reference": "f661731442a1af2819f3581b05cca38c91db54d0", + "url": "https://api.github.com/repos/filamentphp/tables/zipball/98024d53a0e15a32dde1cdb5e86aca73605ba04a", + "reference": "98024d53a0e15a32dde1cdb5e86aca73605ba04a", "shasum": "" }, "require": { @@ -1905,20 +1905,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2023-10-06T15:57:10+00:00" + "time": "2023-10-09T12:12:59+00:00" }, { "name": "filament/widgets", - "version": "v3.0.69", + "version": "v3.0.73", "source": { "type": "git", "url": "https://github.com/filamentphp/widgets.git", - "reference": "017b070da641e3bde6940656475d81aeb1042f40" + "reference": "f717516dd7449b75551d8a28d3076bd681744541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/widgets/zipball/017b070da641e3bde6940656475d81aeb1042f40", - "reference": "017b070da641e3bde6940656475d81aeb1042f40", + "url": "https://api.github.com/repos/filamentphp/widgets/zipball/f717516dd7449b75551d8a28d3076bd681744541", + "reference": "f717516dd7449b75551d8a28d3076bd681744541", "shasum": "" }, "require": { @@ -1949,7 +1949,7 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2023-10-06T15:57:09+00:00" + "time": "2023-10-08T18:26:58+00:00" }, { "name": "flowframe/laravel-trend", @@ -2360,16 +2360,16 @@ }, { "name": "lara-zeus/core", - "version": "v3.0.7", + "version": "v3.0.8", "source": { "type": "git", "url": "https://github.com/lara-zeus/core.git", - "reference": "7558235bc4182fc7d6d9ad06ddbea6bfbde7f4fc" + "reference": "759091b1c04d81583666819bd5b61952b281fef0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lara-zeus/core/zipball/7558235bc4182fc7d6d9ad06ddbea6bfbde7f4fc", - "reference": "7558235bc4182fc7d6d9ad06ddbea6bfbde7f4fc", + "url": "https://api.github.com/repos/lara-zeus/core/zipball/759091b1c04d81583666819bd5b61952b281fef0", + "reference": "759091b1c04d81583666819bd5b61952b281fef0", "shasum": "" }, "require": { @@ -2442,20 +2442,20 @@ "type": "github" } ], - "time": "2023-10-06T19:49:24+00:00" + "time": "2023-10-10T12:27:21+00:00" }, { "name": "laravel/framework", - "version": "v10.26.2", + "version": "v10.27.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6e5440f7c518f26b4495e5d7e4796ec239e26df9" + "reference": "616f81bd6dd8aa2e26a9fc21d9c95e98bd30803b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6e5440f7c518f26b4495e5d7e4796ec239e26df9", - "reference": "6e5440f7c518f26b4495e5d7e4796ec239e26df9", + "url": "https://api.github.com/repos/laravel/framework/zipball/616f81bd6dd8aa2e26a9fc21d9c95e98bd30803b", + "reference": "616f81bd6dd8aa2e26a9fc21d9c95e98bd30803b", "shasum": "" }, "require": { @@ -2642,7 +2642,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-10-03T14:24:20+00:00" + "time": "2023-10-09T15:15:28+00:00" }, { "name": "laravel/prompts", @@ -3331,16 +3331,16 @@ }, { "name": "livewire/livewire", - "version": "v3.0.5", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "37f11583c61a75d51b2146c2fe38f506ad36014b" + "reference": "a2fc40f6121362581e72d5da5d820a6af00f62b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/37f11583c61a75d51b2146c2fe38f506ad36014b", - "reference": "37f11583c61a75d51b2146c2fe38f506ad36014b", + "url": "https://api.github.com/repos/livewire/livewire/zipball/a2fc40f6121362581e72d5da5d820a6af00f62b0", + "reference": "a2fc40f6121362581e72d5da5d820a6af00f62b0", "shasum": "" }, "require": { @@ -3349,15 +3349,15 @@ "illuminate/validation": "^10.0", "league/mime-type-detection": "^1.9", "php": "^8.1", - "symfony/http-kernel": "^5.0|^6.0" + "symfony/http-kernel": "^6.2" }, "require-dev": { "calebporzio/sushi": "^2.1", "laravel/framework": "^10.0", "laravel/prompts": "^0.1.6", "mockery/mockery": "^1.3.1", - "orchestra/testbench": "^7.0|^8.0", - "orchestra/testbench-dusk": "^7.0|^8.0", + "orchestra/testbench": "^8.0", + "orchestra/testbench-dusk": "^8.0", "phpunit/phpunit": "^9.0", "psy/psysh": "@stable" }, @@ -3393,7 +3393,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.0.5" + "source": "https://github.com/livewire/livewire/tree/v3.0.7" }, "funding": [ { @@ -3401,7 +3401,7 @@ "type": "github" } ], - "time": "2023-09-16T11:51:32+00:00" + "time": "2023-10-09T13:59:17+00:00" }, { "name": "masterminds/html5", @@ -9716,25 +9716,25 @@ }, { "name": "orchestra/testbench", - "version": "v8.12.2", + "version": "v8.13.0", "source": { "type": "git", "url": "https://github.com/orchestral/testbench.git", - "reference": "1f1bba4effb8199b712cc07fe0073d4f5727c119" + "reference": "b793195fa30517a89fd20b36b5d668324c5bbdbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench/zipball/1f1bba4effb8199b712cc07fe0073d4f5727c119", - "reference": "1f1bba4effb8199b712cc07fe0073d4f5727c119", + "url": "https://api.github.com/repos/orchestral/testbench/zipball/b793195fa30517a89fd20b36b5d668324c5bbdbb", + "reference": "b793195fa30517a89fd20b36b5d668324c5bbdbb", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", "fakerphp/faker": "^1.21", - "laravel/framework": ">=10.23.1 <10.27.0", + "laravel/framework": "^10.23.1", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": ">=8.12.0 <8.13.0", - "orchestra/workbench": "^0.4.0", + "orchestra/testbench-core": ">=8.13.0 <8.14.0", + "orchestra/workbench": "^0.4.0 || ^0.5.0", "php": "^8.1", "phpunit/phpunit": "^9.6 || ^10.1", "spatie/laravel-ray": "^1.32.4", @@ -9766,28 +9766,34 @@ ], "support": { "issues": "https://github.com/orchestral/testbench/issues", - "source": "https://github.com/orchestral/testbench/tree/v8.12.2" + "source": "https://github.com/orchestral/testbench/tree/v8.13.0" }, - "time": "2023-10-03T04:16:40+00:00" + "time": "2023-10-09T12:14:00+00:00" }, { "name": "orchestra/testbench-core", - "version": "v8.12.1", + "version": "v8.13.0", "source": { "type": "git", "url": "https://github.com/orchestral/testbench-core.git", - "reference": "9a7b63f9cd10dd15cf7c9d4aad2ccaa688465a1f" + "reference": "b03aa317d3c660dd63e4096580d7f713bc2cab15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/9a7b63f9cd10dd15cf7c9d4aad2ccaa688465a1f", - "reference": "9a7b63f9cd10dd15cf7c9d4aad2ccaa688465a1f", + "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/b03aa317d3c660dd63e4096580d7f713bc2cab15", + "reference": "b03aa317d3c660dd63e4096580d7f713bc2cab15", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", "php": "^8.1" }, + "conflict": { + "brianium/paratest": "<6.4.0 || >=7.0.0 <7.1.4 || >=8.0.0", + "laravel/framework": "<10.23.1 || >=11.0.0", + "nunomaduro/collision": "<6.4.0 || >=7.0.0 <7.4.0 || >=8.0.0", + "phpunit/phpunit": "<9.6.0 || >=10.5.0" + }, "require-dev": { "fakerphp/faker": "^1.21", "laravel/framework": "^10.23", @@ -9801,7 +9807,7 @@ "vlucas/phpdotenv": "^5.4.1" }, "suggest": { - "brianium/paratest": "Allow using parallel tresting (^6.4 || ^7.1.4).", + "brianium/paratest": "Allow using parallel testing (^6.4 || ^7.1.4).", "fakerphp/faker": "Allow using Faker for testing (^1.21).", "laravel/framework": "Required for testing (^10.23).", "mockery/mockery": "Allow using Mockery for testing (^1.5.1).", @@ -9849,20 +9855,20 @@ "issues": "https://github.com/orchestral/testbench/issues", "source": "https://github.com/orchestral/testbench-core" }, - "time": "2023-09-26T12:50:24+00:00" + "time": "2023-10-09T11:41:27+00:00" }, { "name": "orchestra/workbench", - "version": "v0.4.1", + "version": "v0.5.0", "source": { "type": "git", "url": "https://github.com/orchestral/workbench.git", - "reference": "21acf1015ac48e36cb468bffd161115689958782" + "reference": "01175d82fd80a6589ffaa9a861100a64c500b259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/workbench/zipball/21acf1015ac48e36cb468bffd161115689958782", - "reference": "21acf1015ac48e36cb468bffd161115689958782", + "url": "https://api.github.com/repos/orchestral/workbench/zipball/01175d82fd80a6589ffaa9a861100a64c500b259", + "reference": "01175d82fd80a6589ffaa9a861100a64c500b259", "shasum": "" }, "require": { @@ -9887,7 +9893,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.4.x-dev" + "dev-master": "0.5.x-dev" } }, "autoload": { @@ -9914,22 +9920,22 @@ ], "support": { "issues": "https://github.com/orchestral/workbench/issues", - "source": "https://github.com/orchestral/workbench/tree/v0.4.1" + "source": "https://github.com/orchestral/workbench/tree/v0.5.0" }, - "time": "2023-09-26T13:04:34+00:00" + "time": "2023-10-06T12:50:40+00:00" }, { "name": "pestphp/pest", - "version": "v2.21.0", + "version": "v2.22.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "2ffafd445d42c8b7b7e1874bde1c29945767a49d" + "reference": "a312cecede4f33f39a49207fd8342e0988295ed1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/2ffafd445d42c8b7b7e1874bde1c29945767a49d", - "reference": "2ffafd445d42c8b7b7e1874bde1c29945767a49d", + "url": "https://api.github.com/repos/pestphp/pest/zipball/a312cecede4f33f39a49207fd8342e0988295ed1", + "reference": "a312cecede4f33f39a49207fd8342e0988295ed1", "shasum": "" }, "require": { @@ -10007,7 +10013,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.21.0" + "source": "https://github.com/pestphp/pest/tree/v2.22.0" }, "funding": [ { @@ -10019,7 +10025,7 @@ "type": "github" } ], - "time": "2023-10-06T12:33:39+00:00" + "time": "2023-10-10T07:45:41+00:00" }, { "name": "pestphp/pest-plugin", @@ -12382,32 +12388,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.13.4", + "version": "8.14.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "4b2af2fb17773656d02fbfb5d18024ebd19fe322" + "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/4b2af2fb17773656d02fbfb5d18024ebd19fe322", - "reference": "4b2af2fb17773656d02fbfb5d18024ebd19fe322", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926", + "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": "^1.23.0", + "phpstan/phpdoc-parser": "^1.23.1", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.26", - "phpstan/phpstan-deprecation-rules": "1.1.3", - "phpstan/phpstan-phpunit": "1.3.13", + "phpstan/phpstan": "1.10.37", + "phpstan/phpstan-deprecation-rules": "1.1.4", + "phpstan/phpstan-phpunit": "1.3.14", "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.2.6" + "phpunit/phpunit": "8.5.21|9.6.8|10.3.5" }, "type": "phpcodesniffer-standard", "extra": { @@ -12431,7 +12437,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.13.4" + "source": "https://github.com/slevomat/coding-standard/tree/8.14.1" }, "funding": [ { @@ -12443,7 +12449,7 @@ "type": "tidelift" } ], - "time": "2023-07-25T10:28:55+00:00" + "time": "2023-10-08T07:28:08+00:00" }, { "name": "spatie/backtrace", diff --git a/src/Facades/Bolt.php b/src/Facades/Bolt.php index 501ee2c8..6c3a09eb 100644 --- a/src/Facades/Bolt.php +++ b/src/Facades/Bolt.php @@ -32,10 +32,6 @@ public static function availableFields(): Collection $coreFields = Collectors::collectClasses(__DIR__ . '/../Fields/Classes', 'LaraZeus\\Bolt\\Fields\\Classes\\'); $appFields = Collectors::collectClasses(app_path('Zeus/Fields'), 'App\\Zeus\\Fields\\'); - if (class_exists(\LaraZeus\BoltPro\BoltProServiceProvider::class)) { - $boltProFields = Collectors::collectClasses(base_path('vendor/lara-zeus/bolt-pro/src/Fields'), 'LaraZeus\\BoltPro\\Fields\\'); - } - $fields = collect(); if ($coreFields->isNotEmpty()) { @@ -46,8 +42,11 @@ public static function availableFields(): Collection $fields = $fields->merge($appFields); } - if (class_exists(\LaraZeus\BoltPro\BoltProServiceProvider::class) && $boltProFields->isNotEmpty()) { - $fields = $fields->merge($boltProFields); + if (class_exists(\LaraZeus\BoltPro\BoltProServiceProvider::class)) { + $boltProFields = Collectors::collectClasses(base_path('vendor/lara-zeus/bolt-pro/src/Fields'), 'LaraZeus\\BoltPro\\Fields\\'); + if ($boltProFields->isNotEmpty()) { + $fields = $fields->merge($boltProFields); + } } return $fields->sortBy('sort'); diff --git a/src/Filament/Resources/FormResource/Pages/ListForms.php b/src/Filament/Resources/FormResource/Pages/ListForms.php index 3b82c911..a3833171 100644 --- a/src/Filament/Resources/FormResource/Pages/ListForms.php +++ b/src/Filament/Resources/FormResource/Pages/ListForms.php @@ -15,7 +15,7 @@ class ListForms extends ListRecords protected function getHeaderActions(): array { - return [ + $actions = [ Actions\LocaleSwitcher::make(), Actions\CreateAction::make('create'), Action::make('open') @@ -26,5 +26,13 @@ protected function getHeaderActions(): array ->url(fn () => route('bolt.forms.list')) ->openUrlInNewTab(), ]; + + if (class_exists(\LaraZeus\BoltPreset\Facades\BoltPreset::class)) { + //@phpstan-ignore-next-line + $actions[] = \LaraZeus\BoltPreset\Actions\PresetAction::make('new from preset') + ->visible(config('zeus-bolt.show_presets')); + } + + return $actions; } }