Skip to content

Commit

Permalink
Merge pull request #28 from BinarCode/laravel-12
Browse files Browse the repository at this point in the history
Laravel 12
  • Loading branch information
binaryk authored Mar 4, 2025
2 parents 84fd90a + 30d5d25 commit 5d21035
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://github.com/BinarCode/laravel-restify/discussions/new?category=q-a
url: https://github.com/BinarCode/laravel-tenantable/discussions/new?category=q-a
about: Ask the community for help
- name: Request a feature
url: https://github.com/BinarCode/laravel-restify/discussions/new?category=ideas
url: https://github.com/BinarCode/laravel-tenantable/discussions/new?category=ideas
about: Share ideas for new features
- name: Report a bug
url: https://github.com/BinarCode/laravel-restify/issues/new
url: https://github.com/BinarCode/laravel-tenantable/issues/new
about: Report a reproducable bug
2 changes: 1 addition & 1 deletion .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
if: github.event.pull_request.merged == true
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ncipollo/release-action@v1
with:
name: ${{ github.event.pull_request.title }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

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

Expand All @@ -18,6 +18,6 @@ jobs:
args: --config=.php_cs.dist.php --allow-risky=yes

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
42 changes: 21 additions & 21 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: Psalm

on:
push:
paths:
- '**.php'
- 'psalm.xml.dist'
push:
paths:
- '**.php'
- 'psalm.xml.dist'

jobs:
psalm:
psalm:
name: psalm
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

- name: Cache composer dependencies
uses: actions/cache@v2
with:
path: vendor
key: composer-${{ hashFiles('composer.lock') }}
- name: Cache composer dependencies
uses: actions/cache@v4
with:
path: vendor
key: composer-${{ hashFiles('composer.lock') }}

- name: Run composer install
run: composer install -n --prefer-dist
- name: Run composer install
run: composer install -n --prefer-dist

- name: Run psalm
run: ./vendor/bin/psalm --output-format=github
- name: Run psalm
run: ./vendor/bin/psalm --output-format=github
10 changes: 7 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,27 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.1, 8.2]
laravel: [10.*, 11.*]
php: [8.1, 8.2, 8.3, 8.4]
laravel: [10.*, 11.*, 12.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*
- laravel: 12.*
testbench: 10.*
exclude:
- laravel: 11.*
php: 8.1
- laravel: 12.*
php: 8.1

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

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

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
}
],
"require": {
"php": "^8.1",
"illuminate/contracts": "^10.0|^11.0"
"php": "^8.1|^8.2",
"illuminate/contracts": "^10.0|^11.0|^12.0"
},
"require-dev": {
"brianium/paratest": "^6.3|^7.0",
"orchestra/testbench": "^8.0|^9.0",
"phpunit/phpunit": "^9.3.3|^10.0|^11.0",
"orchestra/testbench": "^8.0|^9.0|^10.0",
"phpunit/phpunit": "^9.3.3|^10.0|^11.0|^12.0",
"spatie/laravel-ray": "^1.9",
"vimeo/psalm": "^4.4|^5.0|^6.0"
},
Expand Down

0 comments on commit 5d21035

Please sign in to comment.