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 |
|
Eric Espie
|
79c17970f8
|
✅ Fix tests on packages missing composer.json file
|
2021-11-03 11:31:43 +01:00 |
|
Molkobain
|
86b03b9e92
|
Set back @covers annotation
|
2021-09-27 17:34:48 +02:00 |
|
odain
|
0b4d4764bd
|
ci testing: use proper annotation to include/exlude test linked to composer.json
|
2021-09-27 11:57:25 +02:00 |
|
odain
|
6e45b74665
|
Composer: Fix required versions => rename cover annotation
|
2021-09-24 15:01:08 +02:00 |
|
Molkobain
|
d9ccac3aea
|
Composer: Fix required versions of PHP in order to keep our package constraints up-to-date
|
2021-09-21 16:12:22 +02:00 |
|
Molkobain
|
7ca689e190
|
Setup: Fix sizes being displayed as bits instead of bytes
|
2021-07-04 22:49:54 +02:00 |
|
bruno-ds
|
9cbaced1f3
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# core/config.class.inc.php
# datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
# datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
# setup/setuputils.class.inc.php
# test/setup/SetupUtilsTest.php
|
2021-03-02 14:34:19 +01:00 |
|
Molkobain
|
5836be7131
|
Fix unit test
|
2021-02-24 09:49:16 +01:00 |
|
bruno-ds
|
c3cb4fbe75
|
Fix merge wrongfully performed
(thanks @molkobain & @piRGoif & @odain-cbd)
|
2021-02-23 10:24:49 +01:00 |
|
Molkobain
|
9d2fc883b8
|
Fix test name
|
2021-02-17 10:31:59 +01:00 |
|
odain
|
913ea0cef2
|
N°3412 - Command Injection vulnerability in the Setup Wizard - renaming
|
2021-02-17 10:22:21 +01:00 |
|
odain
|
bb877a244b
|
N°3412 - Command Injection vulnerability in the Setup Wizard - do not use escapeshellcmd before execution in Windows envt
|
2021-02-17 10:09:39 +01:00 |
|
odain
|
a12959d60e
|
N°3412 - Command Injection vulnerability in the Setup Wizard - handle empty path
|
2021-02-17 07:50:18 +01:00 |
|
odain
|
e9cff0920b
|
N°3412 - Command Injection vulnerability in the Setup Wizard - fix test and code
|
2021-02-16 17:12:41 +01:00 |
|