mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 02:58:43 +02:00
N°8834 - Add compatibility with PHP 8.4 (#819)
* N°8834 - Add compatibility with PHP 8.4 * Rollback of scssphp/scssphp version upgrade due to compilation error
This commit is contained in:
@@ -54,6 +54,8 @@ return static function (ContainerConfigurator $container) {
|
||||
])
|
||||
->alias(AssetMapperInterface::class, 'asset_mapper')
|
||||
|
||||
->alias('asset_mapper.http_client', 'http_client')
|
||||
|
||||
->set('asset_mapper.mapped_asset_factory', MappedAssetFactory::class)
|
||||
->args([
|
||||
service('asset_mapper.public_assets_path_resolver'),
|
||||
@@ -75,6 +77,7 @@ return static function (ContainerConfigurator $container) {
|
||||
param('kernel.project_dir'),
|
||||
abstract_arg('array of excluded path patterns'),
|
||||
abstract_arg('exclude dot files'),
|
||||
param('kernel.debug'),
|
||||
])
|
||||
|
||||
->set('asset_mapper.public_assets_path_resolver', PublicAssetsPathResolver::class)
|
||||
@@ -196,7 +199,7 @@ return static function (ContainerConfigurator $container) {
|
||||
])
|
||||
|
||||
->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class)
|
||||
->args([service('http_client')])
|
||||
->args([service('asset_mapper.http_client')])
|
||||
|
||||
->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
|
||||
->args([
|
||||
@@ -211,12 +214,12 @@ return static function (ContainerConfigurator $container) {
|
||||
->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
|
||||
->args([
|
||||
service('asset_mapper.importmap.config_reader'),
|
||||
service('http_client'),
|
||||
service('asset_mapper.http_client'),
|
||||
])
|
||||
->set('asset_mapper.importmap.update_checker', ImportMapUpdateChecker::class)
|
||||
->args([
|
||||
service('asset_mapper.importmap.config_reader'),
|
||||
service('http_client'),
|
||||
service('asset_mapper.http_client'),
|
||||
])
|
||||
|
||||
->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
|
||||
|
||||
@@ -88,7 +88,7 @@ return static function (ContainerConfigurator $container) {
|
||||
'', // namespace
|
||||
0, // default lifetime
|
||||
abstract_arg('version'),
|
||||
sprintf('%s/pools/system', param('kernel.cache_dir')),
|
||||
\sprintf('%s/pools/system', param('kernel.cache_dir')),
|
||||
service('logger')->ignoreOnInvalid(),
|
||||
])
|
||||
->tag('cache.pool', ['clearer' => 'cache.system_clearer', 'reset' => 'reset'])
|
||||
@@ -110,7 +110,7 @@ return static function (ContainerConfigurator $container) {
|
||||
->args([
|
||||
'', // namespace
|
||||
0, // default lifetime
|
||||
sprintf('%s/pools/app', param('kernel.cache_dir')),
|
||||
\sprintf('%s/pools/app', param('kernel.cache_dir')),
|
||||
service('cache.default_marshaller')->ignoreOnInvalid(),
|
||||
])
|
||||
->call('setLogger', [service('logger')->ignoreOnInvalid()])
|
||||
|
||||
@@ -56,7 +56,7 @@ return static function (ContainerConfigurator $container) {
|
||||
->set('data_collector.logger', LoggerDataCollector::class)
|
||||
->args([
|
||||
service('logger')->ignoreOnInvalid(),
|
||||
sprintf('%s/%s', param('kernel.build_dir'), param('kernel.container_class')),
|
||||
\sprintf('%s/%s', param('kernel.build_dir'), param('kernel.container_class')),
|
||||
service('.virtual_request_stack')->ignoreOnInvalid(),
|
||||
])
|
||||
->tag('monolog.logger', ['channel' => 'profiler'])
|
||||
|
||||
@@ -39,6 +39,7 @@ return static function (ContainerConfigurator $container) {
|
||||
->factory('current')
|
||||
->args([[service('http_client.transport')]])
|
||||
->tag('http_client.client')
|
||||
->tag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
|
||||
|
||||
->alias(HttpClientInterface::class, 'http_client')
|
||||
|
||||
|
||||
@@ -45,11 +45,7 @@ return static function (ContainerConfigurator $container) {
|
||||
tagged_iterator('mailer.transport_factory'),
|
||||
])
|
||||
|
||||
->set('mailer.default_transport', TransportInterface::class)
|
||||
->factory([service('mailer.transport_factory'), 'fromString'])
|
||||
->args([
|
||||
abstract_arg('env(MAILER_DSN)'),
|
||||
])
|
||||
->alias('mailer.default_transport', 'mailer.transports')
|
||||
->alias(TransportInterface::class, 'mailer.default_transport')
|
||||
|
||||
->set('mailer.messenger.message_handler', MessageHandler::class)
|
||||
|
||||
@@ -73,7 +73,10 @@ return static function (ContainerConfigurator $container) {
|
||||
->tag('notifier.channel', ['channel' => 'email'])
|
||||
|
||||
->set('notifier.channel.push', PushChannel::class)
|
||||
->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
|
||||
->args([
|
||||
service('texter.transports'),
|
||||
abstract_arg('message bus'),
|
||||
])
|
||||
->tag('notifier.channel', ['channel' => 'push'])
|
||||
|
||||
->set('notifier.monolog_handler', NotifierHandler::class)
|
||||
|
||||
@@ -40,7 +40,7 @@ return static function (ContainerConfigurator $container) {
|
||||
|
||||
->set('console_profiler_listener', ConsoleProfilerListener::class)
|
||||
->args([
|
||||
service('profiler'),
|
||||
service('.lazy_profiler'),
|
||||
service('.virtual_request_stack'),
|
||||
service('debug.stopwatch'),
|
||||
param('kernel.runtime_mode.cli'),
|
||||
@@ -48,6 +48,11 @@ return static function (ContainerConfigurator $container) {
|
||||
])
|
||||
->tag('kernel.event_subscriber')
|
||||
|
||||
->set('.lazy_profiler', Profiler::class)
|
||||
->factory('current')
|
||||
->args([[service('profiler')]])
|
||||
->lazy()
|
||||
|
||||
->set('.virtual_request_stack', VirtualRequestStack::class)
|
||||
->args([service('request_stack')])
|
||||
->public()
|
||||
|
||||
@@ -266,6 +266,7 @@
|
||||
<xsd:element name="static-method" type="xsd:string" />
|
||||
<xsd:element name="mapping" type="file_mapping" />
|
||||
<xsd:element name="auto-mapping" type="auto_mapping" />
|
||||
<xsd:element name="not-compromised-password" type="not-compromised-password" />
|
||||
</xsd:choice>
|
||||
|
||||
<xsd:attribute name="enabled" type="xsd:boolean" />
|
||||
@@ -294,11 +295,17 @@
|
||||
<xsd:simpleType name="email-validation-mode">
|
||||
<xsd:restriction base="xsd:string">
|
||||
<xsd:enumeration value="html5" />
|
||||
<xsd:enumeration value="html5-allow-no-tld" />
|
||||
<xsd:enumeration value="loose" />
|
||||
<xsd:enumeration value="strict" />
|
||||
</xsd:restriction>
|
||||
</xsd:simpleType>
|
||||
|
||||
<xsd:complexType name="not-compromised-password">
|
||||
<xsd:attribute name="enabled" type="xsd:boolean" />
|
||||
<xsd:attribute name="endpoint" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
|
||||
<xsd:complexType name="annotations">
|
||||
<xsd:attribute name="cache" type="xsd:string" />
|
||||
<xsd:attribute name="debug" type="xsd:string" />
|
||||
@@ -464,7 +471,8 @@
|
||||
<xsd:element name="metadata" type="metadata" minOccurs="0" maxOccurs="unbounded" />
|
||||
<xsd:element name="guard" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
<xsd:attribute name="key" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
|
||||
<xsd:complexType name="place" mixed="true">
|
||||
@@ -551,7 +559,7 @@
|
||||
|
||||
<xsd:complexType name="lock">
|
||||
<xsd:sequence>
|
||||
<xsd:element name="resource" type="lock_resource" minOccurs="1" maxOccurs="unbounded" />
|
||||
<xsd:element name="resource" type="lock_resource" minOccurs="0" maxOccurs="unbounded" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="enabled" type="xsd:boolean" />
|
||||
</xsd:complexType>
|
||||
@@ -781,7 +789,7 @@
|
||||
<xsd:complexType name="mailer_envelope">
|
||||
<xsd:sequence>
|
||||
<xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="recipients" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
|
||||
<xsd:element name="recipient" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
|
||||
</xsd:sequence>
|
||||
</xsd:complexType>
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ return static function (ContainerConfigurator $container) {
|
||||
|
||||
$container->services()
|
||||
->set('serializer', Serializer::class)
|
||||
->args([[], []])
|
||||
->args([[], [], []])
|
||||
|
||||
->alias(SerializerInterface::class, 'serializer')
|
||||
->alias(NormalizerInterface::class, 'serializer')
|
||||
@@ -116,7 +116,7 @@ return static function (ContainerConfigurator $container) {
|
||||
|
||||
->set('serializer.normalizer.translatable', TranslatableNormalizer::class)
|
||||
->args(['$translator' => service('translator')])
|
||||
->tag('serializer.normalizer', ['priority' => -890])
|
||||
->tag('serializer.normalizer', ['priority' => -920])
|
||||
|
||||
->set('serializer.normalizer.form_error', FormErrorNormalizer::class)
|
||||
->tag('serializer.normalizer', ['priority' => -915])
|
||||
@@ -129,6 +129,8 @@ return static function (ContainerConfigurator $container) {
|
||||
service('property_info')->ignoreOnInvalid(),
|
||||
service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
|
||||
null,
|
||||
null,
|
||||
service('property_info')->ignoreOnInvalid(),
|
||||
])
|
||||
->tag('serializer.normalizer', ['priority' => -1000])
|
||||
|
||||
|
||||
@@ -100,6 +100,7 @@ return static function (ContainerConfigurator $container) {
|
||||
->alias(HttpKernelInterface::class, 'http_kernel')
|
||||
|
||||
->set('request_stack', RequestStack::class)
|
||||
->tag('kernel.reset', ['method' => 'resetRequestFormats', 'on_invalid' => 'ignore'])
|
||||
->public()
|
||||
->alias(RequestStack::class, 'request_stack')
|
||||
|
||||
@@ -130,7 +131,7 @@ return static function (ContainerConfigurator $container) {
|
||||
->args([
|
||||
tagged_iterator('kernel.cache_warmer'),
|
||||
param('kernel.debug'),
|
||||
sprintf('%s/%sDeprecations.log', param('kernel.build_dir'), param('kernel.container_class')),
|
||||
\sprintf('%s/%sDeprecations.log', param('kernel.build_dir'), param('kernel.container_class')),
|
||||
])
|
||||
->tag('container.no_preload')
|
||||
|
||||
|
||||
@@ -90,6 +90,7 @@ return static function (ContainerConfigurator $container) {
|
||||
'session_factory' => service('session.factory')->ignoreOnInvalid(),
|
||||
'logger' => service('logger')->ignoreOnInvalid(),
|
||||
'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
|
||||
'request_stack' => service('request_stack')->ignoreOnInvalid(),
|
||||
]),
|
||||
param('kernel.debug'),
|
||||
param('session.storage.options'),
|
||||
|
||||
Reference in New Issue
Block a user