Skip to content

feat: PHP 8.5 and Symfony 8 support #323

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

Open
kbond wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

feat: PHP 8.5 and Symfony 8 support #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [ 8.1, 8.2, 8.3, 8.4 ]
php: [ 8.2, 8.3, 8.4, 8.5 ]
deps: [ highest ]
symfony: [ 6.4.*, 7.2.*, 7.3.* ]
symfony: [ 6.4.*, 7.4.*, 8.0.* ]
include:
- php: 8.1
- php: 8.2
deps: lowest
symfony: '*'
exclude:
- php: 8.1
symfony: 7.2.*
- php: 8.1
symfony: 7.3.*
- php: 8.3
symfony: 8.0.*
- php: 8.2
symfony: 8.0.*

steps:
- name: Checkout code
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
coverage: xdebug

- name: Install dependencies
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
coverage: none

- name: Validate composer.json
Expand Down
4 changes: 2 additions & 2 deletions DependencyInjection/Compiler/MailerCompilerPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function process(ContainerBuilder $container): void
throw new \InvalidArgumentException('To enable mail reporting you have to install "symfony/mailer".');
}

$loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));
$loader->load('symfony_mailer.xml');
$loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));
$loader->load('symfony_mailer.php');
}
}
12 changes: 6 additions & 6 deletions DependencyInjection/LiipMonitorExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ public function __construct()
*/
public function load(array $configs, ContainerBuilder $container): void
{
$loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('runner.xml');
$loader->load('helper.xml');
$loader->load('commands.xml');
$loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('runner.php');
$loader->load('helper.php');
$loader->load('commands.php');

$configuration = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($configuration, $configs);
Expand All @@ -47,7 +47,7 @@ public function load(array $configs, ContainerBuilder $container): void
if ($config['enable_controller']) {
$container->setParameter(sprintf('%s.view_template', $this->getAlias()), $config['view_template']);
$container->setParameter(sprintf('%s.failure_status_code', $this->getAlias()), $config['failure_status_code']);
$loader->load('controller.xml');
$loader->load('controller.php');
}

$this->configureMailer($container, $config);
Expand All @@ -74,7 +74,7 @@ public function load(array $configs, ContainerBuilder $container): void
$this->setParameters($container, $check, $group, $values);

if (!in_array($check, $checksLoaded)) {
$loader->load('checks/'.$check.'.xml');
$loader->load('checks/'.$check.'.php');
$checksLoaded[] = $check;
}
}
Expand Down
16 changes: 16 additions & 0 deletions Resources/config/checks/apc_fragmentation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.apc_fragmentation', \Laminas\Diagnostics\Check\ApcFragmentation::class)
->public()
->args([
'%%liip_monitor.check.apc_fragmentation.warning%%',
'%%liip_monitor.check.apc_fragmentation.critical%%',
Comment on lines +12 to +13
Copy link

@GromNaN GromNaN Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised by the double %%? They look like parameters, and %% is for escaped %.

Numeric values are expected.

Suggested change
'%%liip_monitor.check.apc_fragmentation.warning%%',
'%%liip_monitor.check.apc_fragmentation.critical%%',
param('liip_monitor.check.apc_fragmentation.warning'),
param('liip_monitor.check.apc_fragmentation.critical'),

])
->tag('liip_monitor.check', ['alias' => 'apc_fragmentation']);
};
14 changes: 0 additions & 14 deletions Resources/config/checks/apc_fragmentation.xml
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions Resources/config/checks/apc_memory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.apc_memory', \Laminas\Diagnostics\Check\ApcMemory::class)
->public()
->args([
'%%liip_monitor.check.apc_memory.warning%%',
'%%liip_monitor.check.apc_memory.critical%%',
])
->tag('liip_monitor.check', ['alias' => 'apc_memory']);
};
14 changes: 0 additions & 14 deletions Resources/config/checks/apc_memory.xml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions Resources/config/checks/class_exists.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.class_exists', \Laminas\Diagnostics\Check\ClassExists::class)
->public()
->args(['%%liip_monitor.check.class_exists%%'])
->tag('liip_monitor.check', ['alias' => 'class_exists']);
};
13 changes: 0 additions & 13 deletions Resources/config/checks/class_exists.xml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions Resources/config/checks/cpu_performance.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.cpu_performance', \Laminas\Diagnostics\Check\CpuPerformance::class)
->public()
->args(['%%liip_monitor.check.cpu_performance%%'])
->tag('liip_monitor.check', ['alias' => 'cpu_performance']);
};
13 changes: 0 additions & 13 deletions Resources/config/checks/cpu_performance.xml
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions Resources/config/checks/custom_error_pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.custom_error_pages', \Liip\MonitorBundle\Check\CustomErrorPages::class)
->public()
->args([
'%%liip_monitor.check.custom_error_pages.error_codes%%',
'%%liip_monitor.check.custom_error_pages.path%%',
'%kernel.project_dir%',
])
->tag('liip_monitor.check', ['alias' => 'custom_error_pages']);
};
15 changes: 0 additions & 15 deletions Resources/config/checks/custom_error_pages.xml
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions Resources/config/checks/disk_usage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.disk_usage', \Laminas\Diagnostics\Check\DiskUsage::class)
->public()
->args([
'%%liip_monitor.check.disk_usage.warning%%',
'%%liip_monitor.check.disk_usage.critical%%',
'%%liip_monitor.check.disk_usage.path%%',
])
->tag('liip_monitor.check', ['alias' => 'disk_usage']);
};
15 changes: 0 additions & 15 deletions Resources/config/checks/disk_usage.xml
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions Resources/config/checks/doctrine_dbal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.doctrine_dbal', \Liip\MonitorBundle\Check\DoctrineDbalCollection::class)
->public()
->args([
service('doctrine'),
'%%liip_monitor.check.doctrine_dbal%%',
])
->tag('liip_monitor.check_collection');
};
14 changes: 0 additions & 14 deletions Resources/config/checks/doctrine_dbal.xml
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions Resources/config/checks/doctrine_migrations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.doctrine_migrations', \Liip\MonitorBundle\Check\DoctrineMigrationsCollection::class)
->public()
->args([
service('service_container'),
'%%liip_monitor.check.doctrine_migrations%%',
])
->tag('liip_monitor.check_collection');
};
16 changes: 0 additions & 16 deletions Resources/config/checks/doctrine_migrations.xml
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions Resources/config/checks/doctrine_mongodb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.doctrine_mongodb', \Liip\MonitorBundle\Check\DoctrineMongoDbCollection::class)
->public()
->args([
service('doctrine_mongodb'),
'%%liip_monitor.check.doctrine_mongodb%%',
])
->tag('liip_monitor.check_collection');
};
14 changes: 0 additions & 14 deletions Resources/config/checks/doctrine_mongodb.xml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions Resources/config/checks/expressions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set('liip_monitor.check.expressions', \Liip\MonitorBundle\Check\ExpressionCollection::class)
->public()
->args(['%%liip_monitor.check.expressions%%'])
->tag('liip_monitor.check_collection');
};
Loading
Loading