Skip to content

Commit

Permalink
Merge branch '1.x'
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
  • Loading branch information
crynobone committed Jan 28, 2025
2 parents f6d5891 + f185600 commit e813fba
Show file tree
Hide file tree
Showing 98 changed files with 1,840 additions and 878 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
.gitignore export-ignore
.styleci.yml export-ignore
CHANGELOG.md export-ignore
phpstan.neon.dist export-ignore
phpunit.xml.dist export-ignore
UPGRADE.md export-ignore
17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/1_Bug_report.md

This file was deleted.

47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/1_Bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Bug Report
description: "Report something that's broken."
body:
- type: markdown
attributes:
value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
- type: input
attributes:
label: Fortify Version
description: Provide the Fortify version that you are using.
placeholder: 1.6.1
validations:
required: true
- type: input
attributes:
label: Laravel Version
description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy)
placeholder: 10.4.1
validations:
required: true
- type: input
attributes:
label: PHP Version
description: Provide the PHP version that you are using.
placeholder: 8.1.4
validations:
required: true
- type: input
attributes:
label: Database Driver & Version
description: If applicable, provide the database driver and version you are using.
placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
validations:
required: false
- type: textarea
attributes:
label: Description
description: Provide a detailed description of the issue you are facing.
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
validations:
required: true

4 changes: 0 additions & 4 deletions .github/ISSUE_TEMPLATE/2_Feature_request.md

This file was deleted.

3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Feature request
url: https://github.com/laravel/fortify/pulls
about: 'For ideas or feature requests, send in a pull request'
- name: Support question
url: https://laravel.com/docs/contributions#support-questions
about: 'This repository is only for reporting bugs. If you need help using the library, click:'
Expand Down
2 changes: 1 addition & 1 deletion .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ If you discover a security vulnerability within Laravel, please send an email to
```
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: OpenPGP v2.0.8
Comment: https://sela.io/pgp/
Comment: Report Security Vulnerabilities to taylor@laravel.com
xsFNBFugFSQBEACxEKhIY9IoJzcouVTIYKJfWFGvwFgbRjQWBiH3QdHId5vCrbWo
s2l+4Rv03gMG+yHLJ3rWElnNdRaNdQv59+lShrZF7Bvu7Zvc0mMNmFOM/mQ/K2Lt
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: issues

on:
issues:
types: [labeled]

permissions:
issues: write

jobs:
help-wanted:
uses: laravel/.github/.github/workflows/issues.yml@main
12 changes: 12 additions & 0 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: pull requests

on:
pull_request_target:
types: [opened]

permissions:
pull-requests: write

jobs:
uneditable:
uses: laravel/.github/.github/workflows/pull-requests.yml@main
15 changes: 15 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: static analysis

on:
push:
branches:
- master
- '*.x'
pull_request:

permissions:
contents: read

jobs:
tests:
uses: laravel/.github/.github/workflows/static-analysis.yml@main
27 changes: 17 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,47 @@ name: tests

on:
push:
branches:
- master
- '*.x'
pull_request:
schedule:
- cron: '0 0 * * *'

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
fail-fast: true
matrix:
php: [7.3, 7.4, '8.0', 8.1]
laravel: [8, 9]
php: [8.1, 8.2, 8.3, 8.4]
laravel: [10, 11, 12]
exclude:
- php: 7.3
laravel: 9
- php: 7.4
laravel: 9
- php: 8.4
laravel: 10
- php: 8.1
laravel: 11
- php: 8.1
laravel: 12

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip
ini-values: error_reporting=E_ALL
tools: composer:v2
coverage: none

- name: Install dependencies
run: composer require "illuminate/contracts=^${{ matrix.laravel }}" --prefer-dist --no-interaction
run: composer update --prefer-dist --no-interaction --no-progress --with="illuminate/support=^${{ matrix.laravel }}"

- name: Execute tests
run: vendor/bin/phpunit --verbose
run: vendor/bin/phpunit --display-deprecations
24 changes: 2 additions & 22 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,9 @@
name: "Update Changelog"
name: update changelog

on:
release:
types: [released]

jobs:
update:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.ref_name }}

- name: Update Changelog
uses: stefanzweifel/changelog-updater-action@v1
with:
latest-version: ${{ github.event.release.tag_name }}
release-notes: ${{ github.event.release.body }}
compare-url-target-revision: ${{ github.event.release.target_commitish }}

- name: Commit updated CHANGELOG
uses: stefanzweifel/git-auto-commit-action@v4
with:
branch: ${{ github.event.release.target_commitish }}
commit_message: Update CHANGELOG.md
file_pattern: CHANGELOG.md
uses: laravel/.github/.github/workflows/update-changelog.yml@main
Loading

0 comments on commit e813fba

Please sign in to comment.