Skip to content

Add php8.5 to the matrix #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frankdekker merged 4 commits into from
Nov 30, 2025
Merged

Add php8.5 to the matrix #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d802665
Add php8.5 to the matrix
frankdekker Nov 30, 2025
ead3918
Add php8.5 to the matrix
frankdekker Nov 30, 2025
c0dfeb2
Fix phpstan types for PHP8.5
frankdekker Nov 30, 2025
db6db31
Fix phpstan types for PHP8.5
frankdekker Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
composer-flags: [ '', '--prefer-lowest' ]
exclude:
- php-version: '8.4'
composer-flags: '--prefer-lowest'
- php-version: '8.5'
composer-flags: '--prefer-lowest'
steps:
- uses: actions/checkout@v6

Expand All @@ -39,15 +41,15 @@ jobs:
run: composer test

coverage:
name: PHP 8.4 - Test with coverage
name: PHP 8.5 - Test with coverage
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.4
php-version: 8.5
coverage: pcov

- name: Install dependencies
Expand All @@ -74,7 +76,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
php-version: 8.5
coverage: none

- name: Install dependencies
Expand Down
23 changes: 14 additions & 9 deletions src/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Closure;
use FD\LogViewer\Service\File\Monolog\MonologLineParser;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;

Expand All @@ -16,10 +15,12 @@
*/
final class Configuration implements ConfigurationInterface
{
/**
* @return TreeBuilder<'array'>
*/
public function getConfigTreeBuilder(): TreeBuilder
{
$tree = new TreeBuilder('fd_log_viewer');
/** @var ArrayNodeDefinition $rootNode */
$tree = new TreeBuilder('fd_log_viewer');
$rootNode = $tree->getRootNode();

$rootNode
Expand All @@ -31,10 +32,12 @@ public function getConfigTreeBuilder(): TreeBuilder
return $tree;
}

private function configureLogFiles(): NodeDefinition
/**
* @return ArrayNodeDefinition<null>
*/
private function configureLogFiles(): ArrayNodeDefinition
{
$tree = new TreeBuilder('log_files');
/** @var ArrayNodeDefinition $rootNode */
$tree = new TreeBuilder('log_files');
$rootNode = $tree->getRootNode();

return $rootNode
Expand Down Expand Up @@ -113,10 +116,12 @@ private function configureLogFiles(): NodeDefinition
->end();
}

private function configureHosts(): NodeDefinition
/**
* @return ArrayNodeDefinition<null>
*/
private function configureHosts(): ArrayNodeDefinition
{
$tree = new TreeBuilder('hosts');
/** @var ArrayNodeDefinition $rootNode */
$tree = new TreeBuilder('hosts');
$rootNode = $tree->getRootNode();

return $rootNode
Expand Down