From 4f9cf34b521892cb99fae9b21b92787f3d555b74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 14 Nov 2017 21:58:42 +0100 Subject: [PATCH] Continued: - added Org\Nxchange\ namespace followwing Java convention MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/tests/class_ApplicationHelper.php | 20 +-- application/tests/config.php | 14 +- application/tests/exceptions.php | 4 +- contrib/find-bad-php.sh | 2 +- framework/bootstrap/bootstrap.inc.php | 2 +- .../bootstrap/class_FrameworkBootstrap.php | 42 +++--- framework/config-global.php | 134 +++++++++--------- .../config/class_FrameworkConfiguration.php | 14 +- framework/loader/class_ClassLoader.php | 8 +- .../main/classes/actions/class_BaseAction.php | 4 +- .../html/class_HtmlLoginProfileAction.php | 16 +-- .../class_LoginAfterRegistrationAction.php | 12 +- .../application/class_BaseApplication.php | 6 +- .../main/classes/auth/class_CookieAuth.php | 10 +- .../main/classes/cache/class_MemoryCache.php | 6 +- .../classes/class_BaseFrameworkSystem.php | 90 ++++++------ .../classes/class_FrameworkArrayObject.php | 2 +- .../main/classes/client/class_BaseClient.php | 4 +- .../classes/commands/class_BaseCommand.php | 12 +- .../console/class_ConsoleFuseCommand.php | 16 +-- .../html/class_HtmlConfirmCommand.php | 22 +-- .../commands/html/class_HtmlDoFormCommand.php | 14 +- .../commands/html/class_HtmlHomeCommand.php | 18 +-- .../html/class_HtmlLoginAreaCommand.php | 20 +-- .../commands/html/class_HtmlLoginCommand.php | 18 +-- .../html/class_HtmlLoginFailedCommand.php | 18 +-- .../commands/html/class_HtmlLogoutCommand.php | 18 +-- .../html/class_HtmlLogoutDoneCommand.php | 18 +-- .../html/class_HtmlProblemCommand.php | 16 +-- .../html/class_HtmlRegisterCommand.php | 18 +-- .../html/class_HtmlResendLinkCommand.php | 20 +-- .../commands/html/class_HtmlStatusCommand.php | 16 +-- .../image/class_ImageCodeCaptchaCommand.php | 16 +-- .../compressor/class_Bzip2Compressor.php | 6 +- .../compressor/class_GzipCompressor.php | 6 +- .../compressor/class_NullCompressor.php | 6 +- .../compressor/class_ZlibCompressor.php | 6 +- .../classes/container/class_BaseContainer.php | 4 +- .../controller/class_BaseController.php | 18 +-- .../class_ConsoleDefaultController.php | 10 +- .../class_ConsoleDefaultNewsController.php | 14 +- .../html/class_HtmlConfirmController.php | 14 +- .../html/class_HtmlDefaultController.php | 12 +- .../html/class_HtmlDefaultNewsController.php | 14 +- .../html/class_HtmlLoginController.php | 12 +- .../html/class_HtmlLoginFailedController.php | 12 +- .../html/class_HtmlLogoutController.php | 14 +- .../html/class_HtmlLogoutDoneController.php | 12 +- .../html/class_HtmlProblemController.php | 12 +- .../html/class_HtmlRegisterController.php | 12 +- .../html/class_HtmlStatusController.php | 12 +- .../html/form/class_HtmlDoFormController.php | 12 +- .../login/class_HtmlLoginAreaController.php | 14 +- .../class_ImageCodeCaptchaController.php | 14 +- .../image/class_ImageDefaultController.php | 12 +- .../classes/criteria/class_BaseCriteria.php | 6 +- .../dataset/class_DataSetCriteria.php | 8 +- .../criteria/search/class_SearchCriteria.php | 6 +- .../criteria/update/class_UpdateCriteria.php | 6 +- .../classes/crypto/class_CryptoHelper.php | 14 +- .../class_CachedLocalFileDatabase.php | 18 +-- .../database/class_BaseDatabaseBackend.php | 8 +- .../database/class_BaseDatabaseResult.php | 4 +- .../database/class_BaseDatabaseWrapper.php | 12 +- .../frontend/class_NewsDatabaseWrapper.php | 6 +- .../class_PaymentsDatabaseWrapper.php | 6 +- .../frontend/class_UserDatabaseWrapper.php | 16 +-- .../class_UserPointsDatabaseWrapper.php | 10 +- .../result/class_CachedDatabaseResult.php | 18 +-- .../classes/decorator/class_BaseDecorator.php | 4 +- .../class_XmlRewriterTemplateDecorator.php | 10 +- .../xml/class_XmlCompactorDecorator.php | 8 +- .../classes/discovery/class_BaseDiscovery.php | 4 +- .../payment/class_LocalPaymentDiscovery.php | 18 +-- .../factories/cache/class_CacheFactory.php | 6 +- .../classes/factories/class_BaseFactory.php | 4 +- .../database/class_DatabaseWrapperFactory.php | 6 +- .../factories/html/class_HtmlNewsFactory.php | 8 +- .../index/class_FileStackIndexFactory.php | 8 +- .../factories/logger/class_LoggerFactory.php | 6 +- .../factories/login/class_LoginFactory.php | 8 +- .../factories/objects/class_ObjectFactory.php | 6 +- .../registry/class_SocketRegistryFactory.php | 6 +- .../stacks/class_FileStackFactory.php | 8 +- .../factories/user/class_UserFactory.php | 10 +- .../xml/class_XmlTemplateEngineFactory.php | 6 +- .../classes/feature/class_BaseFeature.php | 4 +- .../feature/class_FrameworkFeature.php | 10 +- .../feature/fuse/class_FuseFeature.php | 6 +- .../binary/class_BaseBinaryFile.php | 10 +- .../binary/index/class_IndexFile.php | 8 +- .../binary/stack/class_StackFile.php | 8 +- .../class_BaseAbstractFile.php | 10 +- .../file_directories/class_BaseFileIo.php | 10 +- .../class_FrameworkDirectoryPointer.php | 8 +- .../class_FrameworkRawFileInputPointer.php | 18 +-- .../class_FrameworkTextFileInputPointer.php | 18 +-- .../class_FrameworkFileInputOutputPointer.php | 18 +-- .../io_stream/class_FileIoStream.php | 16 +-- .../class_FrameworkRawFileOutputPointer.php | 8 +- .../class_FrameworkTextFileOutputPointer.php | 10 +- .../text/class_BaseTextFile.php | 6 +- .../text/input/class_BaseInputTextFile.php | 6 +- .../text/input/csv/class_CsvInputFile.php | 6 +- .../text/output/class_BaseOutputTextFile.php | 8 +- .../filesystem/class_BaseFilesystem.php | 4 +- .../filter/auth/class_UserAuthFilter.php | 18 +-- .../filter/change/class_EmailChangeFilter.php | 12 +- .../change/class_PasswordChangeFilter.php | 12 +- .../checkboxes/class_RulesAcceptedFilter.php | 10 +- .../main/classes/filter/class_BaseFilter.php | 4 +- .../filter/class_BaseFilterDecorator.php | 8 +- .../main/classes/filter/class_FilterChain.php | 12 +- .../crypto/class_CaptchaEncryptFilter.php | 14 +- .../guest/class_UserNameIsGuestFilter.php | 10 +- .../filter/news/class_NewsDownloadFilter.php | 14 +- .../filter/news/class_NewsProcessFilter.php | 10 +- .../classes/filter/null/class_NullFilter.php | 10 +- .../payment/class_PaymentDiscoveryFilter.php | 20 +-- .../class_UserStatusConfimedUpdateFilter.php | 14 +- .../filter/update/class_UserUpdateFilter.php | 12 +- .../validator/class_EmailValidatorFilter.php | 12 +- .../class_PasswordValidatorFilter.php | 10 +- .../class_UserNameValidatorFilter.php | 12 +- .../class_AccountPasswordVerifierFilter.php | 16 +-- .../verifier/class_BirthdayVerifierFilter.php | 10 +- .../class_ConfirmCodeVerifierFilter.php | 14 +- .../verifier/class_EmailVerifierFilter.php | 10 +- ...ass_GraphicalCodeCaptchaVerifierFilter.php | 12 +- .../class_PasswordGuestVerifierFilter.php | 10 +- .../verifier/class_PasswordVerifierFilter.php | 10 +- .../class_UserGuestVerifierFilter.php | 12 +- .../verifier/class_UserNameVerifierFilter.php | 12 +- .../class_UserStatusVerifierFilter.php | 12 +- .../class_UserUnconfirmedVerifierFilter.php | 14 +- ...lass_FrameworkFuseWrapper.php_discontinued | 4 +- .../classes/handler/class_BaseHandler.php | 8 +- .../handler/tasks/class_TaskHandler.php | 14 +- .../helper/captcha/class_BaseCaptcha.php | 8 +- .../captcha/images/class_ImageHelper.php | 8 +- .../web/class_GraphicalCodeCaptcha.php | 8 +- .../main/classes/helper/class_BaseHelper.php | 12 +- .../html/blocks/class_HtmlBlockHelper.php | 6 +- .../helper/html/class_BaseHtmlHelper.php | 4 +- .../html/forms/class_HtmlFormHelper.php | 14 +- .../html/links/class_HtmlLinkHelper.php | 14 +- .../helper/login/class_BaseLoginHelper.php | 4 +- .../main/classes/images/class_BaseImage.php | 6 +- .../images/extended/class_PngImage.php | 6 +- .../main/classes/index/class_BaseIndex.php | 12 +- .../index/file_stack/class_FileStackIndex.php | 12 +- .../classes/iterator/class_BaseIterator.php | 4 +- .../default/class_DefaultIterator.php | 8 +- .../iterator/file/class_FileIterator.php | 8 +- .../registry/class_RegistryIterator.php | 14 +- .../classes/language/class_LanguageSystem.php | 10 +- .../main/classes/lists/class_BaseList.php | 10 +- .../lists/groups/class_ListGroupList.php | 6 +- .../classes/lists/tasks/class_TaskList.php | 6 +- .../main/classes/mailer/class_BaseMailer.php | 8 +- .../mailer/debug/class_DebugMailer.php | 18 +-- .../main/classes/menu/class_BaseMenu.php | 14 +- .../main/classes/output/class_BaseOutput.php | 4 +- .../output/console/class_ConsoleOutput.php | 10 +- .../output/debug/class_BaseDebugOutput.php | 4 +- .../console/class_DebugConsoleOutput.php | 14 +- .../debug/error/class_DebugErrorLogOutput.php | 10 +- .../output/debug/web/class_DebugWebOutput.php | 10 +- .../classes/output/web/class_WebOutput.php | 14 +- .../main/classes/parser/class_BaseParser.php | 4 +- .../classes/parser/xml/class_XmlParser.php | 8 +- .../main/classes/points/class_UserPoints.php | 16 +-- .../reader/class_ConsoleNewsReader.php | 16 +-- .../reader/class_DefaultNewsReader.php | 14 +- .../registration/class_BaseRegistration.php | 10 +- .../classes/registry/class_BaseRegistry.php | 8 +- .../registry/generic/class_Registry.php | 6 +- .../registry/sub/class_SubRegistry.php | 6 +- .../classes/request/class_BaseRequest.php | 4 +- .../request/console/class_ConsoleRequest.php | 6 +- .../request/html/class_HtmlRequest.php | 4 +- .../action/class_BaseActionResolver.php | 6 +- .../action/html/class_HtmlActionResolver.php | 6 +- .../classes/resolver/class_BaseResolver.php | 6 +- .../command/class_BaseCommandResolver.php | 14 +- .../console/class_ConsoleCommandResolver.php | 10 +- .../html/class_HtmlCommandResolver.php | 8 +- .../image/class_ImageCommandResolver.php | 6 +- .../class_BaseControllerResolver.php | 14 +- .../class_ConsoleControllerResolver.php | 10 +- .../html/class_HtmlControllerResolver.php | 10 +- .../image/class_ImageControllerResolver.php | 10 +- .../classes/response/class_BaseResponse.php | 6 +- .../console/class_ConsoleResponse.php | 4 +- .../response/html/class_HtmlResponse.php | 6 +- .../response/image/class_ImageResponse.php | 6 +- .../rng/class_RandomNumberGenerator.php | 8 +- .../main/classes/scrypt/class_Scrypt.php | 6 +- .../classes/stacker/class_BaseStacker.php | 4 +- .../stacker/fifo/class_FiFoStacker.php | 2 +- .../stacker/file/class_BaseFileStack.php | 12 +- .../stacker/file/fifo/class_FiFoFileStack.php | 10 +- .../stacker/filo/class_FiLoStacker.php | 2 +- .../main/classes/states/class_BaseState.php | 6 +- .../main/classes/streams/class_BaseStream.php | 4 +- .../streams/crypto/class_McryptStream.php | 8 +- .../streams/crypto/class_NullCryptoStream.php | 6 +- .../streams/crypto/class_OpenSslStream.php | 8 +- .../main/classes/tasks/class_BaseTask.php | 4 +- .../classes/tasks/idle/class_IdleLoopTask.php | 10 +- .../template/class_BaseTemplateEngine.php | 16 +-- .../console/class_ConsoleTemplateEngine.php | 10 +- .../html/class_HtmlTemplateEngine.php | 10 +- .../image/class_ImageTemplateEngine.php | 16 +-- .../mail/class_MailTemplateEngine.php | 16 +-- .../menu/class_MenuTemplateEngine.php | 14 +- .../tools/console/class_ConsoleTools.php | 14 +- .../main/classes/user/class_BaseUser.php | 14 +- .../main/classes/user/guest/class_Guest.php | 10 +- .../main/classes/user/member/class_Member.php | 12 +- .../classes/visitor/class_BaseVisitor.php | 4 +- .../actions/class_InvalidActionException.php | 4 +- .../auth/class_UserAuthorizationException.php | 6 +- .../class_Base64EncodingBadException.php | 4 +- .../class_Base64EncodingModuloException.php | 4 +- .../exceptions/class_FrameworkException.php | 2 +- .../class_MismatchingCompressorsException.php | 4 +- ...ss_ConfigValueTypeUnsupportedException.php | 4 +- .../config/class_NoConfigEntryException.php | 4 +- ...s_ConnectionAlreadyRegisteredException.php | 4 +- .../class_DefaultControllerException.php | 6 +- .../class_InvalidControllerException.php | 4 +- .../class_EncryptInvalidLengthException.php | 6 +- .../crypto/class_EncryptMissingException.php | 6 +- .../database/class_DatabaseException.php | 4 +- .../database/general/class_SqlException.php | 4 +- .../class_SavePathIsNoDirectoryException.php | 4 +- .../class_SavePathReadProtectedException.php | 4 +- .../class_SavePathWriteProtectedException.php | 4 +- .../dns/class_UnknownHostnameException.php | 4 +- ...lass_FeatureMethodNotCallableException.php | 4 +- .../class_DirPointerNotOpenedException.php | 4 +- .../file_directory/class_FileIoException.php | 4 +- .../class_FileNotFoundException.php | 4 +- .../class_FileReadProtectedException.php | 4 +- .../class_FileWriteProtectedException.php | 4 +- .../class_InvalidDataLengthException.php | 4 +- .../class_InvalidMD5ChecksumException.php | 4 +- .../class_InvalidResourceException.php | 6 +- .../class_PathIsNoDirectoryException.php | 4 +- .../class_PathReadProtectedException.php | 4 +- .../class_PathWriteProtectedException.php | 6 +- .../filter/class_FilterChainException.php | 6 +- .../class_InvalidFilterChainException.php | 4 +- .../helper/class_FormClosedException.php | 4 +- .../helper/class_FormGroupClosedException.php | 4 +- .../helper/class_FormOpenedException.php | 6 +- ...ass_HelperGroupAlreadyCreatedException.php | 4 +- ...elperNoPreviousOpenedSubGroupException.php | 4 +- ..._HelperSubGroupAlreadyCreatedException.php | 4 +- .../helper/class_InvalidFormNameException.php | 6 +- .../helper/class_NoGroupOpenedException.php | 4 +- .../class_UserInstanceMissingException.php | 4 +- ...ass_InvalidLanguagePathStringException.php | 4 +- ...ass_LanguagePathIsNoDirectoryException.php | 4 +- ...ass_LanguagePathReadProtectedException.php | 4 +- .../main/class_AssertionException.php | 4 +- .../main/class_ClassMismatchException.php | 4 +- .../class_DimNotFoundInArrayException.php | 6 +- .../main/class_FatalErrorException.php | 4 +- .../main/class_IndexOutOfBoundsException.php | 4 +- .../main/class_InvalidArrayCountException.php | 4 +- .../main/class_InvalidClassNameException.php | 6 +- .../main/class_InvalidCommandException.php | 4 +- .../main/class_InvalidInterfaceException.php | 4 +- .../main/class_InvalidObjectException.php | 6 +- .../class_MissingArrayElementsException.php | 4 +- ...ingDecimalsThousandsSeparatorException.php | 4 +- .../main/class_NoClassException.php | 4 +- .../main/class_NullPointerException.php | 6 +- ...ss_ResponseHeadersAlreadySentException.php | 6 +- .../class_UnsupportedOperationException.php | 6 +- .../main/class_VariableIsNotSetException.php | 4 +- .../class_InvalidDatabaseResultException.php | 4 +- .../result/class_ResultUpdateException.php | 6 +- .../socket/class_AbstractSocketException.php | 4 +- .../class_InvalidServerSocketException.php | 2 +- .../socket/class_InvalidSocketException.php | 2 +- .../class_NoSocketErrorDetectedException.php | 2 +- ...class_SocketAlreadyRegisteredException.php | 2 +- .../socket/class_SocketBindingException.php | 2 +- .../class_SocketConnectionException.php | 2 +- .../socket/class_SocketCreationException.php | 2 +- .../socket/class_SocketOperationException.php | 2 +- .../socket/class_SocketOptionException.php | 2 +- ...UnsupportedSocketErrorHandlerException.php | 2 +- ...ass_AlreadyInitializedStackerException.php | 4 +- .../stacker/class_EmptyStackerException.php | 4 +- .../stacker/class_FullStackerException.php | 4 +- .../stacker/class_NoStackerException.php | 4 +- .../class_InvalidStateInstanceException.php | 4 +- .../state/class_UnexpectedStateException.php | 4 +- .../class_UnresolveableStateException.php | 4 +- .../class_BasePathReadProtectedException.php | 4 +- .../class_InvalidDirectoryException.php | 4 +- .../template/class_NoVariableException.php | 4 +- .../class_UnexpectedTemplateTypeException.php | 4 +- ...ass_UnsupportedTemplateEngineException.php | 6 +- ...class_AccountPasswordMismatchException.php | 6 +- .../class_UnexpectedGuestAccountException.php | 4 +- .../user/class_UserEmailMissingException.php | 4 +- .../user/class_UserNoGuestException.php | 6 +- .../class_UserPasswordMismatchException.php | 4 +- .../user/class_UsernameMissingException.php | 4 +- .../xml/class_InvalidXmlNodeException.php | 4 +- .../xml/class_XmlNodeMismatchException.php | 4 +- .../xml/class_XmlParserException.php | 4 +- .../actions/class_PerformableAction.php | 8 +- .../actions/commands/class_Commandable.php | 8 +- .../class_ManageableApplication.php | 6 +- .../interfaces/auth/class_Authorizeable.php | 4 +- .../calculatable/class_CalculatableBlock.php | 4 +- .../main/interfaces/block/class_Block.php | 4 +- .../main/interfaces/cache/class_Cacheable.php | 4 +- .../captcha/class_SolveableCaptcha.php | 6 +- .../interfaces/class_FrameworkInterface.php | 2 +- .../main/interfaces/client/class_Client.php | 4 +- .../compressor/class_Compressor.php | 4 +- .../controller/class_Controller.php | 8 +- .../interfaces/criteria/class_Criteria.php | 4 +- .../extended/class_AddableCriteria.php | 8 +- .../extended/class_LocalSearchCriteria.php | 4 +- .../extended/class_LocalUpdateCriteria.php | 4 +- .../extended/class_StoreableCriteria.php | 4 +- .../interfaces/crypto/class_Cryptable.php | 4 +- .../backend/class_DatabaseBackend.php | 8 +- .../database/class_DatabaseWrapper.php | 6 +- .../database/class_FrameworkDatabase.php | 4 +- .../interfaces/database/class_Updateable.php | 4 +- .../middleware/class_DatabaseConnector.php | 10 +- .../wrapper/class_BookablePointsWrapper.php | 6 +- .../class_ManageableAccountWrapper.php | 8 +- .../main/interfaces/debug/class_Debugger.php | 4 +- .../discovery/class_Discoverable.php | 8 +- .../main/interfaces/feature/class_Feature.php | 4 +- .../filesystem/class_Filesystem.php | 4 +- .../interfaces/filter/class_Filterable.php | 8 +- .../interfaces/handler/class_Handleable.php | 4 +- .../handler/class_HandleableDataSet.php | 6 +- .../handler/task/class_HandleableTask.php | 8 +- .../main/interfaces/helper/class_Helper.php | 4 +- .../helper/login/class_HelpableLogin.php | 6 +- .../template/class_HelpableTemplate.php | 4 +- .../main/interfaces/index/class_Indexable.php | 4 +- .../index/stack/class_IndexableStack.php | 6 +- .../interfaces/io/class_CloseableFile.php | 4 +- .../main/interfaces/io/class_FilePointer.php | 4 +- .../main/interfaces/io/class_Streamable.php | 4 +- .../interfaces/io/class_StreamableInput.php | 4 +- .../interfaces/io/class_StreamableOutput.php | 4 +- .../io/directory/class_FrameworkDirectory.php | 4 +- .../io/file/class_FileInputStreamer.php | 4 +- .../io/file/class_FileOutputStreamer.php | 4 +- .../io/file/csv/class_CsvInputStreamer.php | 4 +- .../io/file/handler/class_IoHandler.php | 8 +- .../io/output/class_OutputStreamer.php | 4 +- .../io/pointer/class_InputPointer.php | 6 +- .../io/pointer/class_OutputPointer.php | 6 +- .../pointer/io/class_InputOutputPointer.php | 6 +- .../class_SeekableWritableFileIterator.php | 2 +- .../registry/class_IteratableRegistry.php | 4 +- .../language/class_ManageableLanguage.php | 4 +- .../main/interfaces/lists/class_Listable.php | 6 +- .../interfaces/login/class_LoginableUser.php | 8 +- .../mailer/class_DeliverableMail.php | 6 +- .../interfaces/menu/class_RenderableMenu.php | 6 +- .../interfaces/parser/class_Parseable.php | 4 +- .../points/class_BookablePoints.php | 4 +- .../interfaces/reader/class_ReadableNews.php | 4 +- .../registration/class_UserRegister.php | 4 +- .../interfaces/registry/class_Register.php | 4 +- .../registry/class_Registerable.php | 4 +- .../interfaces/request/class_Requestable.php | 4 +- .../resolver/actions/class_ActionResolver.php | 6 +- .../interfaces/resolver/class_Resolver.php | 4 +- .../commands/class_CommandResolver.php | 6 +- .../controller/class_ControllerResolver.php | 6 +- .../response/class_Responseable.php | 4 +- .../result/class_SearchableResult.php | 8 +- .../result/class_UpdateableResult.php | 6 +- .../interfaces/stacker/class_Stackable.php | 4 +- .../stacker/file/class_StackableFile.php | 4 +- .../main/interfaces/state/class_Stateable.php | 4 +- .../main/interfaces/streams/class_Stream.php | 4 +- .../crypto/class_EncryptableStream.php | 4 +- .../streams/input/class_InputStream.php | 4 +- .../streams/output/class_OutputStream.php | 4 +- .../main/interfaces/tasks/class_Taskable.php | 6 +- .../template/class_CompileableTemplate.php | 8 +- .../template/view/class_ViewHelper.php | 4 +- .../user/class_ManageableAccount.php | 6 +- .../user/extended/class_ManageableGuest.php | 4 +- .../user/extended/class_ManageableMember.php | 4 +- .../interfaces/visitor/class_Visitable.php | 6 +- .../main/interfaces/visitor/class_Visitor.php | 4 +- .../decorator/class_DecoratorVisitor.php | 6 +- .../visitor/tasks/class_TaskVisitor.php | 6 +- .../main/middleware/class_BaseMiddleware.php | 4 +- .../compressor/class_CompressorChannel.php | 14 +- .../database/class_DatabaseConnection.php | 16 +-- .../debug/class_DebugMiddleware.php | 12 +- .../middleware/io/class_FileIoHandler.php | 16 +-- .../console/class_TestsConsoleMainCommand.php | 18 +-- ...lass_TestsConsoleDefaultNewsController.php | 16 +-- .../tests/filter/class_BaseTestsFilter.php | 4 +- ...TestConfigurationLoadableClassesFilter.php | 10 +- .../class_TestsPhpRequirementsFilter.php | 10 +- .../class_TestsConsoleCommandResolver.php | 14 +- .../class_TestsConsoleControllerResolver.php | 16 +-- .../api/wernisportal/class_WernisApi.php | 2 +- index.php | 18 +-- tests/bootstrap.php | 2 +- .../class_FrameworkBootstrapTest.php | 10 +- .../config/FrameworkConfigurationTest.php | 14 +- 424 files changed, 1757 insertions(+), 1759 deletions(-) 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); } /** -- 2.30.2