Skip to content

Commit cc58ebc

Browse files
authored
Merge pull request #9 from codebar-ag/feature-larave-12
Feature Laravel 12
2 parents 07a478b + 5183b38 commit cc58ebc

26 files changed

+247
-212
lines changed

.gitattributes

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
/.gitattributes export-ignore
77
/.gitignore export-ignore
88
/phpunit.xml.dist export-ignore
9+
/art export-ignore
10+
/docs export-ignore
911
/tests export-ignore
1012
/.editorconfig export-ignore
11-
/.php_cs.dist export-ignore
13+
/.php_cs.dist.php export-ignore
1214
/psalm.xml export-ignore
1315
/psalm.xml.dist export-ignore
1416
/testbench.yaml export-ignore
17+
/UPGRADING.md export-ignore
18+
/phpstan.neon.dist export-ignore
19+
/phpstan-baseline.neon export-ignore

.github/ISSUE_TEMPLATE/bug_report.yml

+10-7
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

+12
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"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: dependabot-auto-merge
2+
on: pull_request_target
3+
4+
permissions:
5+
pull-requests: write
6+
contents: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor == 'dependabot[bot]' }}
12+
steps:
13+
14+
- name: Dependabot metadata
15+
id: metadata
16+
uses: dependabot/[email protected]
17+
with:
18+
github-token: "${{ secrets.GITHUB_TOKEN }}"
19+
20+
- name: Auto-merge Dependabot PRs for semver-minor updates
21+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
22+
run: gh pr merge --auto --merge "$PR_URL"
23+
env:
24+
PR_URL: ${{github.event.pull_request.html_url}}
25+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
27+
- name: Auto-merge Dependabot PRs for semver-patch updates
28+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
29+
run: gh pr merge --auto --merge "$PR_URL"
30+
env:
31+
PR_URL: ${{github.event.pull_request.html_url}}
32+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+20
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
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/[email protected]
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

-23
This file was deleted.

.github/workflows/phpstan.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: PHPStan
2+
3+
on:
4+
push:
5+
paths:
6+
- '**.php'
7+
- 'phpstan.neon.dist'
8+
9+
jobs:
10+
phpstan:
11+
name: phpstan
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Setup PHP
17+
uses: shivammathur/setup-php@v2
18+
with:
19+
php-version: '8.4'
20+
coverage: none
21+
22+
- name: Install composer dependencies
23+
uses: ramsey/composer-install@v3
24+
25+
- name: Run PHPStan
26+
run: ./vendor/bin/phpstan --error-format=github

.github/workflows/psalm.yml

-33
This file was deleted.

.github/workflows/release.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: release
2+
3+
on:
4+
pull_request:
5+
types:
6+
- closed
7+
branches:
8+
- main
9+
jobs:
10+
release:
11+
name: Release
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
fetch-depth: '0'
17+
- name: Bump version and push tag
18+
uses: anothrNick/github-tag-action@master
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
21+
WITH_V: true
22+
RELEASE_BRANCHES: main
23+
DEFAULT_BUMP: minor

.github/workflows/run-tests.yml

+10-11
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

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
.idea
2-
.php-cs-fixer.php
3-
.php-cs-fixer.cache
42
.phpunit.result.cache
5-
build
3+
.phpunit.cache
64
composer.lock
75
coverage
8-
docs
96
phpunit.xml
10-
psalm.xml
7+
phpstan.neon
118
testbench.yaml
129
vendor
1310
node_modules
11+
.phpactor.json
12+
build

.php-cs-fixer.dist.php

-51
This file was deleted.

0 commit comments

Comments
 (0)