From: Roland Haeder Date: Mon, 13 Feb 2017 20:13:39 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65f6c4366c9709c9c7c9070d903f1d948be0d5b0;p=core.git Continued: - added more namespaces - added "import" lines for BaseFrameworkSystem Signed-off-by: Roland Häder --- diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index 68b23c5e..f210bbf4 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -3,6 +3,7 @@ namespace CoreFramework\Helper\Application; // Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; /** @@ -245,7 +246,5 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica public function assignExtraTemplateData (CompileableTemplate $templateInstance) { $this->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString()); } -} -// [EOF] -?> +} diff --git a/application/tests/config.php b/application/tests/config.php index 399453ef..a34a3c07 100644 --- a/application/tests/config.php +++ b/application/tests/config.php @@ -1,4 +1,7 @@ diff --git a/application/tests/init.php b/application/tests/init.php index 7e28c400..4db2c18d 100644 --- a/application/tests/init.php +++ b/application/tests/init.php @@ -1,4 +1,7 @@ setDatabaseInstance($connectionInstance); - -// [EOF] -?> diff --git a/inc/includes.php b/inc/includes.php index 45068c84..d9f38230 100644 --- a/inc/includes.php +++ b/inc/includes.php @@ -1,4 +1,8 @@ loadExtraConfigs(); // Register auto-load function with the SPL // @TODO This makes the core depending on the SPL. But it should be installed anyway. -spl_autoload_register('ClassLoader::autoLoad'); +spl_autoload_register('CoreFramework\Loader\ClassLoader::autoLoad'); // Does the user has an application specified? // @TODO Find a nicer OOP-ed way for this diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php index d0e264fc..8ce7f4fe 100644 --- a/inc/loader/class_ClassLoader.php +++ b/inc/loader/class_ClassLoader.php @@ -1,4 +1,15 @@ +} diff --git a/inc/main/classes/actions/class_BaseAction.php b/inc/main/classes/actions/class_BaseAction.php index cbf25fe6..331eba3a 100644 --- a/inc/main/classes/actions/class_BaseAction.php +++ b/inc/main/classes/actions/class_BaseAction.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/application/class_BaseApplication.php b/inc/main/classes/application/class_BaseApplication.php index 915916e2..c1d94d66 100644 --- a/inc/main/classes/application/class_BaseApplication.php +++ b/inc/main/classes/application/class_BaseApplication.php @@ -1,4 +1,10 @@ addInstance('application', $this); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/auth/class_CookieAuth.php b/inc/main/classes/auth/class_CookieAuth.php index b6890c16..e08bb33b 100644 --- a/inc/main/classes/auth/class_CookieAuth.php +++ b/inc/main/classes/auth/class_CookieAuth.php @@ -3,6 +3,7 @@ namespace CoreFramework\Auth; // Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; /** @@ -122,7 +123,5 @@ class CookieAuth extends BaseFrameworkSystem implements Authorizeable, Registera $this->getResponseInstance()->refreshCookie('username'); $this->getResponseInstance()->refreshCookie('u_hash'); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/cache/class_MemoryCache.php b/inc/main/classes/cache/class_MemoryCache.php index 7c771af6..a3bdbd60 100644 --- a/inc/main/classes/cache/class_MemoryCache.php +++ b/inc/main/classes/cache/class_MemoryCache.php @@ -1,4 +1,10 @@ dataCache->offsetUnset($offset); } // END - if } -} -// [EOF] -?> +} diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php index a2dfabe2..e841f005 100644 --- a/inc/main/classes/class_BaseFrameworkSystem.php +++ b/inc/main/classes/class_BaseFrameworkSystem.php @@ -2,9 +2,13 @@ // Own namespace namespace CoreFramework\Object; -// Load framework stuff +// Import framework stuff +use CoreFramework\Configuration\FrameworkConfiguration; use CoreFramework\Generic\FrameworkInterface; +// Import SPL stuff +use \stdClass; + /** * The simulator system class is the super class of all other classes. This * class handles saving of games etc. diff --git a/inc/main/classes/client/class_BaseClient.php b/inc/main/classes/client/class_BaseClient.php index 556b6682..040046d2 100644 --- a/inc/main/classes/client/class_BaseClient.php +++ b/inc/main/classes/client/class_BaseClient.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/commands/class_BaseCommand.php b/inc/main/classes/commands/class_BaseCommand.php index 0a8ef506..5984c18c 100644 --- a/inc/main/classes/commands/class_BaseCommand.php +++ b/inc/main/classes/commands/class_BaseCommand.php @@ -1,4 +1,10 @@ transferToResponse($responseInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/compressor/class_Bzip2Compressor.php b/inc/main/classes/compressor/class_Bzip2Compressor.php index 6ee7c52f..4c2f7880 100644 --- a/inc/main/classes/compressor/class_Bzip2Compressor.php +++ b/inc/main/classes/compressor/class_Bzip2Compressor.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/compressor/class_GzipCompressor.php b/inc/main/classes/compressor/class_GzipCompressor.php index d2aff6aa..44f5371a 100644 --- a/inc/main/classes/compressor/class_GzipCompressor.php +++ b/inc/main/classes/compressor/class_GzipCompressor.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/compressor/class_NullCompressor.php b/inc/main/classes/compressor/class_NullCompressor.php index ed4fba45..1b7a69de 100644 --- a/inc/main/classes/compressor/class_NullCompressor.php +++ b/inc/main/classes/compressor/class_NullCompressor.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/compressor/class_ZlibCompressor.php b/inc/main/classes/compressor/class_ZlibCompressor.php index 22f3b78e..d5ceac39 100644 --- a/inc/main/classes/compressor/class_ZlibCompressor.php +++ b/inc/main/classes/compressor/class_ZlibCompressor.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/console/class_ConsoleTools.php b/inc/main/classes/console/class_ConsoleTools.php index ae90f5aa..0d57e341 100644 --- a/inc/main/classes/console/class_ConsoleTools.php +++ b/inc/main/classes/console/class_ConsoleTools.php @@ -1,4 +1,11 @@ +} diff --git a/inc/main/classes/container/class_BaseContainer.php b/inc/main/classes/container/class_BaseContainer.php index a92c6c28..e862a6f7 100644 --- a/inc/main/classes/container/class_BaseContainer.php +++ b/inc/main/classes/container/class_BaseContainer.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php index 41bdfd0b..080a5a5e 100644 --- a/inc/main/classes/controller/class_BaseController.php +++ b/inc/main/classes/controller/class_BaseController.php @@ -1,4 +1,10 @@ executeFilters('shutdown', $requestInstance, $responseInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/criteria/class_BaseCriteria.php b/inc/main/classes/criteria/class_BaseCriteria.php index 2648e081..bb556c59 100644 --- a/inc/main/classes/criteria/class_BaseCriteria.php +++ b/inc/main/classes/criteria/class_BaseCriteria.php @@ -1,4 +1,10 @@ count('exclude'); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/crypto/class_CryptoHelper.php b/inc/main/classes/crypto/class_CryptoHelper.php index e48b7426..9431ccc7 100644 --- a/inc/main/classes/crypto/class_CryptoHelper.php +++ b/inc/main/classes/crypto/class_CryptoHelper.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/database/class_BaseDatabaseBackend.php b/inc/main/classes/database/class_BaseDatabaseBackend.php index 40190f92..0f3887a6 100644 --- a/inc/main/classes/database/class_BaseDatabaseBackend.php +++ b/inc/main/classes/database/class_BaseDatabaseBackend.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/database/class_BaseDatabaseResult.php b/inc/main/classes/database/class_BaseDatabaseResult.php index 4d7c829f..cba50e4b 100644 --- a/inc/main/classes/database/class_BaseDatabaseResult.php +++ b/inc/main/classes/database/class_BaseDatabaseResult.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/database/class_BaseDatabaseWrapper.php b/inc/main/classes/database/class_BaseDatabaseWrapper.php index 56a802e8..9c3a3615 100644 --- a/inc/main/classes/database/class_BaseDatabaseWrapper.php +++ b/inc/main/classes/database/class_BaseDatabaseWrapper.php @@ -1,4 +1,10 @@ debugOutput('WRAPPER[' . $this->__toString() . ']: data[]=' . gettype($data)); return $data; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/decorator/class_BaseDecorator.php b/inc/main/classes/decorator/class_BaseDecorator.php index d021e739..a57e154f 100644 --- a/inc/main/classes/decorator/class_BaseDecorator.php +++ b/inc/main/classes/decorator/class_BaseDecorator.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/discovery/class_BaseDiscovery.php b/inc/main/classes/discovery/class_BaseDiscovery.php index 2869c297..27896ea5 100644 --- a/inc/main/classes/discovery/class_BaseDiscovery.php +++ b/inc/main/classes/discovery/class_BaseDiscovery.php @@ -1,4 +1,10 @@ actionName; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/factories/class_BaseFactory.php b/inc/main/classes/factories/class_BaseFactory.php index b8a64d0a..7a96750b 100644 --- a/inc/main/classes/factories/class_BaseFactory.php +++ b/inc/main/classes/factories/class_BaseFactory.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/factories/logger/class_LoggerFactory.php b/inc/main/classes/factories/logger/class_LoggerFactory.php index 379546dc..6528ed54 100644 --- a/inc/main/classes/factories/logger/class_LoggerFactory.php +++ b/inc/main/classes/factories/logger/class_LoggerFactory.php @@ -2,7 +2,7 @@ // Own namespace namespace CoreFramework\Logging; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; /** diff --git a/inc/main/classes/factories/objects/class_ObjectFactory.php b/inc/main/classes/factories/objects/class_ObjectFactory.php index 54308d66..84dd0fe1 100644 --- a/inc/main/classes/factories/objects/class_ObjectFactory.php +++ b/inc/main/classes/factories/objects/class_ObjectFactory.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/feature/class_FrameworkFeature.php b/inc/main/classes/feature/class_FrameworkFeature.php index 32a326bb..616b4c3c 100644 --- a/inc/main/classes/feature/class_FrameworkFeature.php +++ b/inc/main/classes/feature/class_FrameworkFeature.php @@ -1,4 +1,11 @@ +} diff --git a/inc/main/classes/file_directories/class_BaseAbstractFile.php b/inc/main/classes/file_directories/class_BaseAbstractFile.php index 0e4ec75c..66cb0193 100644 --- a/inc/main/classes/file_directories/class_BaseAbstractFile.php +++ b/inc/main/classes/file_directories/class_BaseAbstractFile.php @@ -1,4 +1,10 @@ getPointerInstance()->isEndOfFileReached(); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/file_directories/class_BaseFileIo.php b/inc/main/classes/file_directories/class_BaseFileIo.php index 1e8579cf..870b7d90 100644 --- a/inc/main/classes/file_directories/class_BaseFileIo.php +++ b/inc/main/classes/file_directories/class_BaseFileIo.php @@ -1,4 +1,10 @@ debugOutput(sprintf('[%s:%d:] size=%s - EXIT!', __METHOD__, __LINE__, $size)); return $size; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php index 389500be..6f56e967 100644 --- a/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php +++ b/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php @@ -1,4 +1,10 @@ pathName; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php index a09f3eff..d34b1f24 100644 --- a/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php +++ b/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php index f9cd839a..879f60fe 100644 --- a/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php +++ b/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php b/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php index 9f631776..056fa30f 100644 --- a/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php +++ b/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php index 35162ee9..a9f6d0f9 100644 --- a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php +++ b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php @@ -1,4 +1,10 @@ partialStub(); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/filesystem/class_BaseFilesystem.php b/inc/main/classes/filesystem/class_BaseFilesystem.php index 5ad10b8c..b92b639a 100644 --- a/inc/main/classes/filesystem/class_BaseFilesystem.php +++ b/inc/main/classes/filesystem/class_BaseFilesystem.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/filter/class_BaseFilter.php b/inc/main/classes/filter/class_BaseFilter.php index b5013d8a..3dcca80f 100644 --- a/inc/main/classes/filter/class_BaseFilter.php +++ b/inc/main/classes/filter/class_BaseFilter.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/filter/class_BaseFilterDecorator.php b/inc/main/classes/filter/class_BaseFilterDecorator.php index ac6b36b9..68f50d0b 100644 --- a/inc/main/classes/filter/class_BaseFilterDecorator.php +++ b/inc/main/classes/filter/class_BaseFilterDecorator.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/filter/class_FilterChain.php b/inc/main/classes/filter/class_FilterChain.php index 24e19bb2..63bc8906 100644 --- a/inc/main/classes/filter/class_FilterChain.php +++ b/inc/main/classes/filter/class_FilterChain.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/handler/class_BaseHandler.php b/inc/main/classes/handler/class_BaseHandler.php index aa708c3e..e0a0d006 100644 --- a/inc/main/classes/handler/class_BaseHandler.php +++ b/inc/main/classes/handler/class_BaseHandler.php @@ -1,4 +1,10 @@ addCriteria(NodeListDatabaseWrapper::DB_COLUMN_MESSAGE_TYPE , $messageData[NetworkPackage::MESSAGE_ARRAY_TYPE]); */ } -} -// [EOF] -?> +} diff --git a/inc/main/classes/helper/captcha/class_BaseCaptcha.php b/inc/main/classes/helper/captcha/class_BaseCaptcha.php index f7035490..8293b9b2 100644 --- a/inc/main/classes/helper/captcha/class_BaseCaptcha.php +++ b/inc/main/classes/helper/captcha/class_BaseCaptcha.php @@ -2,7 +2,7 @@ // Own namespace namespace CoreFramework\Captcha; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; /** diff --git a/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php index a380b310..513ae522 100644 --- a/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php +++ b/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php @@ -2,7 +2,7 @@ // Own namespace namespace CoreFramework\Captcha; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; /** diff --git a/inc/main/classes/helper/class_BaseHelper.php b/inc/main/classes/helper/class_BaseHelper.php index 253a6362..af3222b0 100644 --- a/inc/main/classes/helper/class_BaseHelper.php +++ b/inc/main/classes/helper/class_BaseHelper.php @@ -2,8 +2,9 @@ // Own namespace namespace CoreFramework\Helper; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Object\BaseFrameworkSystem; /** * A generic helper class with generic methods diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php index d5dffec9..ef5c22ab 100644 --- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php +++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php @@ -1,4 +1,10 @@ diff --git a/inc/main/classes/images/extended/class_PngImage.php b/inc/main/classes/images/extended/class_PngImage.php index 54484ed8..6a6f1d29 100644 --- a/inc/main/classes/images/extended/class_PngImage.php +++ b/inc/main/classes/images/extended/class_PngImage.php @@ -1,4 +1,10 @@ getImageResource(), $cacheFile, 9, PNG_ALL_FILTERS); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/index/class_BaseIndex.php b/inc/main/classes/index/class_BaseIndex.php index 5b2c4c47..c6be8290 100644 --- a/inc/main/classes/index/class_BaseIndex.php +++ b/inc/main/classes/index/class_BaseIndex.php @@ -1,4 +1,10 @@ debugOutput('[' . __METHOD__ . ':' . __LINE__ . '] groupId=' . $groupId . ',hash=' . $hash . ',encoded()=' . strlen($encoded)); throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/iterator/class_BaseIterator.php b/inc/main/classes/iterator/class_BaseIterator.php index edc49866..a51da231 100644 --- a/inc/main/classes/iterator/class_BaseIterator.php +++ b/inc/main/classes/iterator/class_BaseIterator.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/language/class_LanguageSystem.php b/inc/main/classes/language/class_LanguageSystem.php index c2cbe482..7d2ac750 100644 --- a/inc/main/classes/language/class_LanguageSystem.php +++ b/inc/main/classes/language/class_LanguageSystem.php @@ -3,6 +3,8 @@ namespace CoreFramework\Localization; // Import framework stuff +use CoreFramework\Configuration\FrameworkConfiguration; +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; /** @@ -218,7 +220,5 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, // Return the text return $messageText; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/listener/class_BaseListener.php b/inc/main/classes/listener/class_BaseListener.php index f94dae90..28f5fd64 100644 --- a/inc/main/classes/listener/class_BaseListener.php +++ b/inc/main/classes/listener/class_BaseListener.php @@ -1,4 +1,10 @@ getIteratorInstance()->next(); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/lists/class_BaseList.php b/inc/main/classes/lists/class_BaseList.php index 2eb7809d..e0bba6ba 100644 --- a/inc/main/classes/lists/class_BaseList.php +++ b/inc/main/classes/lists/class_BaseList.php @@ -2,8 +2,9 @@ // Own namespace namespace CoreFramework\Lists; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Object\BaseFrameworkSystem; /** * A general list class diff --git a/inc/main/classes/mailer/class_BaseMailer.php b/inc/main/classes/mailer/class_BaseMailer.php index d4472f7b..b137e5ff 100644 --- a/inc/main/classes/mailer/class_BaseMailer.php +++ b/inc/main/classes/mailer/class_BaseMailer.php @@ -2,7 +2,8 @@ // Own namespace namespace CoreFramework\Mailer; -// Load framework stuff +// Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Generic\FrameworkInterface; /** diff --git a/inc/main/classes/menu/class_BaseMenu.php b/inc/main/classes/menu/class_BaseMenu.php index 7bb97e16..7fa4cef4 100644 --- a/inc/main/classes/menu/class_BaseMenu.php +++ b/inc/main/classes/menu/class_BaseMenu.php @@ -1,4 +1,10 @@ assignVariable('menu', $this->getTemplateInstance()->getMenuContent()); //* DEBUG */ $templateInstance->debugInstance(); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/output/class_BaseOutput.php b/inc/main/classes/output/class_BaseOutput.php index 0ef79b56..61067790 100644 --- a/inc/main/classes/output/class_BaseOutput.php +++ b/inc/main/classes/output/class_BaseOutput.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/output/console/class_ConsoleOutput.php b/inc/main/classes/output/console/class_ConsoleOutput.php index 6b153891..ddec2cc0 100644 --- a/inc/main/classes/output/console/class_ConsoleOutput.php +++ b/inc/main/classes/output/console/class_ConsoleOutput.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php index dd625e45..a1c79f62 100644 --- a/inc/main/classes/points/class_UserPoints.php +++ b/inc/main/classes/points/class_UserPoints.php @@ -1,4 +1,10 @@ addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS, $this->getAmount()); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/reader/class_ConsoleNewsReader.php b/inc/main/classes/reader/class_ConsoleNewsReader.php index e78a7eb4..9de20b50 100644 --- a/inc/main/classes/reader/class_ConsoleNewsReader.php +++ b/inc/main/classes/reader/class_ConsoleNewsReader.php @@ -3,6 +3,7 @@ namespace CoreFramework\Reader\News; // Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; /** @@ -83,7 +84,5 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg // Save that resultInstance in this class $this->setResultInstance($resultInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/reader/class_DefaultNewsReader.php b/inc/main/classes/reader/class_DefaultNewsReader.php index 460f13a4..988a04f2 100644 --- a/inc/main/classes/reader/class_DefaultNewsReader.php +++ b/inc/main/classes/reader/class_DefaultNewsReader.php @@ -3,6 +3,7 @@ namespace CoreFramework\Reader\News; // Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; /** @@ -83,7 +84,5 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg // Save that resultInstance in this class $this->setResultInstance($resultInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/registration/class_BaseRegistration.php b/inc/main/classes/registration/class_BaseRegistration.php index ceb80835..783d87a5 100644 --- a/inc/main/classes/registration/class_BaseRegistration.php +++ b/inc/main/classes/registration/class_BaseRegistration.php @@ -1,4 +1,10 @@ postRegistrationFilter->processFilters($this->getRequestInstance(), $this->getResponseInstance()); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/registry/class_BaseRegistry.php b/inc/main/classes/registry/class_BaseRegistry.php index c94df61a..a2e22c66 100644 --- a/inc/main/classes/registry/class_BaseRegistry.php +++ b/inc/main/classes/registry/class_BaseRegistry.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Registry; +// Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; + /** * A general Registry * @@ -221,7 +224,5 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable { // Return it return $registryKey; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/request/class_BaseRequest.php b/inc/main/classes/request/class_BaseRequest.php index 6eb057c6..49130652 100644 --- a/inc/main/classes/request/class_BaseRequest.php +++ b/inc/main/classes/request/class_BaseRequest.php @@ -1,4 +1,10 @@ requestIsValid; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/resolver/class_BaseResolver.php b/inc/main/classes/resolver/class_BaseResolver.php index 4c450502..395cc863 100644 --- a/inc/main/classes/resolver/class_BaseResolver.php +++ b/inc/main/classes/resolver/class_BaseResolver.php @@ -2,8 +2,9 @@ // Own namespace namespace CoreFramework\Resolver; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Object\BaseFrameworkSystem; /** * A generic resolver class diff --git a/inc/main/classes/response/class_BaseResponse.php b/inc/main/classes/response/class_BaseResponse.php index acfb1fec..05fde732 100644 --- a/inc/main/classes/response/class_BaseResponse.php +++ b/inc/main/classes/response/class_BaseResponse.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/rng/class_RandomNumberGenerator.php b/inc/main/classes/rng/class_RandomNumberGenerator.php index 7eda8f00..515d7881 100644 --- a/inc/main/classes/rng/class_RandomNumberGenerator.php +++ b/inc/main/classes/rng/class_RandomNumberGenerator.php @@ -2,7 +2,8 @@ // Own namespace namespace CoreFramework\Crypto\RandomNumber; -// Load framework stuff +// Import framework stuff +use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Generic\FrameworkInterface; /** diff --git a/inc/main/classes/scrypt/class_Scrypt.php b/inc/main/classes/scrypt/class_Scrypt.php index 6fabd03f..6adee7a7 100644 --- a/inc/main/classes/scrypt/class_Scrypt.php +++ b/inc/main/classes/scrypt/class_Scrypt.php @@ -1,4 +1,9 @@ shiftGenericArrayElement('stacks', $stackerName, 'entries'); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/states/class_BaseState.php b/inc/main/classes/states/class_BaseState.php index 5fbce2ce..c11ce464 100644 --- a/inc/main/classes/states/class_BaseState.php +++ b/inc/main/classes/states/class_BaseState.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/streams/class_BaseStream.php b/inc/main/classes/streams/class_BaseStream.php index 4c84c61e..2e8e379b 100644 --- a/inc/main/classes/streams/class_BaseStream.php +++ b/inc/main/classes/streams/class_BaseStream.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/tasks/class_BaseTask.php b/inc/main/classes/tasks/class_BaseTask.php index 7b35b8bd..9ddf7fc9 100644 --- a/inc/main/classes/tasks/class_BaseTask.php +++ b/inc/main/classes/tasks/class_BaseTask.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/template/class_BaseTemplateEngine.php b/inc/main/classes/template/class_BaseTemplateEngine.php index 25d2d2c5..657efbd0 100644 --- a/inc/main/classes/template/class_BaseTemplateEngine.php +++ b/inc/main/classes/template/class_BaseTemplateEngine.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/user/class_BaseUser.php b/inc/main/classes/user/class_BaseUser.php index 855eab62..65af3b2f 100644 --- a/inc/main/classes/user/class_BaseUser.php +++ b/inc/main/classes/user/class_BaseUser.php @@ -1,6 +1,12 @@ * @version 0.0.0 @@ -357,7 +363,5 @@ class BaseUser extends BaseFrameworkSystem implements Updateable { // Return it return $isGuest; } -} -// [EOF] -?> +} diff --git a/inc/main/classes/visitor/class_BaseVisitor.php b/inc/main/classes/visitor/class_BaseVisitor.php index 305e9230..d6c73a45 100644 --- a/inc/main/classes/visitor/class_BaseVisitor.php +++ b/inc/main/classes/visitor/class_BaseVisitor.php @@ -1,4 +1,10 @@ visitorMode; } -} -// [EOF] -?> +} diff --git a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php index b601ef77..367d2d87 100644 --- a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php +++ b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php @@ -1,4 +1,7 @@ +} diff --git a/inc/main/middleware/io/class_FileIoHandler.php b/inc/main/middleware/io/class_FileIoHandler.php index f85d4fd2..4966e75d 100644 --- a/inc/main/middleware/io/class_FileIoHandler.php +++ b/inc/main/middleware/io/class_FileIoHandler.php @@ -2,7 +2,7 @@ // Own namespace namespace CoreFramework\Handler\Filesystem; -// Load framework stuff +// Import framework stuff use CoreFramework\Generic\FrameworkInterface; /** diff --git a/inc/main/third_party/api/primusportal/class_PrimeraApi.php b/inc/main/third_party/api/primusportal/class_PrimeraApi.php index b78bf55d..20288de8 100644 --- a/inc/main/third_party/api/primusportal/class_PrimeraApi.php +++ b/inc/main/third_party/api/primusportal/class_PrimeraApi.php @@ -1,4 +1,10 @@ parseContent( $this->queryApi($postData) ); $this->data = $postReturn; + if ($postReturn['status'] == self::PI_GET_PRIMERA_DONE) { $primera = $postReturn['primera']; } // END - if + return $primera; } -} -// [EOF] -?> +} diff --git a/inc/main/third_party/api/wernisportal/class_WernisApi.php b/inc/main/third_party/api/wernisportal/class_WernisApi.php index 65bf0372..c64fba3e 100644 --- a/inc/main/third_party/api/wernisportal/class_WernisApi.php +++ b/inc/main/third_party/api/wernisportal/class_WernisApi.php @@ -1,4 +1,10 @@ +} diff --git a/inc/selector.php b/inc/selector.php index 01377960..19095dc1 100644 --- a/inc/selector.php +++ b/inc/selector.php @@ -1,4 +1,8 @@ diff --git a/index.php b/index.php index b54c7661..34e000d4 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,10 @@