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
|
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 |
|
odain
|
d7c7ef8332
|
ci/testing work: categorize tests via phpunit @group tags
|
2021-02-04 15:07:44 +01:00 |
|
Eric
|
ace676dc24
|
N°2585 - Fix alias problem in portal scopes
The re-aliasing map structure now allows multiple mapping for the same alias (used for the translations of UNIONS)
|
2020-07-23 16:41:57 +02:00 |
|
Eric
|
8122270476
|
N°3176 - OQL: Fix malformed UNION queries in portal scopes
Fix regression in Unit tests
|
2020-07-22 17:30:38 +02:00 |
|