833 Commits

Author	SHA1	Message	Date
Pierre Goiffon	fe4aa9dcd7	N°3091 Update PHPUnit to 8.5 : fix setUp and teardDown methods signatures ... "Return type declaration must be compatible with parent" See https://phpunit.de/announcements/phpunit-8.html "Return Type of Template Methods" Was done in support/2.7 (ec143c43) but there is one new test in this branch...	2022-05-03 11:14:59 +02:00
Pierre Goiffon	a71a5f53f7	Merge remote-tracking branch 'origin/support/3.0' into develop ... # Conflicts: # core/email.class.inc.php	2022-05-03 10:52:50 +02:00
Pierre Goiffon	867cc6ce7e	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2022-05-03 10:52:01 +02:00
Pierre Goiffon	b348e0ff27	🔧 N°3091 PHPunit XML : change html_errors PHP setting ... We are outputting to console, and will get results in Jenkins or terminal, so no HTML please :o)	2022-05-03 10:51:48 +02:00
Pierre Goiffon	84e35e27b8	✅ N°5143 Fix FunctionExpression for DATE_FORMAT and formats %j, %k and %l	2022-05-02 18:59:10 +02:00
Pierre Goiffon	c5527c106c	🔧 N°3091 PHPunit XML : set columns	2022-05-02 15:33:39 +02:00
Pierre Goiffon	5eac1b8730	🔧 N°3091 PHPunit XML : fix correct PHP INI settings ... see https://phpunit.readthedocs.io/en/8.5/configuration.html#the-php-element	2022-05-02 15:25:59 +02:00
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	ddd41d2ba7	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # composer.json # composer.lock # core/email.class.inc.php # css/ui-lightness/jqueryui.scss # lib/bin/php-parse # lib/bin/php-parse.bat # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/composer/platform_check.php # lib/nikic/php-parser/grammar/php7.y # lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Builder/Param.php # lib/nikic/php-parser/lib/PhpParser/Builder/Property.php # lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php # lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php # lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php # lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php # lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Param.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php # lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php # lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php # lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php # test/core/ConfigValidator/iTopConfigAstValidatorTest.php	2022-04-29 16:18:08 +02:00
Pierre Goiffon	f4c7afc148	N°4824 Update consumers & tests after nikic/php-parser update ... Was done in 3.0.0 with N°3867 (cherry picked from commit cd1ba097cb) (cherry picked from commit 5b42f67a99) (cherry picked from commit 2d98ca2318) (cherry picked from commit ddc5bbd1bb)	2022-04-29 15:24:56 +02:00
Molkobain	a4390fbb57	Merge remote-tracking branch 'origin/support/3.0' into develop ... # Conflicts: # test/application/search/CriterionConversionTest.php # test/application/search/CriterionParserTest.php # test/application/search/SearchFormTest.php	2022-04-25 14:03:02 +02:00
Pierre Goiffon	e81587470d	✅ N°3091 Fix ExpressionEvaluateTest::testEveryTimeFormat ... Might need a real fix sometime !!	2022-04-22 17:06:03 +02:00
Pierre Goiffon	fc6df1063c	N°4660 restore old phpunit testsuites order ... Was causing error in DataSynchroTest::testDataSynchroByHttp	2022-04-22 16:29:01 +02:00
Pierre Goiffon	5a37bc338a	N°3091 Update PHPUnit to 8.5 : fix setUp and teardDown methods signatures on support/3.0 new tests	2022-04-22 16:04:54 +02:00
Pierre Goiffon	f4a027b474	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # composer.json # core/cmdbchangeop.class.inc.php # core/cmdbobject.class.inc.php # css/light-grey.scss # setup/setuputils.class.inc.php # test/ItopTestCase.php # test/core/ConfigTest.php # test/core/LogAPITest.php # test/core/UserRightsTest.php # test/core/dictApcuTest.php # test/core/dictTest.php # test/core/iTopConfigParserTest.php # test/core/ormLinkSetTest.php # test/phpunit.xml.dist # test/postbuild_integration.xml.dist # test/setup/SetupUtilsTest.php # test/status/StatusIncTest.php # webservices/cron.php	2022-04-22 15:26:18 +02:00
Pierre Goiffon	d0ba0d193b	N°3091 iTopComposerTest : change deprecated PHPUnit method call	2022-04-22 14:42:12 +02:00
Pierre Goiffon	6e619f2c35	Fix \iTopConfigParserTest::testConfigWriteToFile_FromScratchInstallation throwing error	2022-04-21 12:02:35 +02:00
Pierre Goiffon	163ba41e8d	N°3091 Update PHPUnit to 8.5 : remove doesNotPerformAssertions annotation ... Modified tests : - iTopConfigParsertest - DBSearchIntersectTest::testIntersectOptimization As expected this isn't working with PHPUnit 8.5 Why does it worked with previous PHPUnit 6 version ? Maybe this annotation wasn't handled yet ? The corresponding PHPUnit doc isn't available anymore... Annotations doc for PHP 8.5 : https://phpunit.readthedocs.io/en/8.5/annotations.html#doesnotperformassertions	2022-04-21 12:02:35 +02:00
Pierre Goiffon	ec143c43db	N°3091 Update PHPUnit to 8.5 : fix setUp and teardDown methods signatures ... "Return type declaration must be compatible with parent" See https://phpunit.de/announcements/phpunit-8.html "Return Type of Template Methods"	2022-04-21 12:02:35 +02:00
Pierre Goiffon	cb39541e2a	N°3091 Update PHPUnit to 8.5 : composer and base files ... Autoload wasn't working anymore, easy to see : just launch `php unittestautoload.php` (or see fatal errors when launching tests with your IDE)	2022-04-21 10:47:30 +02:00
Pierre Goiffon	11e811cc4b	N°3717 Improve iTop object history API (#192) ... This fixes a major flaw in the history API that was causing "phantom" CMDBChange records (without any CMDBChangeOp attached). That was happening especially in iProcess impl. For example this lead to the creation of the combodo-cmdbchange-cleaner module in the Mail To Ticket extension. The modifications in detail : - We can now pass a non persisted CMDBChange instance to \CMDBObject::SetCurrentChange - No persistence done in \CMDBObject::CreateChange anymore - Persistence of the attached CMDChange will be done if necessary in CMDBChangeOp::OnInsert - New CMDBObject::SetCurrentChangeFromParams helper method to ease resetting the current change	2022-04-19 17:13:18 +02:00
Pierre Goiffon	7b3d859522	N°5027 AttributeUrl handle anchors starting with digits	2022-04-19 10:57:47 +02:00
Molkobain	ad4442ae78	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-03-23 09:49:11 +01:00
Molkobain	73c6b4be20	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # test/core/DBObjectTest.php	2022-03-23 09:44:13 +01:00
Eric Espie	7ce5712b71	N°4967 - 'Previous Values For Updated Attributes' not updated if DBUpdate is called without modifying the object	2022-03-21 08:43:03 +01:00
acognet	1db4b9a12e	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-03-16 09:44:33 +01:00
Pierre Goiffon	5908ec5197	N°4515 AttributeURLTest : add SF forum url	2022-03-10 16:42:43 +01:00
Molkobain	0f2cbaf186	N°4849 - Enable notification emails grouping in threads in email clients (#275) ... N°4849 - Enable notification emails grouping in threads in email clients (#275) Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>	2022-03-10 09:31:29 +01:00
Molkobain	5854c199d0	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-03-07 12:54:13 +01:00
Molkobain	ede720c9b9	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2022-03-07 12:52:09 +01:00
Molkobain	cd7f9e478f	N°4913 - Avoid object initials to overflow in medallions	2022-03-06 22:44:12 +01:00
Molkobain	e3586cff65	Unit tests: Add unit cyrillic alphabet test case for utils::ToAcronym()	2022-03-06 16:31:48 +01:00
Pierre Goiffon	f78986009f	✅ Improve messages of iTopModuleXmlInstallationChecklistTest::testAllModuleAreIncludedInInstallationXml	2022-03-03 10:46:06 +01:00
Eric Espie	4bdf84bf6c	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-03-03 10:23:38 +01:00
Eric Espie	94d31827e7	N°4569 - Fix tests	2022-03-02 17:54:27 +01:00
Stephen Abello	619c0d34e8	N°4764 Fix unit test	2022-02-28 14:59:56 +01:00
Eric Espie	f24f8a2f34	N°4569 - Fix restoring deleted nodes when parent is not present	2022-02-28 10:54:59 +01:00
Pierre Goiffon	ee7fb15fc2	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-02-14 08:44:12 +01:00
Pierre Goiffon	6a5840ed82	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # lib/composer/installed.php # setup/licenses/community-licenses.xml # setup/setuputils.class.inc.php # sources/application/TwigBase/Controller/Controller.php	2022-02-14 08:41:33 +01:00
Molkobain	4a67819f87	N°4714 - Revert rename of utils::GetItopVersionWikiSyntax as it is used in cached packages in the ITSM Designer	2022-02-11 20:00:39 +01:00
Pierre Goiffon	81c39c35cd	N°4771 Fix lib test dir detection ... Thanks to @Molkobain and @Hipska for their review in dfaa9733	2022-02-11 18:15:56 +01:00
odain	df1e19dc43	enhance ItopDataTestCase->CreateUser to avoid be able to avoid hardcoded contact_id	2022-02-11 14:10:02 +01:00
Pierre Goiffon	dfaa973359	N°4771 improve iTopComposerTest ... - debug testListDeniedTestDir not working well on Windows - update error message for testAllDirCovered	2022-02-10 12:54:09 +01:00
Pierre Goiffon	d437e2d662	Merge remote-tracking branch 'origin/support/3.0' into develop ... # Conflicts: # application/displayblock.class.inc.php # core/config.class.inc.php # datamodels/2.x/authent-cas/module.authent-cas.php # datamodels/2.x/authent-external/module.authent-external.php # datamodels/2.x/authent-ldap/module.authent-ldap.php # datamodels/2.x/authent-local/module.authent-local.php # datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php # datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php # datamodels/2.x/itop-attachments/module.itop-attachments.php # datamodels/2.x/itop-backup/module.itop-backup.php # datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php # datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php # datamodels/2.x/itop-config/module.itop-config.php # datamodels/2.x/itop-core-update/module.itop-core-update.php # datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php # datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php # datamodels/2.x/itop-faq-light/module.itop-faq-light.php # datamodels/2.x/itop-files-information/module.itop-files-information.php # datamodels/2.x/itop-full-itil/module.itop-full-itil.php # datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal-base/module.itop-portal-base.php # datamodels/2.x/itop-portal/module.itop-portal.php # datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php # datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php # datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php # datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php # datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php # datamodels/2.x/itop-structure/module.itop-structure.php # datamodels/2.x/itop-tickets/module.itop-tickets.php # datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php # datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php # datamodels/2.x/version.xml	2022-02-08 15:43:20 +01:00
Pierre Goiffon	3b99006159	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # test/integration/iTopModulesPhpVersionChecklistTest.php	2022-02-08 14:49:08 +01:00
Pierre Goiffon	299ad7e753	N°4714 Fix \utils::GetCoreVersionWikiSyntax throwing Exception when 2nd version digit is "0" (for example in 3.0.1)	2022-02-08 14:48:02 +01:00
Pierre Goiffon	94a2421186	N°4714 Fix iTopModulesPhpVersionIntegrationTest ... Was still testing removed utils::GetItopMinorVersion() And also wrong merge done in testITopModulesPhpVersion()	2022-02-08 14:30:06 +01:00
Pierre Goiffon	b360514646	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # application/displayblock.class.inc.php # application/ui.extkeywidget.class.inc.php # application/utils.inc.php # approot.inc.php # core/config.class.inc.php # css/css-variables.scss # datamodels/2.x/authent-cas/module.authent-cas.php # datamodels/2.x/authent-external/module.authent-external.php # datamodels/2.x/authent-ldap/module.authent-ldap.php # datamodels/2.x/authent-local/module.authent-local.php # datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php # datamodels/2.x/itop-attachments/module.itop-attachments.php # datamodels/2.x/itop-backup/module.itop-backup.php # datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php # datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php # datamodels/2.x/itop-config/module.itop-config.php # datamodels/2.x/itop-core-update/module.itop-core-update.php # datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php # datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php # datamodels/2.x/itop-files-information/module.itop-files-information.php # datamodels/2.x/itop-full-itil/module.itop-full-itil.php # datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal-base/module.itop-portal-base.php # datamodels/2.x/itop-portal/module.itop-portal.php # datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php # datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php # datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php # datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php # datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php # datamodels/2.x/itop-tickets/module.itop-tickets.php # datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php # datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php # datamodels/2.x/version.xml # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # lib/composer/installed.php # setup/modelfactory.class.inc.php # setup/setuputils.class.inc.php # test/integration/iTopModulesPhpVersionChecklistTest.php	2022-02-08 13:18:50 +01:00
Molkobain	60c372f535	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-02-02 11:20:58 +01:00
Pierre Goiffon	de053eed72	N°4714 Update iTopXmlVersionIntegrationTest::testItopXmlVersion to use new constant	2022-02-01 15:27:57 +01:00