odain
890a2568c8
N°8796 - Add PHP code style validation in iTop and extensions - format whole code base
2025-11-07 15:39:53 +01:00
vdumas
d2c7b13454
N°7484 - UserRequest/Incident solution field supports HTML
2024-05-15 10:38:16 +02:00
Molkobain
ad36066126
📝 Copyright year bump
2024-05-06 18:35:31 +02:00
Pierre Goiffon
379062f1f7
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
Most of the conflicts are caused by HU translations (N°7077 / #584 )
# Conflicts:
# css/setup.css
# datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php
# datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
# datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
# datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
# datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
# datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
# dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
# dictionaries/ui/components/field/hu.dictionary.itop.field.php
# dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
# dictionaries/ui/components/input/hu.dictionary.itop.input.php
# dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
# dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
# dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
# dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
# dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php
# dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php
# dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
# dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2024-01-03 17:30:57 +01:00
Pierre Goiffon
6042e7f74d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# tests/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php
# tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php
2024-01-03 10:43:41 +01:00
Pierre Goiffon
6995a3c641
N°6889 backup mysqldump call : restore possibility to connect using socket protocol ( #591 )
...
With previous fix (N°6123) we forced to use the tcp protocol each time. This was blocking for users wanting to connect using the socket protocol on localhost.
Now for localhost we will :
- send both port and protocol arguments if the `db_host` config parameter does contain a port
- don't send any of the port or protocol arguments if `db_host` doesn't contain a port
2023-12-20 15:19:50 +01:00
Eric Espie
fc2be85c95
N°7054 - ✅ Rework the UpdateImpactedItems calls on Tickets
2023-12-12 11:25:27 +01:00
Romain Quetiez
73fd0b06b2
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
# tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
# tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/TwigTest.php
2023-10-27 14:12:06 +02:00
Romain Quetiez
fba668207f
✅ Optimize tests execution time (test rework and defensive cleanup)
2023-10-26 21:35:52 +02:00
Pierre Goiffon
31a1370028
Merge branch 'support/3.1.0' into support/3.1
...
# Conflicts:
# core/DbConnectionWrapper.php
# tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
2023-10-17 11:13:29 +02:00
Pierre Goiffon
d0d90d7c69
N°6848 Fix TransactionsTest::testTransactionOpenedNotClosed failing
...
Was caused by 239c51bb65bb76b9romain.queriez@combodo.com >
2023-10-17 10:53:26 +02:00
Romain Quetiez
ebd0136773
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
2023-08-17 18:36:34 +02:00
Romain Quetiez
65bb76b9e3
N°6658 - Boost PHPUnit tests execution
2023-08-17 17:27:55 +02:00
Pierre Goiffon
5212e15cc4
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-08-10 14:41:05 +02:00
Pierre Goiffon
f04fc546b5
N°6643 Fix TypeError in \CMDBSource::LogDeadLock
2023-08-10 14:34:09 +02:00
Pierre Goiffon
45f792d5ae
Merge remote-tracking branch 'origin/support/3.0' into develop
2023-04-12 10:22:52 +02:00
Pierre Goiffon
4c626d0782
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/log.class.inc.php
2023-04-12 10:22:34 +02:00
Pierre Goiffon
1114ed9562
N°6099 DeadLockLog : improve documentation and use existing constants ( #441 )
2023-04-12 10:21:34 +02:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
Molkobain
d177ee4a7f
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
# tests/php-unit-tests/ItopDataTestCase.php
# tests/php-unit-tests/ItopTestCase.php
# tests/php-unit-tests/integration-tests/dictionaries-test/fr.dictionary.itop.core.KO.wrong_php
# tests/php-unit-tests/integration-tests/dictionaries-test/fr.dictionary.itop.core.OK.php
# tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
# tests/php-unit-tests/integration-tests/iTopXmlVersionChecklistTest.php
# tests/php-unit-tests/phpunit.xml.dist
# tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php
# tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php
# tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.css-variables.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.light-grey.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/README.md
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/_included_file3.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/feature1/_feature1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_file1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_scss/included_file2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_scss/included_file4.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/multi_imports.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/typography.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/ui-lightness/DO_NOT_CHANGE.jqueryui.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_1c94c4_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_222222_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_E87C1E_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_F26522_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_ffffff_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/ac-background.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/actions_right.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/bg.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/breadcrumb-separator.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/calendar.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/delete.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/desc.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/error.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-closed-555.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-closed-fff.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-open-555.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-open-fff.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/full-screen.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/green-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/green-square.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/indicator.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/info-mini.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/minus.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/ok.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/orange-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/plus.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/red-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/truncated.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-collapsable-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-collapsable.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-expandable-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-expandable.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-item-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-item.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_importmodified.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_varchanged.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/theme-parameters.json
# tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/expected-getimages.json
# tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/test-getimages.scss
# tests/php-unit-tests/unitary-tests/core/ActionEmailTest.php
# tests/php-unit-tests/unitary-tests/core/AttributeDefTest.inc.php
# tests/php-unit-tests/unitary-tests/core/AttributeURLDefaultPattern.php
# tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php
# tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
# tests/php-unit-tests/unitary-tests/core/CSVParserTest.php
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
# tests/php-unit-tests/unitary-tests/core/DBSearchAddConditionPointingTo.php
# tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
# tests/php-unit-tests/unitary-tests/core/GetSelectFilterTest.php
# tests/php-unit-tests/unitary-tests/core/InlineImageTest.php
# tests/php-unit-tests/unitary-tests/core/Log/ExceptionLogTest.php
# tests/php-unit-tests/unitary-tests/core/Log/ExceptionLogTest/Exceptions.php
# tests/php-unit-tests/unitary-tests/core/Log/LogAPITest.php
# tests/php-unit-tests/unitary-tests/core/Log/LogFileNameBuilderTest.php
# tests/php-unit-tests/unitary-tests/core/LogAPITest.php
# tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
# tests/php-unit-tests/unitary-tests/core/MetaModelTest.php
# tests/php-unit-tests/unitary-tests/core/OQLTest.php
# tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
# tests/php-unit-tests/unitary-tests/core/XMLDataLoaderTest.php
# tests/php-unit-tests/unitary-tests/core/dictApcuTest.php
# tests/php-unit-tests/unitary-tests/core/dictTest.php
# tests/php-unit-tests/unitary-tests/core/ormCaseLogTest.php
# tests/php-unit-tests/unitary-tests/core/ormPasswordTest.php
# tests/php-unit-tests/unitary-tests/core/ormStyleTest.php
# tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
# tests/php-unit-tests/unitary-tests/setup/SubMFCompiler.php
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/Bug_4569.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/ressources/datamodels/datamodel-branding.xml
# tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
# tests/php-unit-tests/unitary-tests/sources/application/status/status.php
# tests/php-unit-tests/unitary-tests/synchro/DataSynchroTest.php
2023-01-10 15:27:44 +01:00
Molkobain
36f8e58e25
N°5608 - Use new ItopTestCase::RequireOnceXXX in unit tests
2023-01-10 12:11:12 +01:00
Molkobain
87cb73c038
N°5608 - Rename "test" folder to "tests" to better match conventions
2023-01-06 22:30:08 +01:00
