Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge changes in main into 3.x #60

Merged
merged 24 commits into from
Mar 10, 2024
Merged

Merge changes in main into 3.x #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a1af564
Fix styling
awcodes Nov 20, 2023
603d6bb
chore(deps): bump dependabot/fetch-metadata from 1.3.3 to 1.6.0
dependabot[bot] Nov 21, 2023
9965366
Merge pull request #48 from filamentphp/dependabot/github_actions/dep…
github-actions[bot] Nov 21, 2023
98598b8
Merge branch '3.x'
awcodes Nov 28, 2023
c60cc16
fix: merge conflicts
saade Nov 28, 2023
bc30f0e
Fix styling
saade Nov 28, 2023
e93ab62
Merge pull request #51 from filamentphp/3.x
awcodes Dec 13, 2023
842c4d9
Require pestphp/pest ^2.1
maartenpaauw Dec 19, 2023
9a9b9a9
Remove Spatie service providers
maartenpaauw Dec 19, 2023
859e1ee
chore(deps): bump aglipanci/laravel-pint-action from 2.3.0 to 2.3.1
dependabot[bot] Dec 25, 2023
1e6ea9b
Merge pull request #53 from filamentphp/dependabot/github_actions/agl…
github-actions[bot] Dec 25, 2023
95a11ee
Generate: Check for `Theme` suffix on class
ryangjchandler Jan 11, 2024
565e1ef
Merge pull request #54 from filamentphp/generate-check-theme-suffix
awcodes Jan 11, 2024
46b765b
Fix wrong URL
AlexisSerneels Jan 16, 2024
b059c07
Fix constraint error on Windows
AlexisSerneels Jan 16, 2024
493a930
update code style workflow file name
ArielMejiaDev Feb 8, 2024
8dc0dd6
chore(deps): bump ramsey/composer-install from 2 to 3
dependabot[bot] Mar 4, 2024
c7a69d6
remove illuminate/contracts
atmonshi Mar 10, 2024
f638491
Merge pull request #52 from maartenpaauw/fix-unit-tests
awcodes Mar 10, 2024
d005f34
Merge pull request #55 from AlexisSerneels/patch-1
awcodes Mar 10, 2024
2d6bfef
Merge pull request #56 from AlexisSerneels/patch-2
awcodes Mar 10, 2024
514cd6d
Merge pull request #57 from ArielMejiaDev/fix/code-style-workflow
awcodes Mar 10, 2024
07b1e5b
Merge pull request #58 from filamentphp/dependabot/github_actions/ram…
awcodes Mar 10, 2024
77e4016
Merge pull request #59 from atmonshi/no-contracts
awcodes Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fix-php-code-styling.yml → ...b/workflows/fix-php-code-style-issues.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
ref: ${{ github.head_ref }}

- name: Fix PHP code style issues
uses: aglipanci/[email protected].0
uses: aglipanci/[email protected].1

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
coverage: none

- name: Install composer dependencies
uses: ramsey/composer-install@v2
uses: ramsey/composer-install@v3

- name: Run PHPStan
run: ./vendor/bin/phpstan --error-format=github
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
include:
- laravel: 10.*
testbench: 8.*
carbon: ^2.63
carbon: 2.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Latest Version on Packagist](https://img.shields.io/packagist/v/:vendor_slug/:package_slug.svg?style=flat-square)](https://packagist.org/packages/:vendor_slug/:package_slug)
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/:vendor_slug/:package_slug/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3Arun-tests+branch%3Amain)
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/:vendor_slug/:package_slug/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/:vendor_slug/:package_slug/fix-php-code-styling.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/:vendor_slug/:package_slug/actions?query=workflow%3A"Fix+PHP+code+styling"+branch%3Amain)
[![Total Downloads](https://img.shields.io/packagist/dt/:vendor_slug/:package_slug.svg?style=flat-square)](https://packagist.org/packages/:vendor_slug/:package_slug)

<!--delete-->
Expand Down
5 changes: 2 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@
"filament/filament": "^3.0",
"filament/forms": "^3.0",
"filament/tables": "^3.0",
"spatie/laravel-package-tools": "^1.15.0",
"illuminate/contracts": "^10.0"
"spatie/laravel-package-tools": "^1.15.0"
},
"require-dev": {
"laravel/pint": "^1.0",
"nunomaduro/collision": "^7.9",
"nunomaduro/larastan": "^2.0.1",
"orchestra/testbench": "^8.0",
"pestphp/pest": "^2.0",
"pestphp/pest": "^2.1",
"pestphp/pest-plugin-arch": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"phpstan/extension-installer": "^1.1",
Expand Down
2 changes: 1 addition & 1 deletion configure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
match (true) {
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/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/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')),
Expand Down
4 changes: 0 additions & 4 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
use Filament\Forms\FormsServiceProvider;
use Filament\Infolists\InfolistsServiceProvider;
use Filament\Notifications\NotificationsServiceProvider;
use Filament\SpatieLaravelSettingsPluginServiceProvider;
use Filament\SpatieLaravelTranslatablePluginServiceProvider;
use Filament\Support\SupportServiceProvider;
use Filament\Tables\TablesServiceProvider;
use Filament\Widgets\WidgetsServiceProvider;
Expand Down Expand Up @@ -43,8 +41,6 @@ protected function getPackageProviders($app)
InfolistsServiceProvider::class,
LivewireServiceProvider::class,
NotificationsServiceProvider::class,
SpatieLaravelSettingsPluginServiceProvider::class,
SpatieLaravelTranslatablePluginServiceProvider::class,
SupportServiceProvider::class,
TablesServiceProvider::class,
WidgetsServiceProvider::class,
Expand Down