mirror of
https://github.com/filamentphp/plugin-skeleton.git
synced 2025-12-06 13:38:53 +08:00
Merge pull request #60 from filamentphp/main
Merge changes in main into 3.x
This commit is contained in:
@@ -19,7 +19,7 @@ jobs:
|
|||||||
ref: ${{ github.head_ref }}
|
ref: ${{ github.head_ref }}
|
||||||
|
|
||||||
- name: Fix PHP code style issues
|
- name: Fix PHP code style issues
|
||||||
uses: aglipanci/laravel-pint-action@2.3.0
|
uses: aglipanci/laravel-pint-action@2.3.1
|
||||||
|
|
||||||
- name: Commit changes
|
- name: Commit changes
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
2
.github/workflows/phpstan.yml
vendored
2
.github/workflows/phpstan.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
|||||||
coverage: none
|
coverage: none
|
||||||
|
|
||||||
- name: Install composer dependencies
|
- name: Install composer dependencies
|
||||||
uses: ramsey/composer-install@v2
|
uses: ramsey/composer-install@v3
|
||||||
|
|
||||||
- name: Run PHPStan
|
- name: Run PHPStan
|
||||||
run: ./vendor/bin/phpstan --error-format=github
|
run: ./vendor/bin/phpstan --error-format=github
|
||||||
|
|||||||
2
.github/workflows/run-tests.yml
vendored
2
.github/workflows/run-tests.yml
vendored
@@ -19,7 +19,7 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- laravel: 10.*
|
- laravel: 10.*
|
||||||
testbench: 8.*
|
testbench: 8.*
|
||||||
carbon: ^2.63
|
carbon: 2.*
|
||||||
|
|
||||||
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
|
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[](https://packagist.org/packages/:vendor_slug/:package_slug)
|
[](https://packagist.org/packages/:vendor_slug/:package_slug)
|
||||||
[](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3Arun-tests+branch%3Amain)
|
[](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3Arun-tests+branch%3Amain)
|
||||||
[](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
|
[](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3A"Fix+PHP+code+styling"+branch%3Amain)
|
||||||
[](https://packagist.org/packages/:vendor_slug/:package_slug)
|
[](https://packagist.org/packages/:vendor_slug/:package_slug)
|
||||||
|
|
||||||
<!--delete-->
|
<!--delete-->
|
||||||
|
|||||||
@@ -24,15 +24,14 @@
|
|||||||
"filament/filament": "^3.0",
|
"filament/filament": "^3.0",
|
||||||
"filament/forms": "^3.0",
|
"filament/forms": "^3.0",
|
||||||
"filament/tables": "^3.0",
|
"filament/tables": "^3.0",
|
||||||
"spatie/laravel-package-tools": "^1.15.0",
|
"spatie/laravel-package-tools": "^1.15.0"
|
||||||
"illuminate/contracts": "^10.0"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"laravel/pint": "^1.0",
|
"laravel/pint": "^1.0",
|
||||||
"nunomaduro/collision": "^7.9",
|
"nunomaduro/collision": "^7.9",
|
||||||
"nunomaduro/larastan": "^2.0.1",
|
"nunomaduro/larastan": "^2.0.1",
|
||||||
"orchestra/testbench": "^8.0",
|
"orchestra/testbench": "^8.0",
|
||||||
"pestphp/pest": "^2.0",
|
"pestphp/pest": "^2.1",
|
||||||
"pestphp/pest-plugin-arch": "^2.0",
|
"pestphp/pest-plugin-arch": "^2.0",
|
||||||
"pestphp/pest-plugin-laravel": "^2.0",
|
"pestphp/pest-plugin-laravel": "^2.0",
|
||||||
"phpstan/extension-installer": "^1.1",
|
"phpstan/extension-installer": "^1.1",
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ foreach ($files as $file) {
|
|||||||
match (true) {
|
match (true) {
|
||||||
str_contains($file, determineSeparator('src/Skeleton.php')) => rename($file, determineSeparator('./src/' . $className . '.php')),
|
str_contains($file, determineSeparator('src/Skeleton.php')) => rename($file, determineSeparator('./src/' . $className . '.php')),
|
||||||
str_contains($file, determineSeparator('src/SkeletonServiceProvider.php')) => rename($file, determineSeparator('./src/' . $className . 'ServiceProvider.php')),
|
str_contains($file, determineSeparator('src/SkeletonServiceProvider.php')) => rename($file, determineSeparator('./src/' . $className . 'ServiceProvider.php')),
|
||||||
str_contains($file, determineSeparator('src/SkeletonTheme.php')) => rename($file, determineSeparator('./src/' . $className . 'Theme.php')),
|
str_contains($file, determineSeparator('src/SkeletonTheme.php')) => rename($file, determineSeparator('./src/' . $className . (str_ends_with($className, 'Theme') ? '.php' : 'Theme.php'))),
|
||||||
str_contains($file, determineSeparator('src/SkeletonPlugin.php')) => rename($file, determineSeparator('./src/' . $className . 'Plugin.php')),
|
str_contains($file, determineSeparator('src/SkeletonPlugin.php')) => rename($file, determineSeparator('./src/' . $className . 'Plugin.php')),
|
||||||
str_contains($file, determineSeparator('src/Facades/Skeleton.php')) => rename($file, determineSeparator('./src/Facades/' . $className . '.php')),
|
str_contains($file, determineSeparator('src/Facades/Skeleton.php')) => rename($file, determineSeparator('./src/Facades/' . $className . '.php')),
|
||||||
str_contains($file, determineSeparator('src/Commands/SkeletonCommand.php')) => rename($file, determineSeparator('./src/Commands/' . $className . 'Command.php')),
|
str_contains($file, determineSeparator('src/Commands/SkeletonCommand.php')) => rename($file, determineSeparator('./src/Commands/' . $className . 'Command.php')),
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ use Filament\FilamentServiceProvider;
|
|||||||
use Filament\Forms\FormsServiceProvider;
|
use Filament\Forms\FormsServiceProvider;
|
||||||
use Filament\Infolists\InfolistsServiceProvider;
|
use Filament\Infolists\InfolistsServiceProvider;
|
||||||
use Filament\Notifications\NotificationsServiceProvider;
|
use Filament\Notifications\NotificationsServiceProvider;
|
||||||
use Filament\SpatieLaravelSettingsPluginServiceProvider;
|
|
||||||
use Filament\SpatieLaravelTranslatablePluginServiceProvider;
|
|
||||||
use Filament\Support\SupportServiceProvider;
|
use Filament\Support\SupportServiceProvider;
|
||||||
use Filament\Tables\TablesServiceProvider;
|
use Filament\Tables\TablesServiceProvider;
|
||||||
use Filament\Widgets\WidgetsServiceProvider;
|
use Filament\Widgets\WidgetsServiceProvider;
|
||||||
@@ -43,8 +41,6 @@ class TestCase extends Orchestra
|
|||||||
InfolistsServiceProvider::class,
|
InfolistsServiceProvider::class,
|
||||||
LivewireServiceProvider::class,
|
LivewireServiceProvider::class,
|
||||||
NotificationsServiceProvider::class,
|
NotificationsServiceProvider::class,
|
||||||
SpatieLaravelSettingsPluginServiceProvider::class,
|
|
||||||
SpatieLaravelTranslatablePluginServiceProvider::class,
|
|
||||||
SupportServiceProvider::class,
|
SupportServiceProvider::class,
|
||||||
TablesServiceProvider::class,
|
TablesServiceProvider::class,
|
||||||
WidgetsServiceProvider::class,
|
WidgetsServiceProvider::class,
|
||||||
|
|||||||
Reference in New Issue
Block a user