Skip to content

Commit

Permalink
Merge pull request #82 from Hi-Folks/upgrade/php-84
Browse files Browse the repository at this point in the history
Upgrade to PHP 84
  • Loading branch information
roberto-butti authored Nov 29, 2024
2 parents 04c2b95 + 27a4d44 commit 846fe58
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 8 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/php-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: [ '8.3', '8.2', '8.1' ]
php-versions: [ '8.4', '8.3', '8.2', '8.1' ]
dependency-stability: [ 'prefer-stable','prefer-lowest' ]

runs-on: ${{ matrix.operating-system }}


name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
name: Test P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

steps:
- uses: actions/checkout@v4
Expand All @@ -44,6 +44,27 @@ jobs:
SESSION_DRIVER: array
run: composer test


laravel-check:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: [ '8.3' ]

runs-on: ${{ matrix.operating-system }}


name: Check P${{ matrix.php-versions }} - ${{ matrix.operating-system}}

steps:
- uses: actions/checkout@v4
- name: Install PHP versions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Install Dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

- name: Execute Code Sniffer via phpcs
run: |
composer style-fix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
run: composer run-script test

- name: PHP Syntax Checker (Lint)
uses: StephaneBour/actions-php-lint@8.2
uses: StephaneBour/actions-php-lint@8.3
with:
dir: './src'
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 1.0.1 - WIP
- Upgrade to PHP 8.4

## 1.0.0 - 2024-03-13
- upgrading packages

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
}
],
"require": {
"php": "^8.0|^8.1|^8.2|^8.3",
"php": "^8.0|^8.1|^8.2|^8.3|^8.4",
"ext-json": "*",
"guzzlehttp/guzzle": "^7.8",
"nunomaduro/termwind": "^1.15|^2.0"
},
"require-dev": {
"doctrine/dbal": "^3.0|^4.0",
"larastan/larastan": "^1.0.0|^2.0",
"larastan/larastan": "^2.0",
"laravel/pint": "^1.4",
"orchestra/testbench": "^7.0|^8.0|^9.0",
"pestphp/pest": "^2.34",
Expand Down
6 changes: 3 additions & 3 deletions src/Lens/Traits/ConfigLens.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

trait ConfigLens
{
public function getConfigsDatabaseFromEnv(ResultLens $results = null): \HiFolks\LaraLens\ResultLens
public function getConfigsDatabaseFromEnv(ResultLens|null $results = null): \HiFolks\LaraLens\ResultLens
{
if (is_null($results)) {
$results = new ResultLens();
Expand All @@ -27,7 +27,7 @@ public function getConfigsDatabaseFromEnv(ResultLens $results = null): \HiFolks\
return $results;
}

public function checkDebugEnv(ResultLens $results = null): \HiFolks\LaraLens\ResultLens
public function checkDebugEnv(ResultLens|null $results = null): \HiFolks\LaraLens\ResultLens
{
if (is_null($results)) {
$results = new ResultLens();
Expand All @@ -52,7 +52,7 @@ public function checkDebugEnv(ResultLens $results = null): \HiFolks\LaraLens\Res
return $results;
}

public function getConfigsDatabase(ResultLens $results = null): \HiFolks\LaraLens\ResultLens
public function getConfigsDatabase(ResultLens|null $results = null): \HiFolks\LaraLens\ResultLens
{
if (is_null($results)) {
$results = new ResultLens();
Expand Down

0 comments on commit 846fe58

Please sign in to comment.