Skip to content

Commit a52bffb

Browse files
awcodesawcodes
authored
Merge pull request #34 from filamentphp/3.x-wip
Chore: merge in wip branch to sync changes
2 parents 2bd9cd6 + 4896b7a commit a52bffb

34 files changed

+481
-345
lines changed

‎.gitattributes‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,26 @@
22
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
33

44
# Ignore all test and documentation with "export-ignore".
5-
/.github export-ignore
6-
/.gitattributes export-ignore
7-
/.gitignore export-ignore
8-
/phpunit.xml.dist export-ignore
9-
/art export-ignore
10-
/docs export-ignore
11-
/tests export-ignore
12-
/.editorconfig export-ignore
13-
/.php_cs.dist.php export-ignore
14-
/psalm.xml export-ignore
15-
/psalm.xml.dist export-ignore
16-
/testbench.yaml export-ignore
17-
/UPGRADING.md export-ignore
18-
/phpstan.neon.dist export-ignore
5+
/.github export-ignore
6+
/.gitattributes export-ignore
7+
/.gitignore export-ignore
8+
/.idea export-ignore
9+
/.prettierrc export-ignore
10+
/.package-lock.json export-ignore
11+
/.editorconfig export-ignore
12+
/.php_cs.dist.php export-ignore
13+
/.vscode export-ignore
14+
/art export-ignore
15+
/docs export-ignore
16+
/images export-ignore
17+
/tests export-ignore
18+
/package.json export-ignore
1919
/phpstan-baseline.neon export-ignore
20+
/phpstan.neon.dist export-ignore
21+
/postcss.config.js export-ignore
22+
/phpunit.xml.dist export-ignore
23+
/psalm.xml export-ignore
24+
/psalm.xml.dist export-ignore
25+
/tailwind.config.js export-ignore
26+
/testbench.yaml export-ignore
27+
/UPGRADING.md export-ignore

‎.github/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Please be considerate towards maintainers when raising issues or presenting pull
1414
world that developers are civilized and selfless people.
1515

1616
It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
17-
quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
17+
quality to benefit the project. Many developers have different skills, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
1818

1919
## Viability
2020

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Bug Report
2+
description: Report an Issue or Bug with the Package
3+
title: "[Bug]: "
4+
labels: ["bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
We're sorry to hear you have a problem. Can you help us solve it by providing the following details.
10+
- type: textarea
11+
id: what-happened
12+
attributes:
13+
label: What happened?
14+
description: What did you expect to happen?
15+
placeholder: I cannot currently do X thing because when I do, it breaks X thing.
16+
validations:
17+
required: true
18+
- type: textarea
19+
id: how-to-reproduce
20+
attributes:
21+
label: How to reproduce the bug
22+
description: How did this occur, please add any config values used and provide a set of reliable steps if possible.
23+
placeholder: When I do X I see Y.
24+
validations:
25+
required: true
26+
- type: input
27+
id: package-version
28+
attributes:
29+
label: Package Version
30+
description: What version of our Package are you running? Please be as specific as possible
31+
placeholder: 2.0.0
32+
validations:
33+
required: true
34+
- type: input
35+
id: php-version
36+
attributes:
37+
label: PHP Version
38+
description: What version of PHP are you running? Please be as specific as possible
39+
placeholder: 8.2.0
40+
validations:
41+
required: true
42+
- type: input
43+
id: laravel-version
44+
attributes:
45+
label: Laravel Version
46+
description: What version of Laravel are you running? Please be as specific as possible
47+
placeholder: 9.0.0
48+
validations:
49+
required: true
50+
- type: dropdown
51+
id: operating-systems
52+
attributes:
53+
label: Which operating systems does with happen with?
54+
description: You may select more than one.
55+
multiple: true
56+
options:
57+
- macOS
58+
- Windows
59+
- Linux
60+
- type: textarea
61+
id: notes
62+
attributes:
63+
label: Notes
64+
description: Use this field to provide any other notes that you feel might be relevant to the issue.
65+
validations:
66+
required: false

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@ contact_links:
99
- name: Report a security issue
1010
url: https://github.com/:vendor_name/:package_name/security/policy
1111
about: Learn how to notify us for sensitive bugs
12-
- name: Report a bug
13-
url: https://github.com/:vendor_name/:package_name/issues/new
14-
about: Report a reproducible bug

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dependabot Auto Merge
1+
name: "Dependabot Auto-Merge"
22

33
on: pull_request_target
44

@@ -14,7 +14,7 @@ jobs:
1414

1515
- name: Dependabot metadata
1616
id: metadata
17-
uses: dependabot/fetch-metadata@v1.4.0
17+
uses: dependabot/fetch-metadata@v1.6.0
1818
with:
1919
github-token: "${{ secrets.GITHUB_TOKEN }}"
2020

.github/workflows/fix-php-code-style-issues.yml renamed to .github/workflows/fix-php-code-styling.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
name: Fix PHP Code Styling
1+
name: "Fix PHP Code Styling"
22

3-
on: [push]
3+
on:
4+
push:
5+
paths:
6+
- '**.php'
7+
8+
permissions:
9+
contents: write
410

511
jobs:
612
php-code-styling:

‎.github/workflows/phpstan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
uses: ramsey/composer-install@v2
2424

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

‎.github/workflows/run-tests.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run Tests
1+
name: run-tests
22

33
on:
44
push:
@@ -13,12 +13,13 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16-
php: [8.1]
17-
laravel: [9.*]
16+
php: [8.2, 8.1]
17+
laravel: [10.*]
1818
stability: [prefer-lowest, prefer-stable]
1919
include:
20-
- laravel: 9.*
21-
testbench: 7.*
20+
- laravel: 10.*
21+
testbench: 8.*
22+
carbon: ^2.63
2223

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

@@ -40,8 +41,11 @@ jobs:
4041
4142
- name: Install dependencies
4243
run: |
43-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
44+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
4445
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4546
47+
- name: List Installed Dependencies
48+
run: composer show -D
49+
4650
- name: Execute tests
47-
run: vendor/bin/pest
51+
run: vendor/bin/pest --ci

‎.github/workflows/update-changelog.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
name: Update Changelog
1+
name: "Update Changelog"
22

33
on:
44
release:
55
types: [released]
66

7+
permissions:
8+
contents: write
9+
710
jobs:
811
update:
912
runs-on: ubuntu-latest

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
.DS_Store
12
.idea
23
.phpunit.result.cache
4+
.vscode
35
build
46
composer.lock
57
coverage
68
docs
9+
node_modules
710
phpunit.xml
811
phpstan.neon
912
testbench.yaml
1013
vendor
11-
node_modules

0 commit comments

Comments
 (0)