From: Roland Häder Date: Tue, 14 Nov 2017 20:58:42 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=4f9cf34b521892cb99fae9b21b92787f3d555b74 Continued: - added Org\Nxchange\ namespace followwing Java convention Signed-off-by: Roland Häder --- diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index cc0f5749..0111e924 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -1,16 +1,16 @@ getAppShortName(), diff --git a/application/tests/config.php b/application/tests/config.php index 3a0ee3e9..5c822105 100644 --- a/application/tests/config.php +++ b/application/tests/config.php @@ -1,6 +1,6 @@ setConfigEntry('default_tests_console_command', 'main'); $cfg->setConfigEntry('default_tests_console_controller', 'main'); // CFG: TESTS-CONSOLE-CMD-MAIN-RESOLVER-CLASS -$cfg->setConfigEntry('tests_console_cmd_main_resolver_class', 'CoreFramework\Tests\Resolver\Command\TestsConsoleCommandResolver'); +$cfg->setConfigEntry('tests_console_cmd_main_resolver_class', 'Org\Mxchange\CoreFramework\Tests\Resolver\Command\TestsConsoleCommandResolver'); // CFG: NEWS-DOWNLOAD-FILTER-CLASS -$cfg->setConfigEntry('news_download_filter_class', 'CoreFramework\Filter\News\NewsDownloadFilter'); +$cfg->setConfigEntry('news_download_filter_class', 'Org\Mxchange\CoreFramework\Filter\News\NewsDownloadFilter'); // CFG: NEWS-PROCESS-FILTER-CLASS -$cfg->setConfigEntry('news_process_filter_class', 'CoreFramework\Filter\News\NewsProcessFilter'); +$cfg->setConfigEntry('news_process_filter_class', 'Org\Mxchange\CoreFramework\Filter\News\NewsProcessFilter'); // CFG: NEWS-READER-MAIN-CLASS -$cfg->setConfigEntry('news_reader_main_class', 'CoreFramework\Reader\News\Console\ConsoleNewsReader'); +$cfg->setConfigEntry('news_reader_main_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader'); // CFG: NEWS-MAIN-LIMIT $cfg->setConfigEntry('news_main_limit', 5); // CFG: TESTS-PHP-REQUIREMENTS-FILTER -$cfg->setConfigEntry('tests_php_requirements_filter_class', 'CoreFramework\Tests\Filter\Requirements\TestsPhpRequirementsFilter'); +$cfg->setConfigEntry('tests_php_requirements_filter_class', 'Org\Mxchange\CoreFramework\Tests\Filter\Requirements\TestsPhpRequirementsFilter'); // CFG: TEST-CONFIGURATION-CLASSES-LOADABLE-TEST-FILTER-CLASS -$cfg->setConfigEntry('tests_configuration_classes_loadable_test_filter_class', 'CoreFramework\Tests\Filter\Configuration\Classes\TestConfigurationLoadableClassesFilter'); +$cfg->setConfigEntry('tests_configuration_classes_loadable_test_filter_class', 'Org\Mxchange\CoreFramework\Tests\Filter\Configuration\Classes\TestConfigurationLoadableClassesFilter'); diff --git a/application/tests/exceptions.php b/application/tests/exceptions.php index 3d91a741..3538bd31 100644 --- a/application/tests/exceptions.php +++ b/application/tests/exceptions.php @@ -1,7 +1,7 @@ &1 | grep -v "third_party" | grep -v "smarty3/compiled/") +PHP=$(find -type f -name "*.php" 2>&1 | grep -v "third_party" | grep -v "/vendor/" | grep -v "smarty3/compiled/") for SCRIPT in ${PHP}; do diff --git a/framework/bootstrap/bootstrap.inc.php b/framework/bootstrap/bootstrap.inc.php index 7a28f753..64d518c8 100644 --- a/framework/bootstrap/bootstrap.inc.php +++ b/framework/bootstrap/bootstrap.inc.php @@ -1,6 +1,6 @@ %s could not be launched because the helper class %s is not loaded.', $application, - 'CoreFramework\Helper\Application\ApplicationHelper' + 'Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper' )); } elseif (!is_object($applicationInstance)) { // No object! @@ -574,7 +574,7 @@ final class FrameworkBootstrap { require self::getConfigurationInstance()->getConfigEntry('framework_base_path') . 'loader/class_ClassLoader.php'; // Register auto-load function with the SPL - spl_autoload_register('CoreFramework\Loader\ClassLoader::autoLoad'); + spl_autoload_register('Org\Mxchange\CoreFramework\Loader\ClassLoader::autoLoad'); // Scan for all framework classes, exceptions and interfaces ClassLoader::scanFrameworkClasses(); @@ -592,7 +592,7 @@ final class FrameworkBootstrap { $requestType = self::getRequestTypeFromSystem(); // Create a new request object - $requestInstance = ObjectFactory::createObjectByName(sprintf('CoreFramework\Request\%sRequest', BaseFrameworkSystem::convertToClassName($request))); + $requestInstance = ObjectFactory::createObjectByName(sprintf('Org\Mxchange\CoreFramework\Request\%sRequest', BaseFrameworkSystem::convertToClassName($request))); // Remember request instance here self::setRequestInstance($requestInstance); @@ -605,7 +605,7 @@ final class FrameworkBootstrap { } // END - if // ... and a new response object - $responseClass = sprintf('CoreFramework\Response\%sResponse', BaseFrameworkSystem::convertToClassName($request)); + $responseClass = sprintf('Org\Mxchange\CoreFramework\Response\%sResponse', BaseFrameworkSystem::convertToClassName($request)); $responseInstance = ObjectFactory::createObjectByName($responseClass); // Remember response instance here diff --git a/framework/config-global.php b/framework/config-global.php index bd162318..8b54e813 100644 --- a/framework/config-global.php +++ b/framework/config-global.php @@ -1,7 +1,7 @@ setConfigEntry('application_base_path', $cfg->getConfigEntry('root_base_pa $cfg->setConfigEntry('compile_output_path', 'templates/_compiled/'); // CFG: HTML-TEMPLATE-CLASS -$cfg->setConfigEntry('html_template_class', 'CoreFramework\Template\Engine\HtmlTemplateEngine'); +$cfg->setConfigEntry('html_template_class', 'Org\Mxchange\CoreFramework\Template\Engine\HtmlTemplateEngine'); // CFG: DECO-XML-REWRITER-TEMPLATE-CLASS -$cfg->setConfigEntry('deco_xml_rewriter_template_class', 'CoreFramework\Template\Xml\XmlRewriterTemplateDecorator'); +$cfg->setConfigEntry('deco_xml_rewriter_template_class', 'Org\Mxchange\CoreFramework\Template\Xml\XmlRewriterTemplateDecorator'); // CFG: DEBUG-HTML-CLASS -$cfg->setConfigEntry('debug_html_class', 'CoreFramework\Output\Debug\DebugWebOutput'); +$cfg->setConfigEntry('debug_html_class', 'Org\Mxchange\CoreFramework\Output\Debug\DebugWebOutput'); // CFG: DEBUG-CONSOLE-CLASS -$cfg->setConfigEntry('debug_console_class', 'CoreFramework\Debug\Output\DebugConsoleOutput'); +$cfg->setConfigEntry('debug_console_class', 'Org\Mxchange\CoreFramework\Debug\Output\DebugConsoleOutput'); // CFG: DEFAULT-LANGUAGE $cfg->setConfigEntry('default_lang', 'de'); // A two-char language string: de for german, en for english and so on @@ -113,10 +113,10 @@ $cfg->setConfigEntry('image_template_type', 'image'); $cfg->setConfigEntry('menu_template_type', 'menu'); // CFG: OUTPUT-CLASS -$cfg->setConfigEntry('output_class', 'CoreFramework\Output\WebOutput'); +$cfg->setConfigEntry('output_class', 'Org\Mxchange\CoreFramework\Output\WebOutput'); // CFG: LANGUAGE-SYSTEM-CLASS -$cfg->setConfigEntry('language_system_class', 'CoreFramework\Localization\LanguageSystem'); +$cfg->setConfigEntry('language_system_class', 'Org\Mxchange\CoreFramework\Localization\LanguageSystem'); // CFG: SELECTOR-TEMPLATE-PREFIX $cfg->setConfigEntry('tpl_selector_prefix', 'selector'); @@ -155,109 +155,109 @@ $cfg->setConfigEntry('default_application', 'selector'); $cfg->setConfigEntry('verbose_level', 0); // CFG: CACHE-CLASS -$cfg->setConfigEntry('cache_class', 'CoreFramework\Cache\Memory\MemoryCache'); +$cfg->setConfigEntry('cache_class', 'Org\Mxchange\CoreFramework\Cache\Memory\MemoryCache'); // CFG: SEARCH-CRITERIA-CLASS -$cfg->setConfigEntry('search_criteria_class', 'CoreFramework\Criteria\Search\SearchCriteria'); +$cfg->setConfigEntry('search_criteria_class', 'Org\Mxchange\CoreFramework\Criteria\Search\SearchCriteria'); // CFG: DATASET-CRITERIA-CLASS -$cfg->setConfigEntry('dataset_criteria_class', 'CoreFramework\Criteria\DataSet\DataSetCriteria'); +$cfg->setConfigEntry('dataset_criteria_class', 'Org\Mxchange\CoreFramework\Criteria\DataSet\DataSetCriteria'); // CFG: UPDATE-CRITERIA-CLASS -$cfg->setConfigEntry('update_criteria_class', 'CoreFramework\Criteria\Update\UpdateCriteria'); +$cfg->setConfigEntry('update_criteria_class', 'Org\Mxchange\CoreFramework\Criteria\Update\UpdateCriteria'); // CFG: FILE-IO-CLASS -$cfg->setConfigEntry('file_io_class', 'CoreFramework\Handler\Filesystem\FileIoHandler'); +$cfg->setConfigEntry('file_io_class', 'Org\Mxchange\CoreFramework\Handler\Filesystem\FileIoHandler'); // CFG: DATABASE-RESULT-CLASS -$cfg->setConfigEntry('database_result_class', 'CoreFramework\Result\Database\CachedDatabaseResult'); +$cfg->setConfigEntry('database_result_class', 'Org\Mxchange\CoreFramework\Result\Database\CachedDatabaseResult'); // CFG: FILTER-CHAIN-CLASS -$cfg->setConfigEntry('filter_chain_class', 'CoreFramework\Chain\Filter\FilterChain'); +$cfg->setConfigEntry('filter_chain_class', 'Org\Mxchange\CoreFramework\Chain\Filter\FilterChain'); // CFG: FILE-INPUT-CLASS -$cfg->setConfigEntry('file_input_class', 'CoreFramework\Stream\Filesystem\FileIoStream'); +$cfg->setConfigEntry('file_input_class', 'Org\Mxchange\CoreFramework\Stream\Filesystem\FileIoStream'); // CFG: FILE-OUTPUT-CLASS -$cfg->setConfigEntry('file_output_class', 'CoreFramework\Stream\Filesystem\FileIoStream'); +$cfg->setConfigEntry('file_output_class', 'Org\Mxchange\CoreFramework\Stream\Filesystem\FileIoStream'); // CFG: EMAIL-VALIDATOR-FILTER-CLASS -$cfg->setConfigEntry('email_validator_filter_class', 'CoreFramework\Filter\Validator\Email\EmailValidatorFilter'); +$cfg->setConfigEntry('email_validator_filter_class', 'Org\Mxchange\CoreFramework\Filter\Validator\Email\EmailValidatorFilter'); // CFG: USERNAME-VALIDATOR-FILTER-CLASS -$cfg->setConfigEntry('username_validator_filter_class', 'CoreFramework\Filter\Validator\Username\UserNameValidatorFilter'); +$cfg->setConfigEntry('username_validator_filter_class', 'Org\Mxchange\CoreFramework\Filter\Validator\Username\UserNameValidatorFilter'); // CFG: USERNAME-IS-GUEST-FILTER-CLASS -$cfg->setConfigEntry('username_is_guest_filter_class', 'CoreFramework\Filter\User\Username\UserNameIsGuestFilter'); +$cfg->setConfigEntry('username_is_guest_filter_class', 'Org\Mxchange\CoreFramework\Filter\User\Username\UserNameIsGuestFilter'); // CFG: PASSWORD-VALIDATOR-FILTER-CLASS -$cfg->setConfigEntry('password_validator_filter_class', 'CoreFramework\Filter\Validator\Password\PasswordValidatorFilter'); +$cfg->setConfigEntry('password_validator_filter_class', 'Org\Mxchange\CoreFramework\Filter\Validator\Password\PasswordValidatorFilter'); // CFG: RULES-ACCEPTED-FILTER-CLASS -$cfg->setConfigEntry('rules_accepted_filter_class', 'CoreFramework\Filter\RulesCheckbox\RulesAcceptedFilter'); +$cfg->setConfigEntry('rules_accepted_filter_class', 'Org\Mxchange\CoreFramework\Filter\RulesCheckbox\RulesAcceptedFilter'); // CFG: USERNAME-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('username_verifier_filter_class', 'CoreFramework\Filter\Verifier\User\UserNameVerifierFilter'); +$cfg->setConfigEntry('username_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\UserNameVerifierFilter'); // CFG: USER-GUEST-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('user_guest_verifier_filter_class', 'CoreFramework\Filter\Verifier\User\UserGuestVerifierFilter'); +$cfg->setConfigEntry('user_guest_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\UserGuestVerifierFilter'); // CFG: EMAIL-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('email_verifier_filter_class', 'CoreFramework\Filter\Verifier\Email\EmailVerifierFilter'); +$cfg->setConfigEntry('email_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Email\EmailVerifierFilter'); // CFG: PASSWORD-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('password_verifier_filter_class', 'CoreFramework\Filter\Verifier\Password\PasswordVerifierFilter'); +$cfg->setConfigEntry('password_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Password\PasswordVerifierFilter'); // CFG: PASSWD-GUEST-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('passwd_guest_verifier_filter_class', 'CoreFramework\Filter\Verifier\User\PasswordGuestVerifierFilter'); +$cfg->setConfigEntry('passwd_guest_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\PasswordGuestVerifierFilter'); // CFG: EMAIL-CHANGE-FILTER-CLASS -$cfg->setConfigEntry('email_change_filter_class', 'CoreFramework\Filter\Change\Email\EmailChangeFilter'); +$cfg->setConfigEntry('email_change_filter_class', 'Org\Mxchange\CoreFramework\Filter\Change\Email\EmailChangeFilter'); // CFG: PASSWORD-CHANGE-FILTER-CLASS -$cfg->setConfigEntry('password_change_filter_class', 'CoreFramework\Filter\Change\Password\PasswordChangeFilter'); +$cfg->setConfigEntry('password_change_filter_class', 'Org\Mxchange\CoreFramework\Filter\Change\Password\PasswordChangeFilter'); // CFG: ACCOUNT-PASSWORD-FILTER-CLASS -$cfg->setConfigEntry('account_password_filter_class', 'CoreFramework\Filter\Verifier\Password\AccountPasswordVerifierFilter'); +$cfg->setConfigEntry('account_password_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Password\AccountPasswordVerifierFilter'); // CFG: USER-STATUS-FILTER-CLASS -$cfg->setConfigEntry('user_status_filter_class', 'CoreFramework\Filter\Verifier\User\UserStatusVerifierFilter'); +$cfg->setConfigEntry('user_status_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\UserStatusVerifierFilter'); // CFG: USER-UNCONFIRMED-FILTER-CLASS -$cfg->setConfigEntry('user_unconfirmed_filter_class', 'CoreFramework\Filter\Verifier\User\UserUnconfirmedVerifierFilter'); +$cfg->setConfigEntry('user_unconfirmed_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\UserUnconfirmedVerifierFilter'); // CFG: CRYPTO-CLASS -$cfg->setConfigEntry('crypto_class', 'CoreFramework\Helper\Crypto\CryptoHelper'); +$cfg->setConfigEntry('crypto_class', 'Org\Mxchange\CoreFramework\Helper\Crypto\CryptoHelper'); // CFG: RNG-CLASS -$cfg->setConfigEntry('rng_class', 'CoreFramework\Crypto\RandomNumber\RandomNumberGenerator'); +$cfg->setConfigEntry('rng_class', 'Org\Mxchange\CoreFramework\Crypto\RandomNumber\RandomNumberGenerator'); // CFG: USER-DB-WRAPPER-CLASS -$cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Database\Frontend\User\UserDatabaseWrapper'); +$cfg->setConfigEntry('user_db_wrapper_class', 'Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper'); // CFG: NEWS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Database\Frontend\News\NewsDatabaseWrapper'); +$cfg->setConfigEntry('news_db_wrapper_class', 'Org\Mxchange\CoreFramework\Database\Frontend\News\NewsDatabaseWrapper'); // CFG: HTML-CMD-RESOLVER-CLASS -$cfg->setConfigEntry('html_cmd_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver'); +$cfg->setConfigEntry('html_cmd_resolver_class', 'Org\Mxchange\CoreFramework\Resolver\Command\HtmlCommandResolver'); // CFG: HTML-CMD-LOGIN-RESOLVER-CLASS -$cfg->setConfigEntry('html_cmd_login_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver'); +$cfg->setConfigEntry('html_cmd_login_resolver_class', 'Org\Mxchange\CoreFramework\Resolver\Command\HtmlCommandResolver'); // CFG: IMAGE-CMD-RESOLVER-CLASS -$cfg->setConfigEntry('image_cmd_resolver_class', 'CoreFramework\Resolver\Command\ImageCommandResolver'); +$cfg->setConfigEntry('image_cmd_resolver_class', 'Org\Mxchange\CoreFramework\Resolver\Command\ImageCommandResolver'); // CFG: IMAGE-CMD-CODE-CAPTCHA-RESOLVER-CLASS -$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'CoreFramework\Resolver\Command\ImageCommandResolver'); +$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'Org\Mxchange\CoreFramework\Resolver\Command\ImageCommandResolver'); // CFG: MAILER-CLASS -$cfg->setConfigEntry('mailer_class', 'CoreFramework\Mailer\Debug\DebugMailer'); +$cfg->setConfigEntry('mailer_class', 'Org\Mxchange\CoreFramework\Mailer\Debug\DebugMailer'); // CFG: XML-PARSER-CLASS -$cfg->setConfigEntry('xml_parser_class', 'CoreFramework\Parser\Xml\XmlParser'); +$cfg->setConfigEntry('xml_parser_class', 'Org\Mxchange\CoreFramework\Parser\Xml\XmlParser'); // CFG: DECO-COMPACTING-XML-PARSER-CLASS -$cfg->setConfigEntry('deco_compacting_xml_parser_class', 'CoreFramework\Parser\Xml\XmlCompactorDecorator'); +$cfg->setConfigEntry('deco_compacting_xml_parser_class', 'Org\Mxchange\CoreFramework\Parser\Xml\XmlCompactorDecorator'); // CFG: MATH-PRIME $cfg->setConfigEntry('math_prime', 591623); @@ -281,13 +281,13 @@ $cfg->setConfigEntry('hash_normal_mask', '%1s:%2s'); // 1=salt, 2=plain password $cfg->setConfigEntry('is_single_server', 'Y'); // CFG: POST-REGISTRATION-CLASS -$cfg->setConfigEntry('post_registration_class', 'CoreFramework\Action\PostRegistration\Login\LoginAfterRegistrationAction'); +$cfg->setConfigEntry('post_registration_class', 'Org\Mxchange\CoreFramework\Action\PostRegistration\Login\LoginAfterRegistrationAction'); // CFG: USER-CLASS -$cfg->setConfigEntry('user_class', 'CoreFramework\User\Login\Member'); +$cfg->setConfigEntry('user_class', 'Org\Mxchange\CoreFramework\User\Login\Member'); // CFG: GUEST-CLASS -$cfg->setConfigEntry('guest_class', 'CoreFramework\User\Guest\Guest'); +$cfg->setConfigEntry('guest_class', 'Org\Mxchange\CoreFramework\User\Guest\Guest'); // CFG: COOKIE-EXPIRE $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours! @@ -317,7 +317,7 @@ $cfg->setConfigEntry('product_install_mode', 'debug'); $cfg->setConfigEntry('decimals', 3); // CFG: MENU-STACKER-CLASS -$cfg->setConfigEntry('menu_stacker_class', 'CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('menu_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); // CFG: STACKER-GENERIC-MAX-SIZE $cfg->setConfigEntry('stacker_generic_max_size', 100); @@ -326,10 +326,10 @@ $cfg->setConfigEntry('stacker_generic_max_size', 100); $cfg->setConfigEntry('stacker_current_node_max_size', 20); // CFG: LOCAL-FILE-DATABASE-CLASS -$cfg->setConfigEntry('local_file_database_class', 'CoreFramework\Database\Backend\Lfdb\CachedLocalFileDatabase'); +$cfg->setConfigEntry('local_file_database_class', 'Org\Mxchange\CoreFramework\Database\Backend\Lfdb\CachedLocalFileDatabase'); // CFG: COMPRESSOR-CHANNEL-CLASS -$cfg->setConfigEntry('compressor_channel_class', 'CoreFramework\Middleware\Compressor\CompressorChannel'); +$cfg->setConfigEntry('compressor_channel_class', 'Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel'); // CFG: DEBUG-HTML-OUTPUT-TIMINGS $cfg->setConfigEntry('debug_html_output_timings', 'N'); @@ -359,25 +359,25 @@ $cfg->setConfigEntry('hostname_file', '/etc/hostname'); $cfg->setConfigEntry('database_cache_enabled', false); // CFG: DIRECTORY-CLASS -$cfg->setConfigEntry('directory_class', 'CoreFramework\Filesytem\Pointer\FrameworkDirectoryPointer'); +$cfg->setConfigEntry('directory_class', 'Org\Mxchange\CoreFramework\Filesytem\Pointer\FrameworkDirectoryPointer'); // CFG: FILE-RAW-INPUT-CLASS -$cfg->setConfigEntry('file_raw_input_class', 'CoreFramework\Filesystem\Pointer\Input\FrameworkRawFileInputPointer'); +$cfg->setConfigEntry('file_raw_input_class', 'Org\Mxchange\CoreFramework\Filesystem\Pointer\Input\FrameworkRawFileInputPointer'); // CFG: FILE-RAW-OUTPUT-CLASS -$cfg->setConfigEntry('file_raw_output_class', 'CoreFramework\Filesystem\Pointer\Output\FrameworkRawFileOutputPointer'); +$cfg->setConfigEntry('file_raw_output_class', 'Org\Mxchange\CoreFramework\Filesystem\Pointer\Output\FrameworkRawFileOutputPointer'); // CFG: FILE-RAW-INPUT-OUTPUT-CLASS -$cfg->setConfigEntry('file_raw_input_output_class', 'CoreFramework\Filesystem\Pointer\FrameworkFileInputOutputPointer'); +$cfg->setConfigEntry('file_raw_input_output_class', 'Org\Mxchange\CoreFramework\Filesystem\Pointer\FrameworkFileInputOutputPointer'); // CFG: TEXT-FILE-INPUT-CLASS -$cfg->setConfigEntry('text_file_input_class', 'CoreFramework\Filesystem\Pointer\Input\FrameworkTextFileInputPointer'); +$cfg->setConfigEntry('text_file_input_class', 'Org\Mxchange\CoreFramework\Filesystem\Pointer\Input\FrameworkTextFileInputPointer'); // CFG: CSV-INPUT-FILE-CLASS -$cfg->setConfigEntry('csv_input_file_class', 'CoreFramework\Filesystem\Input\Csv\CsvInputFile'); +$cfg->setConfigEntry('csv_input_file_class', 'Org\Mxchange\CoreFramework\Filesystem\Input\Csv\CsvInputFile'); // CFG: FILE-ITERATOR-CLASS -$cfg->setConfigEntry('file_iterator_class', 'CoreFramework\Iterator\File\FileIterator'); +$cfg->setConfigEntry('file_iterator_class', 'Org\Mxchange\CoreFramework\Iterator\File\FileIterator'); // CFG: FILE-STACK-PRE-ALLOCATE-ENABLED $cfg->setConfigEntry('file_stack_pre_allocate_enabled', 'Y'); @@ -386,7 +386,7 @@ $cfg->setConfigEntry('file_stack_pre_allocate_enabled', 'Y'); $cfg->setConfigEntry('file_stack_pre_allocate_count', 10000); // CFG: INDEX-INDEX-CLASS -$cfg->setConfigEntry('file_stack_index_class', 'CoreFramework\Index\Stack\FileStackIndex'); +$cfg->setConfigEntry('file_stack_index_class', 'Org\Mxchange\CoreFramework\Index\Stack\FileStackIndex'); // CFG: INDEX-PRE-ALLOCATE-ENABLED $cfg->setConfigEntry('index_pre_allocate_enabled', 'Y'); @@ -395,25 +395,25 @@ $cfg->setConfigEntry('index_pre_allocate_enabled', 'Y'); $cfg->setConfigEntry('index_pre_allocate_count', 10000); // CFG: STACK-FILE-CLASS -$cfg->setConfigEntry('stack_file_class', 'CoreFramework\Filesystem\Stack\StackFile'); +$cfg->setConfigEntry('stack_file_class', 'Org\Mxchange\CoreFramework\Filesystem\Stack\StackFile'); // CFG: INDEX-FILE-CLASS -$cfg->setConfigEntry('index_file_class', 'CoreFramework\Filesystem\Index\IndexFile'); +$cfg->setConfigEntry('index_file_class', 'Org\Mxchange\CoreFramework\Filesystem\Index\IndexFile'); // CFG: TASK-HANDLER-CLASS -$cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandler'); +$cfg->setConfigEntry('task_handler_class', 'Org\Mxchange\CoreFramework\Handler\Task\TaskHandler'); // CFG: TASK-LIST-CLASS -$cfg->setConfigEntry('task_list_class', 'CoreFramework\Lists\Task\TaskList'); +$cfg->setConfigEntry('task_list_class', 'Org\Mxchange\CoreFramework\Lists\Task\TaskList'); // CFG: LIST-GROUP-CLASS -$cfg->setConfigEntry('list_group_class', 'CoreFramework\Lists\Group\ListGroupList'); +$cfg->setConfigEntry('list_group_class', 'Org\Mxchange\CoreFramework\Lists\Group\ListGroupList'); // CFG: DEFAULT-ITERATOR-CLASS -$cfg->setConfigEntry('default_iterator_class', 'CoreFramework\Iterator\DefaultIterator'); +$cfg->setConfigEntry('default_iterator_class', 'Org\Mxchange\CoreFramework\Iterator\DefaultIterator'); // CFG: IDLE-TASK-CLASS -$cfg->setConfigEntry('idle_task_class', 'CoreFramework\Task\IdleLoop\IdleLoopTask'); +$cfg->setConfigEntry('idle_task_class', 'Org\Mxchange\CoreFramework\Task\IdleLoop\IdleLoopTask'); // CFG: TASK-IDLE-LOOP-STARTUP-DELAY $cfg->setConfigEntry('task_idle_loop_startup_delay', 0); @@ -434,13 +434,13 @@ $cfg->setConfigEntry('default_image_command', 'build'); $cfg->setConfigEntry('default_image_controller', 'build'); // CFG: MENU-TEMPLATE-CLASS -$cfg->setConfigEntry('menu_template_class', 'CoreFramework\Template\Engine\MenuTemplateEngine'); +$cfg->setConfigEntry('menu_template_class', 'Org\Mxchange\CoreFramework\Template\Engine\MenuTemplateEngine'); // CFG: MENU-TEMPLATE-EXTENSION $cfg->setConfigEntry('menu_template_extension', '.xml'); // CFG: FEATURE-FUSE-CLASS -$cfg->setConfigEntry('feature_fuse_class', 'CoreFramework\Feature\Fuse\FuseFeature'); +$cfg->setConfigEntry('feature_fuse_class', 'Org\Mxchange\CoreFramework\Feature\Fuse\FuseFeature'); // CFG: TEMP-FILE-PATH $cfg->setConfigEntry('temp_file_path', sys_get_temp_dir()); @@ -455,7 +455,7 @@ $cfg->setConfigEntry('extension_scrypt_loaded', false); $cfg->setConfigEntry('extension_uuid_loaded', false); // CFG: REGISTRY-ITERATOR-CLASS -$cfg->setConfigEntry('registry_iterator_class', 'CoreFramework\Iterator\Registry\RegistryIterator'); +$cfg->setConfigEntry('registry_iterator_class', 'Org\Mxchange\CoreFramework\Iterator\Registry\RegistryIterator'); // CFG: QUIET-DNS-RESOLVER $cfg->setConfigEntry('quiet_dns_resolver', FALSE); diff --git a/framework/config/class_FrameworkConfiguration.php b/framework/config/class_FrameworkConfiguration.php index 0826076e..be9d7d6d 100644 --- a/framework/config/class_FrameworkConfiguration.php +++ b/framework/config/class_FrameworkConfiguration.php @@ -1,16 +1,14 @@ isPhpExtensionLoaded('mcrypt')) { // Then use it - $this->cryptoStreamInstance = ObjectFactory::createObjectByName('CoreFramework\Stream\Crypto\McryptStream', array($this->getRngInstance())); + $this->cryptoStreamInstance = ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Stream\Crypto\McryptStream', array($this->getRngInstance())); } elseif ($this->isPhpExtensionLoaded('openssl')) { // Then use it - $this->cryptoStreamInstance = ObjectFactory::createObjectByName('CoreFramework\Stream\Crypto\OpenSslStream', array($this->getRngInstance())); + $this->cryptoStreamInstance = ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Stream\Crypto\OpenSslStream', array($this->getRngInstance())); } else { // If nothing works ... - $this->cryptoStreamInstance = ObjectFactory::createObjectByName('CoreFramework\Stream\Crypto\NullCryptoStream'); + $this->cryptoStreamInstance = ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Stream\Crypto\NullCryptoStream'); } } diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php index d232db1b..9f8a8c0b 100644 --- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php +++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php @@ -1,16 +1,16 @@ setCompressor(ObjectFactory::createObjectByName('CoreFramework\Compressor\Null\NullCompressor')); + $compressorInstance->setCompressor(ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Compressor\Null\NullCompressor')); } // END - if // Return the compressor instance diff --git a/framework/main/middleware/database/class_DatabaseConnection.php b/framework/main/middleware/database/class_DatabaseConnection.php index 7d7686a7..83b13eb5 100644 --- a/framework/main/middleware/database/class_DatabaseConnection.php +++ b/framework/main/middleware/database/class_DatabaseConnection.php @@ -1,15 +1,15 @@ isCommandValid('CoreFramework\Tests\Command', $commandName) === false) { + } elseif ($resolverInstance->isCommandValid('Org\Mxchange\CoreFramework\Tests\Command', $commandName) === false) { // Invalid command found throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND); } // Set namespace and application instance - $resolverInstance->setNamespace('CoreFramework\Tests\Command'); + $resolverInstance->setNamespace('Org\Mxchange\CoreFramework\Tests\Command'); $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance diff --git a/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php b/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php index e3761edf..c1e5f999 100644 --- a/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php +++ b/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php @@ -1,13 +1,13 @@ isControllerValid('CoreFramework\Tests\Controller', $controllerName) === false) { + } elseif ($resolverInstance->isControllerValid('Org\Mxchange\CoreFramework\Tests\Controller', $controllerName) === false) { // Invalid command found throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER); } @@ -74,7 +74,7 @@ class TestsConsoleControllerResolver extends BaseControllerResolver implements C $resolverInstance->setApplicationInstance($applicationInstance); // Set namespace and controller name - $resolverInstance->setNamespace('CoreFramework\Tests\Controller'); + $resolverInstance->setNamespace('Org\Mxchange\CoreFramework\Tests\Controller'); $resolverInstance->setControllerName($controllerName); // Return the prepared instance diff --git a/framework/main/third_party/api/wernisportal/class_WernisApi.php b/framework/main/third_party/api/wernisportal/class_WernisApi.php index cc81fe73..cb85170a 100644 --- a/framework/main/third_party/api/wernisportal/class_WernisApi.php +++ b/framework/main/third_party/api/wernisportal/class_WernisApi.php @@ -3,7 +3,7 @@ namespace Wds66\Api; // Import framework stuff -use CoreFramework\Object\BaseFrameworkSystem; +use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; /** * Class for connecting to the Wernis-Portal at http://www.wds66.com diff --git a/index.php b/index.php index 6ac80114..1e7f1d48 100644 --- a/index.php +++ b/index.php @@ -1,15 +1,15 @@ diff --git a/tests/framework/bootstrap/class_FrameworkBootstrapTest.php b/tests/framework/bootstrap/class_FrameworkBootstrapTest.php index 95a847c1..e96065a5 100644 --- a/tests/framework/bootstrap/class_FrameworkBootstrapTest.php +++ b/tests/framework/bootstrap/class_FrameworkBootstrapTest.php @@ -1,13 +1,13 @@ __toString(); // Should be equal - $this->assertEquals('CoreFramework\Configuration\FrameworkConfiguration', $className); + $this->assertEquals('Org\Mxchange\CoreFramework\Configuration\FrameworkConfiguration', $className); } /**