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 |
|
Pierre Goiffon
|
8578d18e7f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/displayablegraph.class.inc.php
# core/log.class.inc.php
# datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# pages/UI.php
# setup/itopdesignformat.class.inc.php
# test/core/LogAPITest.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
# test/postbuild_integration/SetupCssIntegrityChecklistTest.php
# test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
# test/status/StatusTest.php
|
2022-01-10 16:15:00 +01:00 |
|
Pierre Goiffon
|
ddb8378fe6
|
N°4624 align phpunit annotations
Remove processIsolation when not needed
When needed, make sure to have also their counterpart (preserveGlobalState and backupGlobals)
|
2022-01-07 15:20:34 +01:00 |
|
Molkobain
|
c3140c2db3
|
Copyright year bump
|
2021-03-12 18:48:46 +01:00 |
|
Molkobain
|
e2a3e0e74f
|
N°2735 - Continue rework of the dashlet id generation:
- Move generation from DashboardLayout to Dashboard
- Migrate dashlet user preference in RuntimeDashboard only (and not in DesignTimeDashboard)
|
2020-02-26 16:29:32 +01:00 |
|