Fix various compatibility issues with PHP 8
This commit is contained in:
Frédéric Guillot
committed by
Frédéric Guillot
Frédéric Guillot
parent
f5bb55bdb8
commit
4bf3b0d459
23
libs/swiftmailer/dependency_maps/cache_deps.php
Normal file
23
libs/swiftmailer/dependency_maps/cache_deps.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
Swift_DependencyContainer::getInstance()
|
||||
->register('cache')
|
||||
->asAliasOf('cache.array')
|
||||
|
||||
->register('tempdir')
|
||||
->asValue('/tmp')
|
||||
|
||||
->register('cache.null')
|
||||
->asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
|
||||
|
||||
->register('cache.array')
|
||||
->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
|
||||
->withDependencies(array('cache.inputstream'))
|
||||
|
||||
->register('cache.disk')
|
||||
->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
|
||||
->withDependencies(array('cache.inputstream', 'tempdir'))
|
||||
|
||||
->register('cache.inputstream')
|
||||
->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
|
||||
;
|
||||
9
libs/swiftmailer/dependency_maps/message_deps.php
Normal file
9
libs/swiftmailer/dependency_maps/message_deps.php
Normal file
@@ -0,0 +1,9 @@
|
||||
<?php
|
||||
|
||||
Swift_DependencyContainer::getInstance()
|
||||
->register('message.message')
|
||||
->asNewInstanceOf('Swift_Message')
|
||||
|
||||
->register('message.mimepart')
|
||||
->asNewInstanceOf('Swift_MimePart')
|
||||
;
|
||||
123
libs/swiftmailer/dependency_maps/mime_deps.php
Normal file
123
libs/swiftmailer/dependency_maps/mime_deps.php
Normal file
@@ -0,0 +1,123 @@
|
||||
<?php
|
||||
|
||||
require __DIR__.'/../mime_types.php';
|
||||
|
||||
Swift_DependencyContainer::getInstance()
|
||||
->register('properties.charset')
|
||||
->asValue('utf-8')
|
||||
|
||||
->register('mime.grammar')
|
||||
->asSharedInstanceOf('Swift_Mime_Grammar')
|
||||
|
||||
->register('mime.message')
|
||||
->asNewInstanceOf('Swift_Mime_SimpleMessage')
|
||||
->withDependencies(array(
|
||||
'mime.headerset',
|
||||
'mime.qpcontentencoder',
|
||||
'cache',
|
||||
'mime.grammar',
|
||||
'properties.charset',
|
||||
))
|
||||
|
||||
->register('mime.part')
|
||||
->asNewInstanceOf('Swift_Mime_MimePart')
|
||||
->withDependencies(array(
|
||||
'mime.headerset',
|
||||
'mime.qpcontentencoder',
|
||||
'cache',
|
||||
'mime.grammar',
|
||||
'properties.charset',
|
||||
))
|
||||
|
||||
->register('mime.attachment')
|
||||
->asNewInstanceOf('Swift_Mime_Attachment')
|
||||
->withDependencies(array(
|
||||
'mime.headerset',
|
||||
'mime.base64contentencoder',
|
||||
'cache',
|
||||
'mime.grammar',
|
||||
))
|
||||
->addConstructorValue($swift_mime_types)
|
||||
|
||||
->register('mime.embeddedfile')
|
||||
->asNewInstanceOf('Swift_Mime_EmbeddedFile')
|
||||
->withDependencies(array(
|
||||
'mime.headerset',
|
||||
'mime.base64contentencoder',
|
||||
'cache',
|
||||
'mime.grammar',
|
||||
))
|
||||
->addConstructorValue($swift_mime_types)
|
||||
|
||||
->register('mime.headerfactory')
|
||||
->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
|
||||
->withDependencies(array(
|
||||
'mime.qpheaderencoder',
|
||||
'mime.rfc2231encoder',
|
||||
'mime.grammar',
|
||||
'properties.charset',
|
||||
))
|
||||
|
||||
->register('mime.headerset')
|
||||
->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
|
||||
->withDependencies(array('mime.headerfactory', 'properties.charset'))
|
||||
|
||||
->register('mime.qpheaderencoder')
|
||||
->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
|
||||
->withDependencies(array('mime.charstream'))
|
||||
|
||||
->register('mime.base64headerencoder')
|
||||
->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
|
||||
->withDependencies(array('mime.charstream'))
|
||||
|
||||
->register('mime.charstream')
|
||||
->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
|
||||
->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
|
||||
|
||||
->register('mime.bytecanonicalizer')
|
||||
->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
|
||||
->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
|
||||
->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
|
||||
|
||||
->register('mime.characterreaderfactory')
|
||||
->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
|
||||
|
||||
->register('mime.safeqpcontentencoder')
|
||||
->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
|
||||
->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
|
||||
|
||||
->register('mime.rawcontentencoder')
|
||||
->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
|
||||
|
||||
->register('mime.nativeqpcontentencoder')
|
||||
->withDependencies(array('properties.charset'))
|
||||
->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
|
||||
|
||||
->register('mime.qpcontentencoderproxy')
|
||||
->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
|
||||
->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
|
||||
|
||||
->register('mime.7bitcontentencoder')
|
||||
->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
|
||||
->addConstructorValue('7bit')
|
||||
->addConstructorValue(true)
|
||||
|
||||
->register('mime.8bitcontentencoder')
|
||||
->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
|
||||
->addConstructorValue('8bit')
|
||||
->addConstructorValue(true)
|
||||
|
||||
->register('mime.base64contentencoder')
|
||||
->asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
|
||||
|
||||
->register('mime.rfc2231encoder')
|
||||
->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
|
||||
->withDependencies(array('mime.charstream'))
|
||||
|
||||
// As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
|
||||
// see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
|
||||
->register('mime.qpcontentencoder')
|
||||
->asAliasOf(PHP_VERSION_ID >= 50407 ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
|
||||
;
|
||||
|
||||
unset($swift_mime_types);
|
||||
76
libs/swiftmailer/dependency_maps/transport_deps.php
Normal file
76
libs/swiftmailer/dependency_maps/transport_deps.php
Normal file
@@ -0,0 +1,76 @@
|
||||
<?php
|
||||
|
||||
Swift_DependencyContainer::getInstance()
|
||||
->register('transport.smtp')
|
||||
->asNewInstanceOf('Swift_Transport_EsmtpTransport')
|
||||
->withDependencies(array(
|
||||
'transport.buffer',
|
||||
array('transport.authhandler'),
|
||||
'transport.eventdispatcher',
|
||||
))
|
||||
|
||||
->register('transport.sendmail')
|
||||
->asNewInstanceOf('Swift_Transport_SendmailTransport')
|
||||
->withDependencies(array(
|
||||
'transport.buffer',
|
||||
'transport.eventdispatcher',
|
||||
))
|
||||
|
||||
->register('transport.mail')
|
||||
->asNewInstanceOf('Swift_Transport_MailTransport')
|
||||
->withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
|
||||
|
||||
->register('transport.loadbalanced')
|
||||
->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
|
||||
|
||||
->register('transport.failover')
|
||||
->asNewInstanceOf('Swift_Transport_FailoverTransport')
|
||||
|
||||
->register('transport.spool')
|
||||
->asNewInstanceOf('Swift_Transport_SpoolTransport')
|
||||
->withDependencies(array('transport.eventdispatcher'))
|
||||
|
||||
->register('transport.null')
|
||||
->asNewInstanceOf('Swift_Transport_NullTransport')
|
||||
->withDependencies(array('transport.eventdispatcher'))
|
||||
|
||||
->register('transport.mailinvoker')
|
||||
->asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
|
||||
|
||||
->register('transport.buffer')
|
||||
->asNewInstanceOf('Swift_Transport_StreamBuffer')
|
||||
->withDependencies(array('transport.replacementfactory'))
|
||||
|
||||
->register('transport.authhandler')
|
||||
->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
|
||||
->withDependencies(array(
|
||||
array(
|
||||
'transport.crammd5auth',
|
||||
'transport.loginauth',
|
||||
'transport.plainauth',
|
||||
'transport.ntlmauth',
|
||||
'transport.xoauth2auth',
|
||||
),
|
||||
))
|
||||
|
||||
->register('transport.crammd5auth')
|
||||
->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
|
||||
|
||||
->register('transport.loginauth')
|
||||
->asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
|
||||
|
||||
->register('transport.plainauth')
|
||||
->asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
|
||||
|
||||
->register('transport.xoauth2auth')
|
||||
->asNewInstanceOf('Swift_Transport_Esmtp_Auth_XOAuth2Authenticator')
|
||||
|
||||
->register('transport.ntlmauth')
|
||||
->asNewInstanceOf('Swift_Transport_Esmtp_Auth_NTLMAuthenticator')
|
||||
|
||||
->register('transport.eventdispatcher')
|
||||
->asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
|
||||
|
||||
->register('transport.replacementfactory')
|
||||
->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
|
||||
;
|
||||
Reference in New Issue
Block a user