diff --git a/.gitignore b/.gitignore index 1fe7f38f4..8a46f7b20 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ # composer reserver directory, from sources, populate/update using "composer install" vendor/* -test/vendor/* +test/*/vendor/* # all conf but listing prevention /conf/** @@ -33,7 +33,7 @@ test/vendor/* !/log/web.config # PHPUnit cache file -/test/.phpunit.result.cache +/test/php-unit-tests/.phpunit.result.cache # Jetbrains diff --git a/test/ci_description.ini b/test/ci_description.ini index dfa005287..ed14d2c87 100644 --- a/test/ci_description.ini +++ b/test/ci_description.ini @@ -5,4 +5,4 @@ itop_backup=test/backups/backup-itop.tar.gz [phpunit] ; when empty phpunit_xml => no phpunit test performed ; phpunit xml file description. required for phpunit testing -phpunit_xml=test/phpunit.xml.dist +phpunit_xml=test/php-unit-tests/phpunit.xml.dist diff --git a/test/ItopDataTestCase.php b/test/php-unit-tests/ItopDataTestCase.php similarity index 100% rename from test/ItopDataTestCase.php rename to test/php-unit-tests/ItopDataTestCase.php diff --git a/test/ItopTestCase.php b/test/php-unit-tests/ItopTestCase.php similarity index 100% rename from test/ItopTestCase.php rename to test/php-unit-tests/ItopTestCase.php diff --git a/test/composer.json b/test/php-unit-tests/composer.json similarity index 100% rename from test/composer.json rename to test/php-unit-tests/composer.json diff --git a/test/integration/DictionariesConsistencyTest.php b/test/php-unit-tests/integration/DictionariesConsistencyTest.php similarity index 100% rename from test/integration/DictionariesConsistencyTest.php rename to test/php-unit-tests/integration/DictionariesConsistencyTest.php diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/php-unit-tests/integration/iTopModulesPhpVersionChecklistTest.php similarity index 100% rename from test/integration/iTopModulesPhpVersionChecklistTest.php rename to test/php-unit-tests/integration/iTopModulesPhpVersionChecklistTest.php diff --git a/test/integration/iTopModulesXmlVersionChecklistTest.php b/test/php-unit-tests/integration/iTopModulesXmlVersionChecklistTest.php similarity index 100% rename from test/integration/iTopModulesXmlVersionChecklistTest.php rename to test/php-unit-tests/integration/iTopModulesXmlVersionChecklistTest.php diff --git a/test/phpunit.xml.dist b/test/php-unit-tests/phpunit.xml.dist similarity index 71% rename from test/phpunit.xml.dist rename to test/php-unit-tests/phpunit.xml.dist index a836dbd9a..703b2b363 100644 --- a/test/phpunit.xml.dist +++ b/test/php-unit-tests/phpunit.xml.dist @@ -29,44 +29,44 @@ - application + tests/application - core + tests/core - coreExtensions + tests/coreExtensions integration - itop-config + tests/datamodels/2.x/itop-config - itop-tickets + tests/datamodels/2.x/itop-tickets - setup + tests/setup - status + tests/status - webservices + tests/webservices - ../env-production/*/test + ../../../env-production/*/test - ../core/apc-emulation.php - ../core/ormlinkset.class.inc.php - ../datamodels/2.x/itop-tickets/main.itop-tickets.php + ../../../core/apc-emulation.php + ../../../core/ormlinkset.class.inc.php + ../../../datamodels/2.x/itop-tickets/main.itop-tickets.php diff --git a/test/postbuild_integration.xml.dist b/test/php-unit-tests/postbuild_integration.xml.dist similarity index 84% rename from test/postbuild_integration.xml.dist rename to test/php-unit-tests/postbuild_integration.xml.dist index 5e701b93d..2032e204e 100644 --- a/test/postbuild_integration.xml.dist +++ b/test/php-unit-tests/postbuild_integration.xml.dist @@ -34,9 +34,9 @@ - ../core/apc-emulation.php - ../core/ormlinkset.class.inc.php - ../datamodels/2.x/itop-tickets/main.itop-tickets.php + ../../../core/apc-emulation.php + ../../../core/ormlinkset.class.inc.php + ../../../datamodels/2.x/itop-tickets/main.itop-tickets.php diff --git a/test/postbuild_integration/SetupCssIntegrityChecklistTest.php b/test/php-unit-tests/postbuild_integration/SetupCssIntegrityChecklistTest.php similarity index 100% rename from test/postbuild_integration/SetupCssIntegrityChecklistTest.php rename to test/php-unit-tests/postbuild_integration/SetupCssIntegrityChecklistTest.php diff --git a/test/postbuild_integration/iTopDesignFormatChecklistTest.php b/test/php-unit-tests/postbuild_integration/iTopDesignFormatChecklistTest.php similarity index 100% rename from test/postbuild_integration/iTopDesignFormatChecklistTest.php rename to test/php-unit-tests/postbuild_integration/iTopDesignFormatChecklistTest.php diff --git a/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php b/test/php-unit-tests/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php similarity index 100% rename from test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php rename to test/php-unit-tests/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php diff --git a/test/application/DashboardLayoutTest.php b/test/php-unit-tests/tests/application/DashboardLayoutTest.php similarity index 100% rename from test/application/DashboardLayoutTest.php rename to test/php-unit-tests/tests/application/DashboardLayoutTest.php diff --git a/test/application/UtilsTest.php b/test/php-unit-tests/tests/application/UtilsTest.php similarity index 100% rename from test/application/UtilsTest.php rename to test/php-unit-tests/tests/application/UtilsTest.php diff --git a/test/application/composer/iTopComposerTest.php b/test/php-unit-tests/tests/application/composer/iTopComposerTest.php similarity index 100% rename from test/application/composer/iTopComposerTest.php rename to test/php-unit-tests/tests/application/composer/iTopComposerTest.php diff --git a/test/application/privUITransactionFileTest.php b/test/php-unit-tests/tests/application/privUITransactionFileTest.php similarity index 100% rename from test/application/privUITransactionFileTest.php rename to test/php-unit-tests/tests/application/privUITransactionFileTest.php diff --git a/test/application/search/CriterionConversionTest.php b/test/php-unit-tests/tests/application/search/CriterionConversionTest.php similarity index 100% rename from test/application/search/CriterionConversionTest.php rename to test/php-unit-tests/tests/application/search/CriterionConversionTest.php diff --git a/test/application/search/CriterionParserTest.php b/test/php-unit-tests/tests/application/search/CriterionParserTest.php similarity index 100% rename from test/application/search/CriterionParserTest.php rename to test/php-unit-tests/tests/application/search/CriterionParserTest.php diff --git a/test/application/search/SearchFormTest.php b/test/php-unit-tests/tests/application/search/SearchFormTest.php similarity index 100% rename from test/application/search/SearchFormTest.php rename to test/php-unit-tests/tests/application/search/SearchFormTest.php diff --git a/test/core/BulkChangeTest.inc.php b/test/php-unit-tests/tests/core/BulkChangeTest.inc.php similarity index 100% rename from test/core/BulkChangeTest.inc.php rename to test/php-unit-tests/tests/core/BulkChangeTest.inc.php diff --git a/test/core/CMDBObjectTest.php b/test/php-unit-tests/tests/core/CMDBObjectTest.php similarity index 100% rename from test/core/CMDBObjectTest.php rename to test/php-unit-tests/tests/core/CMDBObjectTest.php diff --git a/test/core/CMDBSource/CMDBSourceTest.php b/test/php-unit-tests/tests/core/CMDBSource/CMDBSourceTest.php similarity index 100% rename from test/core/CMDBSource/CMDBSourceTest.php rename to test/php-unit-tests/tests/core/CMDBSource/CMDBSourceTest.php diff --git a/test/core/CMDBSource/DeadLockInjection.php b/test/php-unit-tests/tests/core/CMDBSource/DeadLockInjection.php similarity index 100% rename from test/core/CMDBSource/DeadLockInjection.php rename to test/php-unit-tests/tests/core/CMDBSource/DeadLockInjection.php diff --git a/test/core/CMDBSource/TransactionsTest.php b/test/php-unit-tests/tests/core/CMDBSource/TransactionsTest.php similarity index 100% rename from test/core/CMDBSource/TransactionsTest.php rename to test/php-unit-tests/tests/core/CMDBSource/TransactionsTest.php diff --git a/test/core/ConfigPlaceholdersResolverTest.php b/test/php-unit-tests/tests/core/ConfigPlaceholdersResolverTest.php similarity index 100% rename from test/core/ConfigPlaceholdersResolverTest.php rename to test/php-unit-tests/tests/core/ConfigPlaceholdersResolverTest.php diff --git a/test/core/ConfigTest.php b/test/php-unit-tests/tests/core/ConfigTest.php similarity index 100% rename from test/core/ConfigTest.php rename to test/php-unit-tests/tests/core/ConfigTest.php diff --git a/test/core/ConfigTest/config-itop-joker.php b/test/php-unit-tests/tests/core/ConfigTest/config-itop-joker.php similarity index 100% rename from test/core/ConfigTest/config-itop-joker.php rename to test/php-unit-tests/tests/core/ConfigTest/config-itop-joker.php diff --git a/test/core/ConfigTest/config-itop-var.php b/test/php-unit-tests/tests/core/ConfigTest/config-itop-var.php similarity index 100% rename from test/core/ConfigTest/config-itop-var.php rename to test/php-unit-tests/tests/core/ConfigTest/config-itop-var.php diff --git a/test/core/ConfigValidator/config-itop_KO_config_plus_code.php b/test/php-unit-tests/tests/core/ConfigValidator/config-itop_KO_config_plus_code.php similarity index 100% rename from test/core/ConfigValidator/config-itop_KO_config_plus_code.php rename to test/php-unit-tests/tests/core/ConfigValidator/config-itop_KO_config_plus_code.php diff --git a/test/core/ConfigValidator/config-itop_KO_function.php b/test/php-unit-tests/tests/core/ConfigValidator/config-itop_KO_function.php similarity index 100% rename from test/core/ConfigValidator/config-itop_KO_function.php rename to test/php-unit-tests/tests/core/ConfigValidator/config-itop_KO_function.php diff --git a/test/core/ConfigValidator/config-itop_VALID.php b/test/php-unit-tests/tests/core/ConfigValidator/config-itop_VALID.php similarity index 100% rename from test/core/ConfigValidator/config-itop_VALID.php rename to test/php-unit-tests/tests/core/ConfigValidator/config-itop_VALID.php diff --git a/test/core/ConfigValidator/config-itop_VALID_log-level-min_const.php b/test/php-unit-tests/tests/core/ConfigValidator/config-itop_VALID_log-level-min_const.php similarity index 100% rename from test/core/ConfigValidator/config-itop_VALID_log-level-min_const.php rename to test/php-unit-tests/tests/core/ConfigValidator/config-itop_VALID_log-level-min_const.php diff --git a/test/core/ConfigValidator/iTopConfigAstValidatorTest.php b/test/php-unit-tests/tests/core/ConfigValidator/iTopConfigAstValidatorTest.php similarity index 100% rename from test/core/ConfigValidator/iTopConfigAstValidatorTest.php rename to test/php-unit-tests/tests/core/ConfigValidator/iTopConfigAstValidatorTest.php diff --git a/test/core/DBObjectTest.php b/test/php-unit-tests/tests/core/DBObjectTest.php similarity index 100% rename from test/core/DBObjectTest.php rename to test/php-unit-tests/tests/core/DBObjectTest.php diff --git a/test/core/DBSearchCommitTest.php b/test/php-unit-tests/tests/core/DBSearchCommitTest.php similarity index 100% rename from test/core/DBSearchCommitTest.php rename to test/php-unit-tests/tests/core/DBSearchCommitTest.php diff --git a/test/core/DBSearchIntersectTest.php b/test/php-unit-tests/tests/core/DBSearchIntersectTest.php similarity index 100% rename from test/core/DBSearchIntersectTest.php rename to test/php-unit-tests/tests/core/DBSearchIntersectTest.php diff --git a/test/core/DBSearchJoinTest.php b/test/php-unit-tests/tests/core/DBSearchJoinTest.php similarity index 100% rename from test/core/DBSearchJoinTest.php rename to test/php-unit-tests/tests/core/DBSearchJoinTest.php diff --git a/test/core/DBSearchTest.php b/test/php-unit-tests/tests/core/DBSearchTest.php similarity index 100% rename from test/core/DBSearchTest.php rename to test/php-unit-tests/tests/core/DBSearchTest.php diff --git a/test/core/DBSearchUpdateRealiasingMapTest.php b/test/php-unit-tests/tests/core/DBSearchUpdateRealiasingMapTest.php similarity index 100% rename from test/core/DBSearchUpdateRealiasingMapTest.php rename to test/php-unit-tests/tests/core/DBSearchUpdateRealiasingMapTest.php diff --git a/test/core/ExpressionTest.php b/test/php-unit-tests/tests/core/ExpressionTest.php similarity index 100% rename from test/core/ExpressionTest.php rename to test/php-unit-tests/tests/core/ExpressionTest.php diff --git a/test/core/LogAPITest.php b/test/php-unit-tests/tests/core/LogAPITest.php similarity index 100% rename from test/core/LogAPITest.php rename to test/php-unit-tests/tests/core/LogAPITest.php diff --git a/test/core/LogFileNameBuilderTest.php b/test/php-unit-tests/tests/core/LogFileNameBuilderTest.php similarity index 100% rename from test/core/LogFileNameBuilderTest.php rename to test/php-unit-tests/tests/core/LogFileNameBuilderTest.php diff --git a/test/core/MetaModelTest.php b/test/php-unit-tests/tests/core/MetaModelTest.php similarity index 100% rename from test/core/MetaModelTest.php rename to test/php-unit-tests/tests/core/MetaModelTest.php diff --git a/test/core/OQLParserTest.php b/test/php-unit-tests/tests/core/OQLParserTest.php similarity index 100% rename from test/core/OQLParserTest.php rename to test/php-unit-tests/tests/core/OQLParserTest.php diff --git a/test/core/OQLTest.php b/test/php-unit-tests/tests/core/OQLTest.php similarity index 100% rename from test/core/OQLTest.php rename to test/php-unit-tests/tests/core/OQLTest.php diff --git a/test/core/TagSetFieldDataTest.php b/test/php-unit-tests/tests/core/TagSetFieldDataTest.php similarity index 100% rename from test/core/TagSetFieldDataTest.php rename to test/php-unit-tests/tests/core/TagSetFieldDataTest.php diff --git a/test/core/TriggerTest.php b/test/php-unit-tests/tests/core/TriggerTest.php similarity index 100% rename from test/core/TriggerTest.php rename to test/php-unit-tests/tests/core/TriggerTest.php diff --git a/test/core/UniquenessConstraintTest.php b/test/php-unit-tests/tests/core/UniquenessConstraintTest.php similarity index 100% rename from test/core/UniquenessConstraintTest.php rename to test/php-unit-tests/tests/core/UniquenessConstraintTest.php diff --git a/test/core/UserRightsTest.php b/test/php-unit-tests/tests/core/UserRightsTest.php similarity index 100% rename from test/core/UserRightsTest.php rename to test/php-unit-tests/tests/core/UserRightsTest.php diff --git a/test/core/WeeklyScheduledProcessMockConfig.php b/test/php-unit-tests/tests/core/WeeklyScheduledProcessMockConfig.php similarity index 100% rename from test/core/WeeklyScheduledProcessMockConfig.php rename to test/php-unit-tests/tests/core/WeeklyScheduledProcessMockConfig.php diff --git a/test/core/WeeklyScheduledProcessTest.php b/test/php-unit-tests/tests/core/WeeklyScheduledProcessTest.php similarity index 100% rename from test/core/WeeklyScheduledProcessTest.php rename to test/php-unit-tests/tests/core/WeeklyScheduledProcessTest.php diff --git a/test/core/apcEmulationTest.php b/test/php-unit-tests/tests/core/apcEmulationTest.php similarity index 100% rename from test/core/apcEmulationTest.php rename to test/php-unit-tests/tests/core/apcEmulationTest.php diff --git a/test/core/dictApcuTest.php b/test/php-unit-tests/tests/core/dictApcuTest.php similarity index 100% rename from test/core/dictApcuTest.php rename to test/php-unit-tests/tests/core/dictApcuTest.php diff --git a/test/core/dictTest.php b/test/php-unit-tests/tests/core/dictTest.php similarity index 100% rename from test/core/dictTest.php rename to test/php-unit-tests/tests/core/dictTest.php diff --git a/test/core/iTopConfigParserTest.php b/test/php-unit-tests/tests/core/iTopConfigParserTest.php similarity index 100% rename from test/core/iTopConfigParserTest.php rename to test/php-unit-tests/tests/core/iTopConfigParserTest.php diff --git a/test/core/mockApcEmulation.incphp b/test/php-unit-tests/tests/core/mockApcEmulation.incphp similarity index 100% rename from test/core/mockApcEmulation.incphp rename to test/php-unit-tests/tests/core/mockApcEmulation.incphp diff --git a/test/core/mockDict.incphp b/test/php-unit-tests/tests/core/mockDict.incphp similarity index 100% rename from test/core/mockDict.incphp rename to test/php-unit-tests/tests/core/mockDict.incphp diff --git a/test/core/ormLinkSetTest.php b/test/php-unit-tests/tests/core/ormLinkSetTest.php similarity index 100% rename from test/core/ormLinkSetTest.php rename to test/php-unit-tests/tests/core/ormLinkSetTest.php diff --git a/test/core/ormTagSetTest.php b/test/php-unit-tests/tests/core/ormTagSetTest.php similarity index 100% rename from test/core/ormTagSetTest.php rename to test/php-unit-tests/tests/core/ormTagSetTest.php diff --git a/test/core/sanitizer/AbstractDOMSanitizerTest.php b/test/php-unit-tests/tests/core/sanitizer/AbstractDOMSanitizerTest.php similarity index 100% rename from test/core/sanitizer/AbstractDOMSanitizerTest.php rename to test/php-unit-tests/tests/core/sanitizer/AbstractDOMSanitizerTest.php diff --git a/test/core/sanitizer/HTMLDOMSanitizerTest.php b/test/php-unit-tests/tests/core/sanitizer/HTMLDOMSanitizerTest.php similarity index 100% rename from test/core/sanitizer/HTMLDOMSanitizerTest.php rename to test/php-unit-tests/tests/core/sanitizer/HTMLDOMSanitizerTest.php diff --git a/test/core/sanitizer/InlineImageMock.php b/test/php-unit-tests/tests/core/sanitizer/InlineImageMock.php similarity index 100% rename from test/core/sanitizer/InlineImageMock.php rename to test/php-unit-tests/tests/core/sanitizer/InlineImageMock.php diff --git a/test/core/sanitizer/README.txt b/test/php-unit-tests/tests/core/sanitizer/README.txt similarity index 100% rename from test/core/sanitizer/README.txt rename to test/php-unit-tests/tests/core/sanitizer/README.txt diff --git a/test/core/sanitizer/SvgDOMSanitizerTest.php b/test/php-unit-tests/tests/core/sanitizer/SvgDOMSanitizerTest.php similarity index 100% rename from test/core/sanitizer/SvgDOMSanitizerTest.php rename to test/php-unit-tests/tests/core/sanitizer/SvgDOMSanitizerTest.php diff --git a/test/core/sanitizer/input/scripts.html b/test/php-unit-tests/tests/core/sanitizer/input/scripts.html similarity index 100% rename from test/core/sanitizer/input/scripts.html rename to test/php-unit-tests/tests/core/sanitizer/input/scripts.html diff --git a/test/core/sanitizer/input/scripts.svg b/test/php-unit-tests/tests/core/sanitizer/input/scripts.svg similarity index 100% rename from test/core/sanitizer/input/scripts.svg rename to test/php-unit-tests/tests/core/sanitizer/input/scripts.svg diff --git a/test/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt b/test/php-unit-tests/tests/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt similarity index 100% rename from test/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt rename to test/php-unit-tests/tests/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt diff --git a/test/core/sanitizer/input/whitelist_test.html b/test/php-unit-tests/tests/core/sanitizer/input/whitelist_test.html similarity index 100% rename from test/core/sanitizer/input/whitelist_test.html rename to test/php-unit-tests/tests/core/sanitizer/input/whitelist_test.html diff --git a/test/core/sanitizer/output/scripts.html b/test/php-unit-tests/tests/core/sanitizer/output/scripts.html similarity index 100% rename from test/core/sanitizer/output/scripts.html rename to test/php-unit-tests/tests/core/sanitizer/output/scripts.html diff --git a/test/core/sanitizer/output/scripts.svg b/test/php-unit-tests/tests/core/sanitizer/output/scripts.svg similarity index 100% rename from test/core/sanitizer/output/scripts.svg rename to test/php-unit-tests/tests/core/sanitizer/output/scripts.svg diff --git a/test/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt b/test/php-unit-tests/tests/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt similarity index 100% rename from test/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt rename to test/php-unit-tests/tests/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt diff --git a/test/coreExtensions/UserLocalTest.php b/test/php-unit-tests/tests/coreExtensions/UserLocalTest.php similarity index 100% rename from test/coreExtensions/UserLocalTest.php rename to test/php-unit-tests/tests/coreExtensions/UserLocalTest.php diff --git a/test/coreExtensions/UserLocalTest/UserLocalPasswordPolicyMock.php b/test/php-unit-tests/tests/coreExtensions/UserLocalTest/UserLocalPasswordPolicyMock.php similarity index 100% rename from test/coreExtensions/UserLocalTest/UserLocalPasswordPolicyMock.php rename to test/php-unit-tests/tests/coreExtensions/UserLocalTest/UserLocalPasswordPolicyMock.php diff --git a/test/itop-config/Validator/iTopConfigAstValidatorTest.php b/test/php-unit-tests/tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php similarity index 100% rename from test/itop-config/Validator/iTopConfigAstValidatorTest.php rename to test/php-unit-tests/tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php diff --git a/test/itop-config/Validator/iTopConfigSyntaxValidatorTest.php b/test/php-unit-tests/tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php similarity index 100% rename from test/itop-config/Validator/iTopConfigSyntaxValidatorTest.php rename to test/php-unit-tests/tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php diff --git a/test/itop-tickets/itopTicketTest.php b/test/php-unit-tests/tests/datamodels/2.x/itop-tickets/itopTicketTest.php similarity index 100% rename from test/itop-tickets/itopTicketTest.php rename to test/php-unit-tests/tests/datamodels/2.x/itop-tickets/itopTicketTest.php diff --git a/test/setup/DBBackupTest.php b/test/php-unit-tests/tests/setup/DBBackupTest.php similarity index 100% rename from test/setup/DBBackupTest.php rename to test/php-unit-tests/tests/setup/DBBackupTest.php diff --git a/test/setup/SetupUtilsTest.php b/test/php-unit-tests/tests/setup/SetupUtilsTest.php similarity index 100% rename from test/setup/SetupUtilsTest.php rename to test/php-unit-tests/tests/setup/SetupUtilsTest.php diff --git a/test/setup/iTopDesignFormat/1.7_to_1.6.expected.xml b/test/php-unit-tests/tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml similarity index 100% rename from test/setup/iTopDesignFormat/1.7_to_1.6.expected.xml rename to test/php-unit-tests/tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml diff --git a/test/setup/iTopDesignFormat/1.7_to_1.6.input.xml b/test/php-unit-tests/tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml similarity index 100% rename from test/setup/iTopDesignFormat/1.7_to_1.6.input.xml rename to test/php-unit-tests/tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml diff --git a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php b/test/php-unit-tests/tests/setup/iTopDesignFormat/iTopDesignFormatTest.php similarity index 100% rename from test/setup/iTopDesignFormat/iTopDesignFormatTest.php rename to test/php-unit-tests/tests/setup/iTopDesignFormat/iTopDesignFormatTest.php diff --git a/test/status/StatusIncTest.php b/test/php-unit-tests/tests/status/StatusIncTest.php similarity index 100% rename from test/status/StatusIncTest.php rename to test/php-unit-tests/tests/status/StatusIncTest.php diff --git a/test/status/StatusTest.php b/test/php-unit-tests/tests/status/StatusTest.php similarity index 100% rename from test/status/StatusTest.php rename to test/php-unit-tests/tests/status/StatusTest.php diff --git a/test/status/status.php b/test/php-unit-tests/tests/status/status.php similarity index 100% rename from test/status/status.php rename to test/php-unit-tests/tests/status/status.php diff --git a/test/webservices/RestTest.php b/test/php-unit-tests/tests/webservices/RestTest.php similarity index 100% rename from test/webservices/RestTest.php rename to test/php-unit-tests/tests/webservices/RestTest.php diff --git a/test/unittestautoload.php b/test/php-unit-tests/unittestautoload.php similarity index 100% rename from test/unittestautoload.php rename to test/php-unit-tests/unittestautoload.php diff --git a/test/composer.lock b/tests/php-unit-tests/composer.lock similarity index 77% rename from test/composer.lock rename to tests/php-unit-tests/composer.lock index 1dadb48f1..28f127346 100644 --- a/test/composer.lock +++ b/tests/php-unit-tests/composer.lock @@ -247,233 +247,6 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.6.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" - }, - "time": "2022-03-15T21:29:03+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" - }, { "name": "phpunit/php-code-coverage", "version": "7.0.15", @@ -713,29 +486,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "4.0.4", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" + "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", + "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.3 || ^8.0" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -760,7 +533,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" }, "funding": [ { @@ -769,20 +542,20 @@ } ], "abandoned": true, - "time": "2020-08-04T08:28:15+00:00" + "time": "2021-07-26T12:15:06+00:00" }, { "name": "phpunit/phpunit", - "version": "8.5.26", + "version": "8.5.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ef117c59fc4c54a979021b26d08a3373e386606d" + "reference": "4fd448df9affda65a5faa58f8b93087d415216ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ef117c59fc4c54a979021b26d08a3373e386606d", - "reference": "ef117c59fc4c54a979021b26d08a3373e386606d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4fd448df9affda65a5faa58f8b93087d415216ce", + "reference": "4fd448df9affda65a5faa58f8b93087d415216ce", "shasum": "" }, "require": { @@ -797,24 +570,20 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", "phpunit/php-code-coverage": "^7.0.12", "phpunit/php-file-iterator": "^2.0.4", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", + "sebastian/comparator": "^3.0.5", "sebastian/diff": "^3.0.2", "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", + "sebastian/exporter": "^3.1.5", "sebastian/global-state": "^3.0.0", "sebastian/object-enumerator": "^3.0.3", "sebastian/resource-operations": "^2.0.1", "sebastian/type": "^1.1.3", "sebastian/version": "^2.0.1" }, - "require-dev": { - "ext-pdo": "*" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*", @@ -854,7 +623,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.26" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.30" }, "funding": [ { @@ -864,9 +633,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-04-01T12:34:39+00:00" + "time": "2022-09-25T03:43:00+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -925,16 +698,16 @@ }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", "shasum": "" }, "require": { @@ -987,7 +760,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5" }, "funding": [ { @@ -995,7 +768,7 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2022-09-14T12:31:48+00:00" }, { "name": "sebastian/diff", @@ -1128,16 +901,16 @@ }, { "name": "sebastian/exporter", - "version": "3.1.4", + "version": "3.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" + "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6", + "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6", "shasum": "" }, "require": { @@ -1193,7 +966,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5" }, "funding": [ { @@ -1201,7 +974,7 @@ "type": "github" } ], - "time": "2021-11-11T13:51:24+00:00" + "time": "2022-09-14T06:00:17+00:00" }, { "name": "sebastian/global-state", @@ -1635,88 +1408,6 @@ }, "time": "2021-01-04T13:25:10+00:00" }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.25.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-10-20T20:35:02+00:00" - }, { "name": "theseer/tokenizer", "version": "1.2.1", @@ -1766,64 +1457,6 @@ } ], "time": "2021-07-28T10:34:58+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.10.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" - }, - "time": "2021-03-09T10:59:23+00:00" } ], "aliases": [], @@ -1833,5 +1466,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.1.0" }