Pierre Goiffon
909fb4c75b
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# composer.lock
# core/email.class.inc.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_psr4.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/swiftmailer/swiftmailer/.gitattributes
# lib/swiftmailer/swiftmailer/.gitignore
# lib/swiftmailer/swiftmailer/.php_cs.dist
# lib/swiftmailer/swiftmailer/CHANGES
# lib/swiftmailer/swiftmailer/LICENSE
# lib/swiftmailer/swiftmailer/composer.json
# lib/swiftmailer/swiftmailer/lib/classes/Swift.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
# lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
# lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
# lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
# lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
# lib/swiftmailer/swiftmailer/lib/mime_types.php
# lib/swiftmailer/swiftmailer/lib/preferences.php
# lib/swiftmailer/swiftmailer/lib/swift_required.php
# lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
2022-04-29 16:37:39 +02:00
Pierre Goiffon
73c3c1249f
⬆️ N°4824 Composer libs : update scssphp/scssphp
2022-04-29 15:24:56 +02:00
Pierre Goiffon
64b25c4daa
📌 N°4284 Composer libs : fix twig/twig to ~1.42.5
...
Without specifying explicitly the Twig version, since the update of require php from 5.6 to 7.0 we are getting Twig 2.12.5 !
We don't want Twig 2 as this version changes the macro scope and causes massive changes in our code... This update will be done later in other branches.
2022-04-29 15:15:32 +02:00
Pierre Goiffon
d8e2a1cc7c
Merge branch 'support/2.7' into develop
...
# Conflicts:
# README.md
# composer.json
# composer.lock
# core/cmdbsource.class.inc.php
# core/dbobject.class.php
# datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
# datamodels/2.x/combodo-db-tools/dbtools.php
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# lib/composer/platform_check.php
# pages/ajax.render.php
# pages/csvimport.php
# setup/ajax.dataloader.php
# setup/index.php
# setup/setuputils.class.inc.php
# test/application/UtilsTest.php
2021-06-14 16:19:56 +02:00
Pierre Goiffon
afd9ddf46d
⬇️ Restore php-parser to its original version as tests are failing :/
2021-03-29 16:51:10 +02:00
Pierre Goiffon
a7e7e62245
⬆️ Upgrade lib : nikic/php-parser
...
We were on v3 that is no longer maintained and compatibility is annonced for PHP 7.2.
v4 is active and supports PHP up to 8.0
No problem to update as this is only used in the config editor (\Combodo\iTop\Config\Validator\iTopConfigAstValidator)
2021-03-29 16:35:30 +02:00
Molkobain
cc887c29fd
N°2696 - Upgrade SCSSPHP to v1.0.6 (PHP 7.4 compatibility)
2020-01-14 10:35:53 +01:00
bruno DA SILVA
c115f64cb5
N°2154 - Security breach
2020-01-06 15:31:31 +01:00
Molkobain
bb4c8ea52d
N°2435.2 Manage SCSSPHP lib using composer
2019-08-13 10:50:54 +02:00
