Skip to content

Commit 365e685

Browse files
StanBarrowsStanBarrows
authored
Merge pull request #10 from codebar-ag/feature-laravel-12
Feature Laravel 12
2 parents 54843b3 + 4692b16 commit 365e685

19 files changed

+132
-149
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ root = true
22

33
[*]
44
charset = utf-8
5-
end_of_line = lf
65
indent_size = 4
76
indent_style = space
7+
end_of_line = lf
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

‎.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/art export-ignore
1010
/docs export-ignore
1111
/tests export-ignore
12-
/workbench export-ignore
1312
/.editorconfig export-ignore
1413
/.php_cs.dist.php export-ignore
1514
/psalm.xml export-ignore

‎.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,45 @@
11
name: Bug Report
22
description: Report an Issue or Bug with the Package
33
title: "[Bug]: "
4-
labels: ["bug"]
4+
labels: [ "bug" ]
55
body:
66
- type: markdown
77
attributes:
8-
value: |
9-
We're sorry to hear you have a problem. Can you help us solve it by providing the following details.
8+
value: "|
9+
We're sorry to hear you have a problem. Can you help us solve it by providing the following details."
1010
- type: textarea
1111
id: what-happened
1212
attributes:
1313
label: What happened?
1414
description: What did you expect to happen?
15-
placeholder: I cannot currently do X thing because when I do, it breaks X thing.
15+
placeholder: "I cannot currently do X thing because when I do, it breaks X thing."
1616
validations:
1717
required: true
1818
- type: input
1919
id: package-version
2020
attributes:
2121
label: Package Version
2222
description: What version of our Package are you running? Please be as specific as possible
23-
placeholder: 1.0.0
23+
placeholder: "12.0"
24+
value: "12.0"
2425
validations:
2526
required: true
2627
- type: input
2728
id: php-version
2829
attributes:
2930
label: PHP Version
3031
description: What version of PHP are you running? Please be as specific as possible
31-
placeholder: 8.3.0
32+
placeholder: "8.4.0"
33+
value: "8.4.0"
3234
validations:
3335
required: true
3436
- type: input
3537
id: laravel-version
3638
attributes:
3739
label: Laravel Version
3840
description: What version of Laravel are you running? Please be as specific as possible
39-
placeholder: 11.0.0
41+
placeholder: "12.0.0"
42+
value: "12.0.0"
4043
validations:
4144
required: true
4245
- type: dropdown

‎.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Please see the documentation for all configuration options:
2+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
11+
labels:
12+
- "dependencies"

‎.github/workflows/dependabot-auto-merge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: ${{ github.actor == 'dependabot[bot]' }}
1212
steps:
13-
13+
1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.3.3
16+
uses: dependabot/fetch-metadata@v2.3.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
19-
19+
2020
- name: Auto-merge Dependabot PRs for semver-minor updates
2121
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
2222
run: gh pr merge --auto --merge "$PR_URL"
2323
env:
2424
PR_URL: ${{github.event.pull_request.html_url}}
2525
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26-
26+
2727
- name: Auto-merge Dependabot PRs for semver-patch updates
2828
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
2929
run: gh pr merge --auto --merge "$PR_URL"

‎.github/workflows/dependency-review.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Dependency Review Action
2+
#
3+
# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
4+
#
5+
# Source repository: https://github.com/actions/dependency-review-action
6+
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
7+
name: 'Dependency Review'
8+
on: [pull_request]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
dependency-review:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: 'Checkout Repository'
18+
uses: actions/checkout@v4
19+
- name: 'Dependency Review'
20+
uses: actions/dependency-review-action@v4

‎.github/workflows/fix-php-code-style-issues.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Fix PHP code style issues
2+
3+
on: [push]
4+
5+
jobs:
6+
php-code-styling:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
12+
with:
13+
ref: ${{ github.head_ref }}
14+
15+
- name: Fix PHP code style issues
16+
uses: aglipanci/laravel-pint-action@2.5
17+
18+
- name: Commit changes
19+
uses: stefanzweifel/git-auto-commit-action@v5
20+
with:
21+
commit_message: Fix styling

‎.github/workflows/php-cs-fixer.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/workflows/phpstan.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ name: PHPStan
22

33
on:
44
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
5+
paths:
6+
- '**.php'
7+
- 'phpstan.neon.dist'
88

99
jobs:
1010
phpstan:
1111
name: phpstan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '8.2'
19+
php-version: '8.4'
2020
coverage: none
2121

2222
- name: Install composer dependencies
23-
uses: ramsey/composer-install@v2
23+
uses: ramsey/composer-install@v3
2424

2525
- name: Run PHPStan
26-
run: ./vendor/bin/phpstan analyse src --error-format=github
26+
run: ./vendor/bin/phpstan --error-format=github

‎.github/workflows/run-tests.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ jobs:
1313
fail-fast: true
1414
max-parallel: 1
1515
matrix:
16-
os: [ ubuntu-latest, windows-latest ]
17-
php: [ 8.2, 8.3 ]
18-
laravel: [ 11.* ]
16+
os: [ ubuntu-latest ]
17+
php: [ 8.2, 8.3, 8.4 ]
18+
laravel: [ 12.* ]
1919
stability: [ prefer-lowest, prefer-stable ]
2020

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

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: Setup PHP
2828
uses: shivammathur/setup-php@v2
@@ -41,16 +41,15 @@ jobs:
4141
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
4242
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4343
44-
- name: Set phpunit.xml
44+
- name: Execute tests
4545
run: cp phpunit.xml.dist phpunit.xml
4646

4747
- name: Execute tests
4848
run: vendor/bin/pest
4949

50-
- name: Store test reports
51-
uses: actions/upload-artifact@v2
50+
- name: Store Log Artifacts
51+
if: failure()
52+
uses: actions/upload-artifact@v4
5253
with:
53-
name: Store report
54-
retention-days: 1
55-
path: |
56-
./reports
54+
name: Store report artifacts
55+
path: ./vendor/orchestra/testbench-core/laravel/storage/logs

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
.idea
2+
.phpunit.result.cache
23
.phpunit.cache
3-
build
44
composer.lock
55
coverage
6-
docs
76
phpunit.xml
87
phpstan.neon
98
testbench.yaml
109
vendor
1110
node_modules
11+
.phpactor.json
12+
build

‎README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
<img src="https://banners.beyondco.de/Filament%20Json%20Field.png?theme=light&packageManager=composer+require&packageName=codebar-ag%2Ffilament-json-field&pattern=circuitBoard&style=style_2&description=A+Laravel+Filament+Json+Field+integration.&md=1&showWatermark=1&fontSize=150px&images=home&widths=500&heights=500">
1+
<img src="https://banners.beyondco.de/Laravel%20Filament%20Json%20Field.png?theme=light&packageManager=composer+require&packageName=codebar-ag%2Flaravel-filament-json-field&pattern=circuitBoard&style=style_1&description=A+Laravel+Filament+Json+Field+integration.&md=1&showWatermark=1&fontSize=100px&images=light-bulb">
2+
3+
[![Latest Version on Packagist](https://img.shields.io/packagist/v/codebar-ag/laravel-filament-json-field.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/laravel-filament-json-field)
4+
[![GitHub-Tests](https://github.com/codebar-ag/laravel-filament-json-field/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://github.com/codebar-ag/laravel-filament-json-field/actions/workflows/run-tests.yml)
5+
[![GitHub Code Style](https://github.com/codebar-ag/laravel-filament-json-field/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://github.com/codebar-ag/laravel-filament-json-field/actions/workflows/fix-php-code-style-issues.yml)
6+
[![Total Downloads](https://img.shields.io/packagist/dt/codebar-ag/laravel-filament-json-field.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/laravel-filament-json-field)
27

3-
[![Latest Version on Packagist](https://img.shields.io/packagist/v/codebar-ag/filament-json-field.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/filament-json-field)
4-
[![Total Downloads](https://img.shields.io/packagist/dt/codebar-ag/filament-json-field.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/filament-json-field)
5-
[![run-tests](https://github.com/codebar-ag/filament-json-field/actions/workflows/run-tests.yml/badge.svg)](https://github.com/codebar-ag/filament-json-field/actions/workflows/run-tests.yml)
6-
[![PHPStan](https://github.com/codebar-ag/filament-json-field/actions/workflows/phpstan.yml/badge.svg)](https://github.com/codebar-ag/filament-json-field/actions/workflows/phpstan.yml)
78

89
## 💡 What is Filament Json Field?
910

1011
Filament Json Field is a Filament wrapper for Codemirror.
1112

1213
## 🛠 Requirements
1314

14-
| Package | PHP | Laravel | Filament Infolists | Filament Support | Filament Tables |
15-
|-----------|-------|---------------|--------------------|------------------|-----------------|
16-
| v1.0 | ^8.1 | ^10.45, ^11.0 | ^3.2 | ^3.2 | ^3.2 |
15+
| Package | PHP | Laravel | Filament Infolists | Filament Support | Filament Tables |
16+
|-----------|------------------|---------------|--------------------|------------------|-----------------|
17+
| v12.0 | ^8.2, ^8.3, ^8.4 | ^12.0 | ^3.3 | ^3.3 | ^3.3 |
18+
| v11.0 | ^8.1 | ^10.45, ^11.0 | ^3.2 | ^3.2 | ^3.2 |
19+
| v1.0 | ^8.1 | ^10.45, ^11.0 | ^3.2 | ^3.2 | ^3.2 |
1720

1821

1922
## ⚙️ Installation

‎composer.json

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,34 @@
1010
"license": "MIT",
1111
"authors": [
1212
{
13-
"name": "Sebastian Bürgin",
14-
"email": "sebastian.fix@buergin.ch",
13+
"name": "Sebastian Bürgin-Fix",
14+
"email": "sebastian.buergin@buergin.ch",
1515
"homepage": "https://www.codebar.ch",
1616
"role": "Sofware-Engineer"
1717
},
1818
{
1919
"name": "Rhys Lees",
20-
"role": "Software-Developer"
20+
"role": "Software-Engineer"
2121
}
2222
],
2323
"require": {
24-
"php": "^8.2",
25-
"filament/infolists": "^3.2",
26-
"filament/support": "^3.2",
27-
"filament/tables": "^3.2",
28-
"illuminate/contracts": "^10.0||^11.0",
29-
"livewire/livewire": "^3.4",
30-
"spatie/laravel-package-tools": "^1.16"
24+
"php": "8.2.*|8.3.*|8.4.*",
25+
"filament/infolists": "^3.3",
26+
"filament/support": "^3.3",
27+
"filament/tables": "^3.3",
28+
"illuminate/contracts": "^12.0",
29+
"livewire/livewire": "^3.6",
30+
"spatie/laravel-package-tools": "^1.19"
3131
},
3232
"require-dev": {
33-
"laravel/pint": "^1.14",
34-
"nunomaduro/collision": "^8.1.1||^7.10.0",
35-
"larastan/larastan": "^2.9",
36-
"orchestra/testbench": "^9.0.0||^8.22.0",
37-
"pestphp/pest": "^2.34",
38-
"pestphp/pest-plugin-arch": "^2.7",
39-
"pestphp/pest-plugin-laravel": "^2.3",
40-
"phpstan/extension-installer": "^1.3",
41-
"phpstan/phpstan-deprecation-rules": "^1.1",
42-
"phpstan/phpstan-phpunit": "^1.3",
43-
"spatie/laravel-ray": "^1.35"
33+
"laravel/pint": "^1.21",
34+
"larastan/larastan": "^v3.1",
35+
"orchestra/testbench": "^10.0",
36+
"pestphp/pest": "^3.7",
37+
"phpstan/extension-installer": "^1.4",
38+
"phpstan/phpstan-deprecation-rules": "^2.0",
39+
"phpstan/phpstan-phpunit": "^2.0",
40+
"spatie/laravel-ray": "^1.39"
4441
},
4542
"autoload": {
4643
"psr-4": {
@@ -50,27 +47,17 @@
5047
},
5148
"autoload-dev": {
5249
"psr-4": {
53-
"CodebarAg\\FilamentJsonField\\Tests\\": "tests/",
54-
"Workbench\\App\\": "workbench/app/"
50+
"CodebarAg\\FilamentJsonField\\Tests\\": "tests/"
5551
}
5652
},
5753
"scripts": {
5854
"post-autoload-dump": "@composer run prepare",
59-
"clear": "@php vendor/bin/testbench package:purge-laravel-filament-json-field --ansi",
6055
"prepare": "@php vendor/bin/testbench package:discover --ansi",
61-
"build": [
62-
"@composer run prepare",
63-
"@php vendor/bin/testbench workbench:build --ansi"
64-
],
65-
"start": [
66-
"Composer\\Config::disableProcessTimeout",
67-
"@composer run build",
68-
"@php vendor/bin/testbench serve"
69-
],
7056
"analyse": "vendor/bin/phpstan analyse",
7157
"test": "vendor/bin/pest",
7258
"test-coverage": "vendor/bin/pest --coverage",
73-
"format": "vendor/bin/pint"
59+
"format": "vendor/bin/pint",
60+
"clear": "@php vendor/bin/testbench package:purge-laravel-filament-revealable-field --ansi"
7461
},
7562
"config": {
7663
"sort-packages": true,

0 commit comments

Comments
 (0)