composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 06:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8834 - Add compatibility with PHP 8.4 (#819)

Browse Source 
* N°8834 - Add compatibility with PHP 8.4

* Rollback of scssphp/scssphp version upgrade due to compilation error
This commit is contained in:
Lenaick
2026-02-26 10:36:32 +01:00
committed by GitHub
parent d4821b7edc
commit fc967c06ce
961 changed files with 12298 additions and 7130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/symfony/twig-bundle/DependencyInjection/Configuration.php
View File

@@ -157,7 +157,7 @@ class Configuration implements ConfigurationInterface
->normalizeKeys(false)
->useAttributeAsKey('paths')
->beforeNormalization()
->always()
->ifArray()
->then(function ($paths) {
$normalized = [];
foreach ($paths as $path => $namespace) {
@@ -221,7 +221,7 @@ class Configuration implements ConfigurationInterface
->arrayNode('mailer')
->children()
->scalarNode('html_to_text_converter')
->info(sprintf('A service implementing the "%s"', HtmlToTextConverterInterface::class))
->info(\sprintf('A service implementing the "%s"', HtmlToTextConverterInterface::class))
->defaultNull()
->end()
->end()

5
lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
View File

@@ -25,6 +25,7 @@ use Symfony\Component\Mailer\Mailer;
use Symfony\Component\Translation\LocaleSwitcher;
use Symfony\Component\Translation\Translator;
use Symfony\Contracts\Service\ResetInterface;
use Twig\Environment;
use Twig\Extension\ExtensionInterface;
use Twig\Extension\RuntimeExtensionInterface;
use Twig\Loader\LoaderInterface;
@@ -45,6 +46,10 @@ class TwigExtension extends Extension
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('twig.php');
if (method_exists(Environment::class, 'resetGlobals')) {
$container->getDefinition('twig')->addTag('kernel.reset', ['method' => 'resetGlobals']);
}
if ($container::willBeAvailable('symfony/form', Form::class, ['symfony/twig-bundle'])) {
$loader->load('form.php');