From d2ada1dfeab84d86d194efc894c7a287eebe124e Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 16 Feb 2017 21:29:21 +0100 Subject: [PATCH] Continued: - added namespaces - added import for Register and Registerable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/main/classes/class_BaseFrameworkSystem.php | 1 + .../controller/html/class_HtmlRegisterController.php | 4 +--- .../database/frontend/class_NewsDatabaseWrapper.php | 10 +++++++--- .../database/frontend/class_UserDatabaseWrapper.php | 4 +--- .../frontend/class_UserPointsDatabaseWrapper.php | 4 +--- inc/main/classes/filter/class_FilterChain.php | 1 + inc/main/classes/fuse/class_FrameworkFuseWrapper.php | 10 +++++++--- .../classes/helper/html/forms/class_HtmlFormHelper.php | 4 +--- .../classes/index/file_stack/class_FileStackIndex.php | 4 +--- .../output/debug/console/class_DebugConsoleOutput.php | 4 +--- inc/main/classes/registry/generic/class_Registry.php | 1 + inc/main/classes/registry/sub/class_SubRegistry.php | 1 + .../classes/stacker/file/fifo/class_FiFoFileStack.php | 4 +--- .../wrapper/class_ManageableAccountWrapper.php | 4 +--- .../registry/socket/class_RegisterableSocket.php | 10 +++++++--- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php index 16dc8d89..03809023 100644 --- a/inc/main/classes/class_BaseFrameworkSystem.php +++ b/inc/main/classes/class_BaseFrameworkSystem.php @@ -7,6 +7,7 @@ use CoreFramework\Configuration\FrameworkConfiguration; use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Loader\ClassLoader; use CoreFramework\Manager\ManageableApplication; +use CoreFramework\Registry\Register; use CoreFramework\Template\CompileableTemplate; // Import SPL stuff diff --git a/inc/main/classes/controller/html/class_HtmlRegisterController.php b/inc/main/classes/controller/html/class_HtmlRegisterController.php index 00bf0bf3..1ed3ca6a 100644 --- a/inc/main/classes/controller/html/class_HtmlRegisterController.php +++ b/inc/main/classes/controller/html/class_HtmlRegisterController.php @@ -61,7 +61,5 @@ class HtmlRegisterController extends BaseController implements Controller { // Generic pre-post command execution $this->executeGenericPrePostCommand($requestInstance, $responseInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php index b4165979..de25ceac 100644 --- a/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php +++ b/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php b/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php index 333ec1a7..d72c4766 100644 --- a/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php +++ b/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php @@ -134,7 +134,5 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou // "Update" this request with the database $this->getDatabaseInstance()->queryUpdateDataSet($dataSetInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php index efa3b2b3..9add3702 100644 --- a/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php +++ b/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php @@ -111,7 +111,5 @@ class UserPointsDatabaseWrapper extends BaseDatabaseWrapper implements BookableP // "Update" this request with the database $this->getDatabaseInstance()->queryUpdateDataSet($dataSetInstance); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/filter/class_FilterChain.php b/inc/main/classes/filter/class_FilterChain.php index 63bc8906..2ff8ad3c 100644 --- a/inc/main/classes/filter/class_FilterChain.php +++ b/inc/main/classes/filter/class_FilterChain.php @@ -3,6 +3,7 @@ namespace CoreFramework\Filter\Chain; // Import framework stuff +use use CoreFramework\Registry\Registerable; use CoreFramework\Object\BaseFrameworkSystem; /** diff --git a/inc/main/classes/fuse/class_FrameworkFuseWrapper.php b/inc/main/classes/fuse/class_FrameworkFuseWrapper.php index 8128e0a1..b42b1515 100644 --- a/inc/main/classes/fuse/class_FrameworkFuseWrapper.php +++ b/inc/main/classes/fuse/class_FrameworkFuseWrapper.php @@ -1,4 +1,10 @@ +} diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php index 0488acf2..accf97d3 100644 --- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php +++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php @@ -938,7 +938,5 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate { //* DEBUG: */ print __METHOD__.": form=".$this->getFormName().", size=".strlen($this->renderContent())."
\n"; $this->getTemplateInstance()->assignVariable($this->getFormName(), $this->renderContent()); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/index/file_stack/class_FileStackIndex.php b/inc/main/classes/index/file_stack/class_FileStackIndex.php index bc1e5bc4..5076d808 100644 --- a/inc/main/classes/index/file_stack/class_FileStackIndex.php +++ b/inc/main/classes/index/file_stack/class_FileStackIndex.php @@ -106,7 +106,5 @@ class FileStackIndex extends BaseIndex implements IndexableStack, Registerable { public function searchNextGap ($length) { $this->partialStub('length=' . $length); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/output/debug/console/class_DebugConsoleOutput.php b/inc/main/classes/output/debug/console/class_DebugConsoleOutput.php index 8ab0887b..ae7cf072 100644 --- a/inc/main/classes/output/debug/console/class_DebugConsoleOutput.php +++ b/inc/main/classes/output/debug/console/class_DebugConsoleOutput.php @@ -136,7 +136,5 @@ class DebugConsoleOutput extends BaseDebugOutput implements Debugger, OutputStre public function size () { throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); } -} -// [EOF] -?> +} diff --git a/inc/main/classes/registry/generic/class_Registry.php b/inc/main/classes/registry/generic/class_Registry.php index b7b066d0..116a5216 100644 --- a/inc/main/classes/registry/generic/class_Registry.php +++ b/inc/main/classes/registry/generic/class_Registry.php @@ -4,6 +4,7 @@ namespace CoreFramework\Registry\Generic; // Import framework stuff use CoreFramework\Registry\BaseRegistry; +use CoreFramework\Registry\Register; /** * A registry for several data types and objects. Objects should be added by diff --git a/inc/main/classes/registry/sub/class_SubRegistry.php b/inc/main/classes/registry/sub/class_SubRegistry.php index f6449ac9..2cf76b35 100644 --- a/inc/main/classes/registry/sub/class_SubRegistry.php +++ b/inc/main/classes/registry/sub/class_SubRegistry.php @@ -4,6 +4,7 @@ namespace CoreFramework\Registry\Sub; // Import framework stuff use CoreFramework\Registry\BaseRegistry; +use CoreFramework\Registry\Register; /** * A Sub registry diff --git a/inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php index f9a03e5d..a4630c6a 100644 --- a/inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php +++ b/inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php @@ -120,7 +120,5 @@ class FiFoFileStack extends BaseFileStack implements StackableFile, Calculatable // Call the iterator instance return $this->getIteratorInstance()->size(); } -} -// [EOF] -?> +} diff --git a/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php index cc5d5c32..c41c9bd3 100644 --- a/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php +++ b/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php @@ -37,7 +37,5 @@ interface ManageableAccountWrapper extends DatabaseWrapper { * @return void */ function doUpdateByResult (UpdateableResult $resultInstance); -} -// [EOF] -?> +} diff --git a/inc/main/interfaces/registry/socket/class_RegisterableSocket.php b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php index a77b6d81..227fd839 100644 --- a/inc/main/interfaces/registry/socket/class_RegisterableSocket.php +++ b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php @@ -1,4 +1,10 @@ +} -- 2.39.5