Skip to content

Commit

Permalink
Merge pull request #3 from IsmaelR04/add-support-for-php8.4
Browse files Browse the repository at this point in the history
Add support for php 8.4
  • Loading branch information
llorensjj authored Dec 3, 2024
2 parents 9ff126d + d50c997 commit ae83cbc
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-php-8.4-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ runner.os }}-php-8.3-
${{ runner.os }}-php-8.4-
- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/style_fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-php-8.4-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ runner.os }}-php-8.3-
${{ runner.os }}-php-8.4-
- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,16 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.0, 8.1, 8.2, 8.3]
laravel: [9.*, 10.*, 11.*]
php: [8.2, 8.3, 8.4]
laravel: [10.*, 11.*]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*
exclude:
- laravel: 9.*
php: 8.3
- laravel: 10.*
php: 8.0
- laravel: 11.*
php: 8.0
- laravel: 11.*
php: 8.1
php: 8.4

steps:
- name: Checkout code
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
}
],
"require": {
"php": "^8.0",
"laravel/framework": "^9.0|^10.0|^11.0"
"php": "^8.2",
"laravel/framework": "^10.0|^11.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.4",
Expand Down Expand Up @@ -46,4 +46,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
2 changes: 1 addition & 1 deletion src/Models/Meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function metaData(): Attribute
);
}

public function getMetaByLang(string $lang = null): ?object
public function getMetaByLang(?string $lang = null): ?object
{
$langDefault = config('app.locale');
$langFallback = config('app.fallback_locale');
Expand Down

0 comments on commit ae83cbc

Please sign in to comment.