From f33fd598a1a77034720172ea80353e4d4c0f9662 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 28 Feb 2011 23:29:11 +0000 Subject: [PATCH] 'public static final' is the right thing, some variables renamed to make clear what they are for --- application/hub/class_ApplicationHelper.php | 2 +- .../commands/console/class_HubConsoleMainCommand.php | 2 +- .../class_NetworkPackageCompressorDecorator.php | 2 +- .../query/local/class_LocalQueryConnector.php | 2 +- .../queues/local/class_LocalQueueConnector.php | 2 +- .../console/class_HubConsoleDefaultNewsController.php | 2 +- .../wrapper/class_NodeInformationDatabaseWrapper.php | 2 +- .../wrapper/class_NodeListDatabaseWrapper.php | 2 +- .../wrapper/class_PeerStateLookupDatabaseWrapper.php | 2 +- .../package/class_PackageRecipientDiscovery.php | 2 +- .../discovery/socket/class_PackageSocketDiscovery.php | 2 +- .../factories/states/peer/class_PeerStateFactory.php | 2 +- .../class_HubActivationSelfAnnouncementFilter.php | 2 +- .../class_HubBootstrapExtraBootstrappingFilter.php | 2 +- .../class_HubBootstrapGenerateHubIdFilter.php | 2 +- .../class_HubBootstrapGenerateSessionIdFilter.php | 2 +- .../bootstrap/class_HubBootstrapInitQueuesFilter.php | 2 +- .../class_HubBootstrapListenerPoolFilter.php | 2 +- .../class_HubBootstrapRestoreNodeListFilter.php | 2 +- .../console/class_ConsoleWelcomeTeaserFilter.php | 2 +- .../filter/node/class_NodeInitializationFilter.php | 2 +- .../filter/node/class_NodePhpRequirementsFilter.php | 2 +- .../shutdown/class_HubShutdownDeinitQueuesFilter.php | 2 +- .../shutdown/class_HubShutdownFlushNodeListFilter.php | 2 +- .../filter/shutdown/class_HubShutdownNodeFilter.php | 2 +- .../shutdown/class_HubShutdownTaskHandlerFilter.php | 2 +- .../task/class_TaskHandlerInitializerFilter.php | 2 +- .../network/tcp/class_TcpNetworkPackageHandler.php | 2 +- .../network/udp/class_UdpNetworkPackageHandler.php | 2 +- .../hub/main/handler/tasks/class_TaskHandler.php | 10 +++++----- .../hub/announcement/class_HubDescriptorHelper.php | 2 +- .../hub/connection/class_HubSelfConnectHelper.php | 2 +- .../hub/main/iterator/hub/class_HubPingIterator.php | 2 +- .../iterator/network/class_NetworkListenIterator.php | 2 +- .../hub/main/iterator/pool/class_DefaultIterator.php | 2 +- .../pool/handler/class_HandlerPoolIterator.php | 2 +- .../pool/shutdown/class_ShutdownPoolIterator.php | 2 +- .../iterator/pool/tasks/class_TaskPoolIterator.php | 2 +- .../hub/main/listener/tcp/class_TcpListener.php | 11 ++++++----- .../tcp/decorators/class_HubTcpListenerDecorator.php | 2 +- .../tcp/decorators/class_PeerTcpListenerDecorator.php | 6 +++--- .../hub/main/listener/udp/class_UdpListener.php | 2 +- .../udp/decorators/class_HubUdpListenerDecorator.php | 6 +++--- .../udp/decorators/class_PeerUdpListenerDecorator.php | 6 +++--- .../hub/main/lists/groups/class_ListGroupList.php | 2 +- application/hub/main/lists/hub/class_HubList.php | 2 +- .../hub/main/lists/pool/class_PoolEntriesList.php | 2 +- .../main/lists/query/local/class_LocalQueryList.php | 2 +- .../hub/main/lists/recipient/class_RecipientList.php | 2 +- application/hub/main/lists/tasks/class_TaskList.php | 2 +- .../main/lookup/peer/class_PeerStateLookupTable.php | 2 +- application/hub/main/nodes/boot/class_HubBootNode.php | 2 +- application/hub/main/nodes/list/class_HubListNode.php | 2 +- .../hub/main/nodes/master/class_HubMasterNode.php | 2 +- .../hub/main/nodes/regular/class_HubRegularNode.php | 2 +- application/hub/main/package/class_NetworkPackage.php | 2 +- .../package/fragmenter/class_PackageFragmenter.php | 2 +- .../main/pools/listener/class_DefaultListenerPool.php | 2 +- .../hub/main/pools/peer/class_DefaultPeerPool.php | 2 +- .../hub/main/queries/local/class_LocalQuery.php | 2 +- .../hub/main/queues/peer/class_LocalPeerQueue.php | 2 +- .../registry/objects/class_ObjectTypeRegistry.php | 2 +- .../hub/main/registry/socket/class_SocketRegistry.php | 2 +- .../console/class_HubConsoleCommandResolver.php | 2 +- .../console/class_HubConsoleControllerResolver.php | 2 +- .../state/network/class_NetworkStateResolver.php | 2 +- .../main/states/node/active/class_NodeActiveState.php | 2 +- .../node/announced/class_NodeAnnouncedState.php | 2 +- .../hub/main/states/node/init/class_NodeInitState.php | 2 +- .../main/states/node/virgin/class_NodeVirginState.php | 2 +- .../states/peer/new/class_NewConnectionPeerState.php | 2 +- .../hub/main/tags/package/class_PackageTags.php | 2 +- .../announcement/class_HubSelfAnnouncementTask.php | 2 +- .../hub/main/tasks/hub/class_HubSelfConnectTask.php | 2 +- .../hub/main/tasks/hub/ping/class_HubPingTask.php | 2 +- .../tasks/hub/update/class_HubUpdateCheckTask.php | 2 +- .../hub/main/tasks/idle/class_IdleLoopTask.php | 2 +- .../tasks/network/class_NetworkPackageWriterTask.php | 2 +- .../announcement/class_AnnouncementTemplateEngine.php | 2 +- .../connect/class_SelfConnectTemplateEngine.php | 2 +- .../objects/class_ObjectRegistryTemplateEngine.php | 2 +- application/hub/main/tools/class_HubTools.php | 2 +- .../shutdown/class_ShutdownListenerPoolVisitor.php | 2 +- .../visitor/socket/class_ShutdownSocketVisitor.php | 2 +- .../main/visitor/tasks/class_ActiveTaskVisitor.php | 4 ++-- .../main/visitor/tasks/class_ShutdownTaskVisitor.php | 2 +- 86 files changed, 102 insertions(+), 101 deletions(-) diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index 523c39cfd..c2ee62694 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -74,7 +74,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica * * @return $thisInstance An instance of this class */ - public final static function getInstance () { + public static final function getInstance () { // Is the instance there? if (is_null(self::$thisInstance)) { self::$thisInstance = new ApplicationHelper(); diff --git a/application/hub/main/commands/console/class_HubConsoleMainCommand.php b/application/hub/main/commands/console/class_HubConsoleMainCommand.php index 9b4ff4f70..f0c19d777 100644 --- a/application/hub/main/commands/console/class_HubConsoleMainCommand.php +++ b/application/hub/main/commands/console/class_HubConsoleMainCommand.php @@ -38,7 +38,7 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createHubConsoleMainCommand (CommandResolver $resolverInstance) { + public static final function createHubConsoleMainCommand (CommandResolver $resolverInstance) { // Get new instance $commandInstance = new HubConsoleMainCommand(); diff --git a/application/hub/main/compressor/decorator/class_NetworkPackageCompressorDecorator.php b/application/hub/main/compressor/decorator/class_NetworkPackageCompressorDecorator.php index 3478272af..6c58ca09b 100644 --- a/application/hub/main/compressor/decorator/class_NetworkPackageCompressorDecorator.php +++ b/application/hub/main/compressor/decorator/class_NetworkPackageCompressorDecorator.php @@ -39,7 +39,7 @@ class NetworkPackageCompressorDecorator extends BaseFrameworkSystem implements C * @return $innerCompressorInstance The inner Compressor class * @return $compressorInstance An instance of a Compressor class */ - public final static function createNetworkPackageCompressorDecorator (Compressor $innerCompressorInstance) { + public static final function createNetworkPackageCompressorDecorator (Compressor $innerCompressorInstance) { // Get new instance $compressorInstance = new NetworkPackageCompressorDecorator(); diff --git a/application/hub/main/connectors/query/local/class_LocalQueryConnector.php b/application/hub/main/connectors/query/local/class_LocalQueryConnector.php index 11577ddb5..e0a003f3d 100644 --- a/application/hub/main/connectors/query/local/class_LocalQueryConnector.php +++ b/application/hub/main/connectors/query/local/class_LocalQueryConnector.php @@ -47,7 +47,7 @@ class LocalQueryConnector extends BaseQueryConnector implements Connectable, Vis * @param $nodeInstance An instance of a node * @return $connectorInstance An instance of this query connector class */ - public final static function createLocalQueryConnector (NodeHelper $nodeInstance) { + public static final function createLocalQueryConnector (NodeHelper $nodeInstance) { // Create the instance $connectorInstance = new LocalQueryConnector(); diff --git a/application/hub/main/connectors/queues/local/class_LocalQueueConnector.php b/application/hub/main/connectors/queues/local/class_LocalQueueConnector.php index c97b4cf6d..8869f6284 100644 --- a/application/hub/main/connectors/queues/local/class_LocalQueueConnector.php +++ b/application/hub/main/connectors/queues/local/class_LocalQueueConnector.php @@ -39,7 +39,7 @@ class LocalQueueConnector extends BaseQueueConnector implements Connectable, Que * @param $nodeInstance An instance of a hub node * @return $connectorInstance An instance of this queue connector class */ - public final static function createLocalQueueConnector (NodeHelper $nodeInstance) { + public static final function createLocalQueueConnector (NodeHelper $nodeInstance) { // Create the instance $connectorInstance = new LocalQueueConnector(); diff --git a/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php b/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php index 55bb98d56..65656ce7e 100644 --- a/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php +++ b/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php @@ -43,7 +43,7 @@ class HubConsoleDefaultNewsController extends BaseController implements Controll * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public final static function createHubConsoleDefaultNewsController (CommandResolver $resolverInstance) { + public static final function createHubConsoleDefaultNewsController (CommandResolver $resolverInstance) { // Create the instance $controllerInstance = new HubConsoleDefaultNewsController(); diff --git a/application/hub/main/database/wrapper/class_NodeInformationDatabaseWrapper.php b/application/hub/main/database/wrapper/class_NodeInformationDatabaseWrapper.php index 89c57e29a..31e85340b 100644 --- a/application/hub/main/database/wrapper/class_NodeInformationDatabaseWrapper.php +++ b/application/hub/main/database/wrapper/class_NodeInformationDatabaseWrapper.php @@ -46,7 +46,7 @@ class NodeInformationDatabaseWrapper extends BaseDatabaseWrapper { * * @return $wrapperInstance An instance of the created wrapper class */ - public final static function createNodeInformationDatabaseWrapper () { + public static final function createNodeInformationDatabaseWrapper () { // Get a new instance $wrapperInstance = new NodeInformationDatabaseWrapper(); diff --git a/application/hub/main/database/wrapper/class_NodeListDatabaseWrapper.php b/application/hub/main/database/wrapper/class_NodeListDatabaseWrapper.php index cf29bb8d5..3e283ac41 100644 --- a/application/hub/main/database/wrapper/class_NodeListDatabaseWrapper.php +++ b/application/hub/main/database/wrapper/class_NodeListDatabaseWrapper.php @@ -44,7 +44,7 @@ class NodeListDatabaseWrapper extends BaseDatabaseWrapper implements Registerabl * * @return $wrapperInstance An instance of the created wrapper class */ - public final static function createNodeListDatabaseWrapper () { + public static final function createNodeListDatabaseWrapper () { // Get a new instance $wrapperInstance = new NodeListDatabaseWrapper(); diff --git a/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php b/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php index 03fe0217e..cf27c7844 100644 --- a/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php +++ b/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php @@ -48,7 +48,7 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper { * * @return $wrapperInstance An instance of the created wrapper class */ - public final static function createPeerStateLookupDatabaseWrapper () { + public static final function createPeerStateLookupDatabaseWrapper () { // Get a new instance $wrapperInstance = new PeerStateLookupDatabaseWrapper(); diff --git a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php index 48ca7ea73..45e17fa18 100644 --- a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php +++ b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php @@ -37,7 +37,7 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable * * @return $discoveryInstance An instance of this discovery class */ - public final static function createPackageRecipientDiscovery () { + public static final function createPackageRecipientDiscovery () { // Get an instance of this class $discoveryInstance = new PackageRecipientDiscovery(); diff --git a/application/hub/main/discovery/socket/class_PackageSocketDiscovery.php b/application/hub/main/discovery/socket/class_PackageSocketDiscovery.php index fb5b2b2a7..e1afb6925 100644 --- a/application/hub/main/discovery/socket/class_PackageSocketDiscovery.php +++ b/application/hub/main/discovery/socket/class_PackageSocketDiscovery.php @@ -37,7 +37,7 @@ class PackageSocketDiscovery extends BaseHubDiscovery implements DiscoverableSoc * * @return $discoveryInstance An instance of this discovery class */ - public final static function createPackageSocketDiscovery () { + public static final function createPackageSocketDiscovery () { // Get an instance of this class $discoveryInstance = new PackageSocketDiscovery(); diff --git a/application/hub/main/factories/states/peer/class_PeerStateFactory.php b/application/hub/main/factories/states/peer/class_PeerStateFactory.php index 1256fa6e6..7153d4c42 100644 --- a/application/hub/main/factories/states/peer/class_PeerStateFactory.php +++ b/application/hub/main/factories/states/peer/class_PeerStateFactory.php @@ -82,7 +82,7 @@ class PeerStateFactory extends ObjectFactory { * * @return $tableInstance An instance of a lookup table */ - public final static function getTableInstance () { + public static final function getTableInstance () { // Is the instance null? if (is_null(self::$tableInstance)) { // Get a new one diff --git a/application/hub/main/filter/activation/class_HubActivationSelfAnnouncementFilter.php b/application/hub/main/filter/activation/class_HubActivationSelfAnnouncementFilter.php index 47509105e..0f448ff77 100644 --- a/application/hub/main/filter/activation/class_HubActivationSelfAnnouncementFilter.php +++ b/application/hub/main/filter/activation/class_HubActivationSelfAnnouncementFilter.php @@ -37,7 +37,7 @@ class HubActivationSelfAnnouncementFilter extends BaseFilter implements Filterab * * @return $filterInstance An instance of this filter class */ - public final static function createHubActivationSelfAnnouncementFilter () { + public static final function createHubActivationSelfAnnouncementFilter () { // Get a new instance $filterInstance = new HubActivationSelfAnnouncementFilter(); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapExtraBootstrappingFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapExtraBootstrappingFilter.php index d4a4d4eea..d95c6b988 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapExtraBootstrappingFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapExtraBootstrappingFilter.php @@ -37,7 +37,7 @@ class HubBootstrapExtraBootstrappingFilter extends BaseFilter implements Filtera * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapExtraBootstrappingFilter () { + public static final function createHubBootstrapExtraBootstrappingFilter () { // Get a new instance $filterInstance = new HubBootstrapExtraBootstrappingFilter(); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php index 82a828c1a..9a3f97170 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php @@ -37,7 +37,7 @@ class HubBootstrapGenerateHubIdFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapGenerateHubIdFilter () { + public static final function createHubBootstrapGenerateHubIdFilter () { // Get a new instance $filterInstance = new HubBootstrapGenerateHubIdFilter(); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php index a37020d90..9bb32ca9e 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php @@ -37,7 +37,7 @@ class HubBootstrapGenerateSessionIdFilter extends BaseFilter implements Filterab * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapGenerateSessionIdFilter () { + public static final function createHubBootstrapGenerateSessionIdFilter () { // Get a new instance $filterInstance = new HubBootstrapGenerateSessionIdFilter(); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapInitQueuesFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapInitQueuesFilter.php index 702b18f5f..9ae46cafa 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapInitQueuesFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapInitQueuesFilter.php @@ -37,7 +37,7 @@ class HubBootstrapInitQueuesFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapInitQueuesFilter () { + public static final function createHubBootstrapInitQueuesFilter () { // Get a new instance $filterInstance = new HubBootstrapInitQueuesFilter(); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapListenerPoolFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapListenerPoolFilter.php index 91b268762..18cff0718 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapListenerPoolFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapListenerPoolFilter.php @@ -37,7 +37,7 @@ class HubBootstrapListenerPoolFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapListenerPoolFilter () { + public static final function createHubBootstrapListenerPoolFilter () { // Get a new instance $filterInstance = new HubBootstrapListenerPoolFilter(); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapRestoreNodeListFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapRestoreNodeListFilter.php index 023238892..9270fdbac 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapRestoreNodeListFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapRestoreNodeListFilter.php @@ -37,7 +37,7 @@ class HubBootstrapRestoreNodeListFilter extends BaseFilter implements Filterable * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapRestoreNodeListFilter () { + public static final function createHubBootstrapRestoreNodeListFilter () { // Get a new instance $filterInstance = new HubBootstrapRestoreNodeListFilter(); diff --git a/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php b/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php index d348d4b7c..34fbfcd80 100644 --- a/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php +++ b/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php @@ -37,7 +37,7 @@ class ConsoleWelcomeTeaserFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createConsoleWelcomeTeaserFilter () { + public static final function createConsoleWelcomeTeaserFilter () { // Get a new instance $filterInstance = new ConsoleWelcomeTeaserFilter(); diff --git a/application/hub/main/filter/node/class_NodeInitializationFilter.php b/application/hub/main/filter/node/class_NodeInitializationFilter.php index 097e693c7..f30c886c9 100644 --- a/application/hub/main/filter/node/class_NodeInitializationFilter.php +++ b/application/hub/main/filter/node/class_NodeInitializationFilter.php @@ -37,7 +37,7 @@ class NodeInitializationFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createNodeInitializationFilter () { + public static final function createNodeInitializationFilter () { // Get a new instance $filterInstance = new NodeInitializationFilter(); diff --git a/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php b/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php index e88e5e377..6afde30b7 100644 --- a/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php +++ b/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php @@ -37,7 +37,7 @@ class NodePhpRequirementsFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createNodePhpRequirementsFilter () { + public static final function createNodePhpRequirementsFilter () { // Get a new instance $filterInstance = new NodePhpRequirementsFilter(); diff --git a/application/hub/main/filter/shutdown/class_HubShutdownDeinitQueuesFilter.php b/application/hub/main/filter/shutdown/class_HubShutdownDeinitQueuesFilter.php index 35129feaa..c86f4ca9f 100644 --- a/application/hub/main/filter/shutdown/class_HubShutdownDeinitQueuesFilter.php +++ b/application/hub/main/filter/shutdown/class_HubShutdownDeinitQueuesFilter.php @@ -37,7 +37,7 @@ class HubShutdownDeinitQueuesFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubShutdownDeinitQueuesFilter () { + public static final function createHubShutdownDeinitQueuesFilter () { // Get a new instance $filterInstance = new HubShutdownDeinitQueuesFilter(); diff --git a/application/hub/main/filter/shutdown/class_HubShutdownFlushNodeListFilter.php b/application/hub/main/filter/shutdown/class_HubShutdownFlushNodeListFilter.php index 22b0d2f99..100e088c7 100644 --- a/application/hub/main/filter/shutdown/class_HubShutdownFlushNodeListFilter.php +++ b/application/hub/main/filter/shutdown/class_HubShutdownFlushNodeListFilter.php @@ -37,7 +37,7 @@ class HubShutdownFlushNodeListFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubShutdownFlushNodeListFilter () { + public static final function createHubShutdownFlushNodeListFilter () { // Get a new instance $filterInstance = new HubShutdownFlushNodeListFilter(); diff --git a/application/hub/main/filter/shutdown/class_HubShutdownNodeFilter.php b/application/hub/main/filter/shutdown/class_HubShutdownNodeFilter.php index 8d3807f32..96d47564d 100644 --- a/application/hub/main/filter/shutdown/class_HubShutdownNodeFilter.php +++ b/application/hub/main/filter/shutdown/class_HubShutdownNodeFilter.php @@ -39,7 +39,7 @@ class HubShutdownNodeFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubShutdownNodeFilter () { + public static final function createHubShutdownNodeFilter () { // Get a new instance $filterInstance = new HubShutdownNodeFilter(); diff --git a/application/hub/main/filter/shutdown/class_HubShutdownTaskHandlerFilter.php b/application/hub/main/filter/shutdown/class_HubShutdownTaskHandlerFilter.php index dd99c7bb1..7bac0c1c2 100644 --- a/application/hub/main/filter/shutdown/class_HubShutdownTaskHandlerFilter.php +++ b/application/hub/main/filter/shutdown/class_HubShutdownTaskHandlerFilter.php @@ -37,7 +37,7 @@ class HubShutdownTaskHandlerFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubShutdownTaskHandlerFilter () { + public static final function createHubShutdownTaskHandlerFilter () { // Get a new instance $filterInstance = new HubShutdownTaskHandlerFilter(); diff --git a/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php b/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php index 3310eca64..6ea240d01 100644 --- a/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php +++ b/application/hub/main/filter/task/class_TaskHandlerInitializerFilter.php @@ -37,7 +37,7 @@ class TaskHandlerInitializerFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createTaskHandlerInitializerFilter () { + public static final function createTaskHandlerInitializerFilter () { // Get a new instance $filterInstance = new TaskHandlerInitializerFilter(); diff --git a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php index 1bc410064..bab7eefdd 100644 --- a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php +++ b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php @@ -40,7 +40,7 @@ class TcpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw * * @return $handlerInstance An instance of a Networkable class */ - public final static function createTcpNetworkPackageHandler () { + public static final function createTcpNetworkPackageHandler () { // Get new instance $handlerInstance = new TcpNetworkPackageHandler(); diff --git a/application/hub/main/handler/network/udp/class_UdpNetworkPackageHandler.php b/application/hub/main/handler/network/udp/class_UdpNetworkPackageHandler.php index 477414a09..058dfbd8f 100644 --- a/application/hub/main/handler/network/udp/class_UdpNetworkPackageHandler.php +++ b/application/hub/main/handler/network/udp/class_UdpNetworkPackageHandler.php @@ -40,7 +40,7 @@ class UdpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw * * @return $handlerInstance An instance of a Networkable class */ - public final static function createUdpNetworkPackageHandler () { + public static final function createUdpNetworkPackageHandler () { // Get new instance $handlerInstance = new UdpNetworkPackageHandler(); diff --git a/application/hub/main/handler/tasks/class_TaskHandler.php b/application/hub/main/handler/tasks/class_TaskHandler.php index 044dc3c91..5d3e3bceb 100644 --- a/application/hub/main/handler/tasks/class_TaskHandler.php +++ b/application/hub/main/handler/tasks/class_TaskHandler.php @@ -57,7 +57,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * * @return $handlerInstance An instance of a HandleableTask class */ - public final static function createTaskHandler () { + public static final function createTaskHandler () { // Get new instance $handlerInstance = new TaskHandler(); @@ -277,16 +277,16 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { // Shutdown all tasks in once go while ($this->getIteratorInstance()->valid()) { // Get current entry - $current = $this->getIteratorInstance()->current(); + $currentTask = $this->getIteratorInstance()->current(); // Output debug message - $this->debugOutput('TASK-HANDLER: Shutting down task ' . $current['id'] . ' (taskInstance=' . $current['task_instance']->__toString() . ') ...'); + $this->debugOutput('TASK-HANDLER: Shutting down task ' . $currentTask['id'] . ' (taskInstance=' . $currentTask['task_instance']->__toString() . ') ...'); // Shutdown the task - $current['task_instance']->accept($this->visitorInstance); + $currentTask['task_instance']->accept($this->visitorInstance); // Remember this task - $tasks[] = $current; + $tasks[] = $currentTask; // Advance to next one $this->getIteratorInstance()->next(); diff --git a/application/hub/main/helper/hub/announcement/class_HubDescriptorHelper.php b/application/hub/main/helper/hub/announcement/class_HubDescriptorHelper.php index 63970e330..9aa6dfaa4 100644 --- a/application/hub/main/helper/hub/announcement/class_HubDescriptorHelper.php +++ b/application/hub/main/helper/hub/announcement/class_HubDescriptorHelper.php @@ -47,7 +47,7 @@ class HubDescriptorHelper extends BaseHubHelper implements HelpableHub { * @param $nodeInstance An instance of a NodeHelper class * @return $helperInstance A prepared instance of this helper */ - public final static function createHubDescriptorHelper (NodeHelper $nodeInstance) { + public static final function createHubDescriptorHelper (NodeHelper $nodeInstance) { // Get new instance $helperInstance = new HubDescriptorHelper(); diff --git a/application/hub/main/helper/hub/connection/class_HubSelfConnectHelper.php b/application/hub/main/helper/hub/connection/class_HubSelfConnectHelper.php index 33289725a..c1e00ff7b 100644 --- a/application/hub/main/helper/hub/connection/class_HubSelfConnectHelper.php +++ b/application/hub/main/helper/hub/connection/class_HubSelfConnectHelper.php @@ -47,7 +47,7 @@ class HubSelfConnectHelper extends BaseHubHelper implements HelpableHub { * @param $nodeInstance An instance of a NodeHelper class * @return $helperInstance A prepared instance of this helper */ - public final static function createHubSelfConnectHelper (NodeHelper $nodeInstance) { + public static final function createHubSelfConnectHelper (NodeHelper $nodeInstance) { // Get new instance $helperInstance = new HubSelfConnectHelper(); diff --git a/application/hub/main/iterator/hub/class_HubPingIterator.php b/application/hub/main/iterator/hub/class_HubPingIterator.php index 700375797..3073969d2 100644 --- a/application/hub/main/iterator/hub/class_HubPingIterator.php +++ b/application/hub/main/iterator/hub/class_HubPingIterator.php @@ -37,7 +37,7 @@ class HubPingIterator extends BaseIterator implements Iterator { * * @return $iteratorInstance An instance of a Iterator class */ - public final static function createHubPingIterator () { + public static final function createHubPingIterator () { // Get new instance $iteratorInstance = new HubPingIterator(); diff --git a/application/hub/main/iterator/network/class_NetworkListenIterator.php b/application/hub/main/iterator/network/class_NetworkListenIterator.php index 11c48f5a4..64b57304d 100644 --- a/application/hub/main/iterator/network/class_NetworkListenIterator.php +++ b/application/hub/main/iterator/network/class_NetworkListenIterator.php @@ -45,7 +45,7 @@ class NetworkListenIterator extends BaseIterator implements Iterator { * @param $listInstance A list of a Listable * @return $iteratorInstance An instance a Iterator class */ - public final static function createNetworkListenIterator (Listable $listInstance) { + public static final function createNetworkListenIterator (Listable $listInstance) { // Get new instance $iteratorInstance = new NetworkListenIterator(); diff --git a/application/hub/main/iterator/pool/class_DefaultIterator.php b/application/hub/main/iterator/pool/class_DefaultIterator.php index c40dbd9d6..6fcbf841d 100644 --- a/application/hub/main/iterator/pool/class_DefaultIterator.php +++ b/application/hub/main/iterator/pool/class_DefaultIterator.php @@ -43,7 +43,7 @@ class DefaultIterator extends BaseIterator implements Iterator { * @param $listInstance A list of a Listable * @return $iteratorInstance An instance a Iterator class */ - public final static function createDefaultIterator (Listable $listInstance) { + public static final function createDefaultIterator (Listable $listInstance) { // Get new instance $iteratorInstance = new DefaultIterator(); diff --git a/application/hub/main/iterator/pool/handler/class_HandlerPoolIterator.php b/application/hub/main/iterator/pool/handler/class_HandlerPoolIterator.php index 50f12c991..0e0251b5d 100644 --- a/application/hub/main/iterator/pool/handler/class_HandlerPoolIterator.php +++ b/application/hub/main/iterator/pool/handler/class_HandlerPoolIterator.php @@ -45,7 +45,7 @@ class HandlerPoolIterator extends BaseIterator implements Iterator { * @param $listInstance A list of a Listable * @return $iteratorInstance An instance a Iterator class */ - public final static function createHandlerPoolIterator (Listable $listInstance) { + public static final function createHandlerPoolIterator (Listable $listInstance) { // Get new instance $iteratorInstance = new HandlerPoolIterator(); diff --git a/application/hub/main/iterator/pool/shutdown/class_ShutdownPoolIterator.php b/application/hub/main/iterator/pool/shutdown/class_ShutdownPoolIterator.php index d3e269183..6977ff984 100644 --- a/application/hub/main/iterator/pool/shutdown/class_ShutdownPoolIterator.php +++ b/application/hub/main/iterator/pool/shutdown/class_ShutdownPoolIterator.php @@ -43,7 +43,7 @@ class ShutdownPoolIterator extends BaseIterator implements Iterator { * @param $listInstance A list of a Listable * @return $iteratorInstance An instance a Iterator class */ - public final static function createShutdownPoolIterator (Listable $listInstance) { + public static final function createShutdownPoolIterator (Listable $listInstance) { // Get new instance $iteratorInstance = new ShutdownPoolIterator(); diff --git a/application/hub/main/iterator/pool/tasks/class_TaskPoolIterator.php b/application/hub/main/iterator/pool/tasks/class_TaskPoolIterator.php index 205738b0a..bc129c14e 100644 --- a/application/hub/main/iterator/pool/tasks/class_TaskPoolIterator.php +++ b/application/hub/main/iterator/pool/tasks/class_TaskPoolIterator.php @@ -45,7 +45,7 @@ class TaskPoolIterator extends BaseIterator implements Iterator { * @param $listInstance A list of a Listable * @return $iteratorInstance An instance a Iterator class */ - public final static function createTaskPoolIterator (Listable $listInstance) { + public static final function createTaskPoolIterator (Listable $listInstance) { // Get new instance $iteratorInstance = new TaskPoolIterator(); diff --git a/application/hub/main/listener/tcp/class_TcpListener.php b/application/hub/main/listener/tcp/class_TcpListener.php index 6cbe71b3b..a040861db 100644 --- a/application/hub/main/listener/tcp/class_TcpListener.php +++ b/application/hub/main/listener/tcp/class_TcpListener.php @@ -38,7 +38,7 @@ class TcpListener extends BaseListener implements Listenable { * @param $nodeInstance A NodeHelper instance * @return $listenerInstance An instance a prepared listener class */ - public final static function createTcpListener (NodeHelper $nodeInstance) { + public static final function createTcpListener (NodeHelper $nodeInstance) { // Get new instance $listenerInstance = new TcpListener(); @@ -175,6 +175,7 @@ class TcpListener extends BaseListener implements Listenable { * "Listens" for incoming network packages * * @return void + * @throws InvalidSocketException If an invalid socket resource has been found */ public function doListen () { // Get all readers @@ -213,7 +214,7 @@ class TcpListener extends BaseListener implements Listenable { // Shutdown this socket $this->shutdownSocket($newSocket); - // And throw again + // And throw the exception throw new InvalidSocketException(array($this, gettype($newSocket), $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET); } // END - if @@ -228,12 +229,12 @@ class TcpListener extends BaseListener implements Listenable { } // END - if // Get the current value - $current = $this->getIteratorInstance()->current(); + $currentSocket = $this->getIteratorInstance()->current(); // Handle it here, if not main socket - if ($current != $this->getSocketResource()) { + if ($currentSocket != $this->getSocketResource()) { // ... or else it will raise warnings like 'Transport endpoint is not connected' - $this->getPackageInstance()->processResourcePackage($current); + $this->getPackageInstance()->processResourcePackage($currentSocket); } // END - if // Advance to next entry. This should be the last line diff --git a/application/hub/main/listener/tcp/decorators/class_HubTcpListenerDecorator.php b/application/hub/main/listener/tcp/decorators/class_HubTcpListenerDecorator.php index d6e65827b..a02b5fcbc 100644 --- a/application/hub/main/listener/tcp/decorators/class_HubTcpListenerDecorator.php +++ b/application/hub/main/listener/tcp/decorators/class_HubTcpListenerDecorator.php @@ -41,7 +41,7 @@ class HubTcpListenerDecorator extends BaseListenerDecorator implements Listenabl * @param $listenerInstance A Listener instance * @return $decoratorInstance An instance a prepared listener decorator class */ - public final static function createHubTcpListenerDecorator (Listenable $listenerInstance) { + public static final function createHubTcpListenerDecorator (Listenable $listenerInstance) { // Get new instance $decoratorInstance = new HubTcpListenerDecorator(); diff --git a/application/hub/main/listener/tcp/decorators/class_PeerTcpListenerDecorator.php b/application/hub/main/listener/tcp/decorators/class_PeerTcpListenerDecorator.php index cdabf6e6d..35fdbbd5a 100644 --- a/application/hub/main/listener/tcp/decorators/class_PeerTcpListenerDecorator.php +++ b/application/hub/main/listener/tcp/decorators/class_PeerTcpListenerDecorator.php @@ -41,7 +41,7 @@ class PeerTcpListenerDecorator extends BaseListenerDecorator implements Listenab * @param $listenerInstance A Listener instance * @return $decoratorInstance An instance a prepared listener decorator class */ - public final static function createPeerTcpListenerDecorator (Listenable $listenerInstance) { + public static final function createPeerTcpListenerDecorator (Listenable $listenerInstance) { // Get new instance $decoratorInstance = new PeerTcpListenerDecorator(); @@ -57,7 +57,7 @@ class PeerTcpListenerDecorator extends BaseListenerDecorator implements Listenab * * @return void */ - public function initListener() { + public function initListener () { $this->partialStub('WARNING: This method should not be called.'); } @@ -66,7 +66,7 @@ class PeerTcpListenerDecorator extends BaseListenerDecorator implements Listenab * * @return void */ - public function doListen() { + public function doListen () { // Handle generic TCP package $this->getListenerInstance()->doListen(); diff --git a/application/hub/main/listener/udp/class_UdpListener.php b/application/hub/main/listener/udp/class_UdpListener.php index c17064c50..04c791eed 100644 --- a/application/hub/main/listener/udp/class_UdpListener.php +++ b/application/hub/main/listener/udp/class_UdpListener.php @@ -38,7 +38,7 @@ class UdpListener extends BaseListener implements Listenable { * @param $nodeInstance A NodeHelper instance * @return $listenerInstance An instance a prepared listener class */ - public final static function createUdpListener (NodeHelper $nodeInstance) { + public static final function createUdpListener (NodeHelper $nodeInstance) { // Get new instance $listenerInstance = new UdpListener(); diff --git a/application/hub/main/listener/udp/decorators/class_HubUdpListenerDecorator.php b/application/hub/main/listener/udp/decorators/class_HubUdpListenerDecorator.php index 2f30e00d6..374c188a7 100644 --- a/application/hub/main/listener/udp/decorators/class_HubUdpListenerDecorator.php +++ b/application/hub/main/listener/udp/decorators/class_HubUdpListenerDecorator.php @@ -41,7 +41,7 @@ class HubUdpListenerDecorator extends BaseListenerDecorator implements Listenabl * @param $listenerInstance A Listener instance * @return $decoratorInstance An instance a prepared listener decorator class */ - public final static function createHubUdpListenerDecorator (Listenable $listenerInstance) { + public static final function createHubUdpListenerDecorator (Listenable $listenerInstance) { // Get new instance $decoratorInstance = new HubUdpListenerDecorator(); @@ -57,7 +57,7 @@ class HubUdpListenerDecorator extends BaseListenerDecorator implements Listenabl * * @return void */ - public function initListener() { + public function initListener () { $this->partialStub('WARNING: This method should not be called.'); } @@ -66,7 +66,7 @@ class HubUdpListenerDecorator extends BaseListenerDecorator implements Listenabl * * @return void */ - public function doListen() { + public function doListen () { // Handle generic UDP package first $this->getListenerInstance()->doListen(); diff --git a/application/hub/main/listener/udp/decorators/class_PeerUdpListenerDecorator.php b/application/hub/main/listener/udp/decorators/class_PeerUdpListenerDecorator.php index 6bf5f9c69..c5b8a70cd 100644 --- a/application/hub/main/listener/udp/decorators/class_PeerUdpListenerDecorator.php +++ b/application/hub/main/listener/udp/decorators/class_PeerUdpListenerDecorator.php @@ -41,7 +41,7 @@ class PeerUdpListenerDecorator extends BaseListenerDecorator implements Listenab * @param $listenerInstance A Listener instance * @return $decoratorInstance An instance a prepared listener decorator class */ - public final static function createPeerUdpListenerDecorator (Listenable $listenerInstance) { + public static final function createPeerUdpListenerDecorator (Listenable $listenerInstance) { // Get new instance $decoratorInstance = new PeerUdpListenerDecorator(); @@ -57,7 +57,7 @@ class PeerUdpListenerDecorator extends BaseListenerDecorator implements Listenab * * @return void */ - public function initListener() { + public function initListener () { $this->partialStub('WARNING: This method should not be called.'); } @@ -66,7 +66,7 @@ class PeerUdpListenerDecorator extends BaseListenerDecorator implements Listenab * * @return void */ - public function doListen() { + public function doListen () { // Handle generic UDP packages first $this->getListenerInstance()->doListen(); diff --git a/application/hub/main/lists/groups/class_ListGroupList.php b/application/hub/main/lists/groups/class_ListGroupList.php index d79376580..79a164da5 100644 --- a/application/hub/main/lists/groups/class_ListGroupList.php +++ b/application/hub/main/lists/groups/class_ListGroupList.php @@ -37,7 +37,7 @@ class ListGroupList extends BaseList implements Listable { * * @return $listInstance An instance a Listable class */ - public final static function createListGroupList () { + public static final function createListGroupList () { // Get new instance $listInstance = new ListGroupList(); diff --git a/application/hub/main/lists/hub/class_HubList.php b/application/hub/main/lists/hub/class_HubList.php index cd7b53cee..81efbc01c 100644 --- a/application/hub/main/lists/hub/class_HubList.php +++ b/application/hub/main/lists/hub/class_HubList.php @@ -37,7 +37,7 @@ class HubList extends BaseList implements Listable { * * @return $listInstance An instance a Listable class */ - public final static function createHubList () { + public static final function createHubList () { // Get new instance $listInstance = new HubList(); diff --git a/application/hub/main/lists/pool/class_PoolEntriesList.php b/application/hub/main/lists/pool/class_PoolEntriesList.php index 802820a26..217dd456d 100644 --- a/application/hub/main/lists/pool/class_PoolEntriesList.php +++ b/application/hub/main/lists/pool/class_PoolEntriesList.php @@ -37,7 +37,7 @@ class PoolEntriesList extends BaseList implements Listable { * * @return $listInstance An instance a Listable class */ - public final static function createPoolEntriesList () { + public static final function createPoolEntriesList () { // Get new instance $listInstance = new PoolEntriesList(); diff --git a/application/hub/main/lists/query/local/class_LocalQueryList.php b/application/hub/main/lists/query/local/class_LocalQueryList.php index 82b314113..a0f49db5a 100644 --- a/application/hub/main/lists/query/local/class_LocalQueryList.php +++ b/application/hub/main/lists/query/local/class_LocalQueryList.php @@ -37,7 +37,7 @@ class LocalQueryList extends BaseList implements Listable { * * @return $listInstance An instance a Listable class */ - public final static function createLocalQueryList () { + public static final function createLocalQueryList () { // Get new instance $listInstance = new LocalQueryList(); diff --git a/application/hub/main/lists/recipient/class_RecipientList.php b/application/hub/main/lists/recipient/class_RecipientList.php index f5d3b4f98..0c233cc52 100644 --- a/application/hub/main/lists/recipient/class_RecipientList.php +++ b/application/hub/main/lists/recipient/class_RecipientList.php @@ -37,7 +37,7 @@ class RecipientList extends BaseList implements Listable, Registerable { * * @return $listInstance An instance a Listable class */ - public final static function createRecipientList () { + public static final function createRecipientList () { // Get new instance $listInstance = new RecipientList(); diff --git a/application/hub/main/lists/tasks/class_TaskList.php b/application/hub/main/lists/tasks/class_TaskList.php index 170fd7a9f..8eb3168ab 100644 --- a/application/hub/main/lists/tasks/class_TaskList.php +++ b/application/hub/main/lists/tasks/class_TaskList.php @@ -37,7 +37,7 @@ class TaskList extends BaseList implements Listable { * * @return $listInstance An instance a Listable class */ - public final static function createTaskList () { + public static final function createTaskList () { // Get new instance $listInstance = new TaskList(); diff --git a/application/hub/main/lookup/peer/class_PeerStateLookupTable.php b/application/hub/main/lookup/peer/class_PeerStateLookupTable.php index b5f94bc9e..afc3654c7 100644 --- a/application/hub/main/lookup/peer/class_PeerStateLookupTable.php +++ b/application/hub/main/lookup/peer/class_PeerStateLookupTable.php @@ -37,7 +37,7 @@ class PeerStateLookupTable extends BaseLookupTable implements LookupablePeerStat * * @return $tableInstance An instance of a Lookupable class */ - public final static function createPeerStateLookupTable () { + public static final function createPeerStateLookupTable () { // Get new instance $tableInstance = new PeerStateLookupTable(); diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php index f884f53bb..4fedde61c 100644 --- a/application/hub/main/nodes/boot/class_HubBootNode.php +++ b/application/hub/main/nodes/boot/class_HubBootNode.php @@ -38,7 +38,7 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public final static function createHubBootNode (Requestable $requestInstance) { + public static final function createHubBootNode (Requestable $requestInstance) { // Get a new instance $nodeInstance = new HubBootNode(); diff --git a/application/hub/main/nodes/list/class_HubListNode.php b/application/hub/main/nodes/list/class_HubListNode.php index 2390e9d65..3b40d8290 100644 --- a/application/hub/main/nodes/list/class_HubListNode.php +++ b/application/hub/main/nodes/list/class_HubListNode.php @@ -38,7 +38,7 @@ class HubListNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public final static function createHubListNode (Requestable $requestInstance) { + public static final function createHubListNode (Requestable $requestInstance) { // Get a new instance $nodeInstance = new HubListNode(); diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php index 036b24f00..155ea74df 100644 --- a/application/hub/main/nodes/master/class_HubMasterNode.php +++ b/application/hub/main/nodes/master/class_HubMasterNode.php @@ -38,7 +38,7 @@ class HubMasterNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public final static function createHubMasterNode (Requestable $requestInstance) { + public static final function createHubMasterNode (Requestable $requestInstance) { // Get a new instance $nodeInstance = new HubMasterNode(); diff --git a/application/hub/main/nodes/regular/class_HubRegularNode.php b/application/hub/main/nodes/regular/class_HubRegularNode.php index 260d4a329..6bc3290e2 100644 --- a/application/hub/main/nodes/regular/class_HubRegularNode.php +++ b/application/hub/main/nodes/regular/class_HubRegularNode.php @@ -38,7 +38,7 @@ class HubRegularNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public final static function createHubRegularNode (Requestable $requestInstance) { + public static final function createHubRegularNode (Requestable $requestInstance) { // Get a new instance $nodeInstance = new HubRegularNode(); diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php index 323dba060..165e74ecc 100644 --- a/application/hub/main/package/class_NetworkPackage.php +++ b/application/hub/main/package/class_NetworkPackage.php @@ -127,7 +127,7 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Registe * @param $compressorInstance A Compressor instance for compressing the content * @return $packageInstance An instance of a Deliverable class */ - public final static function createNetworkPackage (Compressor $compressorInstance) { + public static final function createNetworkPackage (Compressor $compressorInstance) { // Get new instance $packageInstance = new NetworkPackage(); diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php index f19ac2528..2986b8c17 100644 --- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php +++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php @@ -40,7 +40,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable { * * @return $fragmenterInstance An instance of a Fragmentable class */ - public final static function createPackageFragmenter () { + public static final function createPackageFragmenter () { // Get new instance $fragmenterInstance = new PackageFragmenter(); diff --git a/application/hub/main/pools/listener/class_DefaultListenerPool.php b/application/hub/main/pools/listener/class_DefaultListenerPool.php index f828fb549..332ce5a0e 100644 --- a/application/hub/main/pools/listener/class_DefaultListenerPool.php +++ b/application/hub/main/pools/listener/class_DefaultListenerPool.php @@ -38,7 +38,7 @@ class DefaultListenerPool extends BasePool implements PoolableListener { * @param $nodeInstance A NodeHelper instance * @return $listenerInstance An instance a prepared listener class */ - public final static function createDefaultListenerPool (NodeHelper $nodeInstance) { + public static final function createDefaultListenerPool (NodeHelper $nodeInstance) { // Get new instance $listenerInstance = new DefaultListenerPool(); diff --git a/application/hub/main/pools/peer/class_DefaultPeerPool.php b/application/hub/main/pools/peer/class_DefaultPeerPool.php index bb76056fe..166d5d95e 100644 --- a/application/hub/main/pools/peer/class_DefaultPeerPool.php +++ b/application/hub/main/pools/peer/class_DefaultPeerPool.php @@ -38,7 +38,7 @@ class DefaultPeerPool extends BasePool implements PoolablePeer { * @param $listenerInstance A Listenable instance * @return $poolInstance An instance a Poolable class */ - public final static function createDefaultPeerPool (Listenable $listenerInstance) { + public static final function createDefaultPeerPool (Listenable $listenerInstance) { // Get new instance $poolInstance = new DefaultPeerPool(); diff --git a/application/hub/main/queries/local/class_LocalQuery.php b/application/hub/main/queries/local/class_LocalQuery.php index 9815604f3..b4189b714 100644 --- a/application/hub/main/queries/local/class_LocalQuery.php +++ b/application/hub/main/queries/local/class_LocalQuery.php @@ -37,7 +37,7 @@ class LocalQuery extends BaseQuery implements Queryable, Visitable { * * @return $queryInstance An instance of a Queryable class */ - public final static function createLocalQuery () { + public static final function createLocalQuery () { // Get new instance $queryInstance = new LocalQuery(); diff --git a/application/hub/main/queues/peer/class_LocalPeerQueue.php b/application/hub/main/queues/peer/class_LocalPeerQueue.php index 55e12a8b7..d854de877 100644 --- a/application/hub/main/queues/peer/class_LocalPeerQueue.php +++ b/application/hub/main/queues/peer/class_LocalPeerQueue.php @@ -37,7 +37,7 @@ class LocalPeerQueue extends BaseQueue implements Queueable { * * @return $poolInstance An instance a Queueable class */ - public final static function createLocalPeerQueue () { + public static final function createLocalPeerQueue () { // Get new instance $poolInstance = new LocalPeerQueue(); diff --git a/application/hub/main/registry/objects/class_ObjectTypeRegistry.php b/application/hub/main/registry/objects/class_ObjectTypeRegistry.php index 0f8c0e1ad..06cff654c 100644 --- a/application/hub/main/registry/objects/class_ObjectTypeRegistry.php +++ b/application/hub/main/registry/objects/class_ObjectTypeRegistry.php @@ -42,7 +42,7 @@ class ObjectTypeRegistry extends BaseRegistry implements Register { * * @return $registryInstance Instance of this class */ - public final static function createObjectTypeRegistry () { + public static final function createObjectTypeRegistry () { // Is an instance there? if (is_null(self::$registryInstance)) { // Not yet, so create one diff --git a/application/hub/main/registry/socket/class_SocketRegistry.php b/application/hub/main/registry/socket/class_SocketRegistry.php index 60c805971..73f3dd4ce 100644 --- a/application/hub/main/registry/socket/class_SocketRegistry.php +++ b/application/hub/main/registry/socket/class_SocketRegistry.php @@ -45,7 +45,7 @@ class SocketRegistry extends BaseRegistry implements Register, RegisterableSocke * * @return $registryInstance An instance of this class */ - public final static function createSocketRegistry () { + public static final function createSocketRegistry () { // Is an instance there? if (is_null(self::$registryInstance)) { // Not yet, so create one diff --git a/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php b/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php index a3c1978d9..19811af95 100644 --- a/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php +++ b/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php @@ -49,7 +49,7 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidCommandException Thrown if default command is invalid */ - public final static function createHubConsoleCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createHubConsoleCommandResolver ($commandName, ManageableApplication $appInstance) { // Create the new instance $resolverInstance = new HubConsoleCommandResolver(); diff --git a/application/hub/main/resolver/controller/console/class_HubConsoleControllerResolver.php b/application/hub/main/resolver/controller/console/class_HubConsoleControllerResolver.php index 774a69341..8040af11b 100644 --- a/application/hub/main/resolver/controller/console/class_HubConsoleControllerResolver.php +++ b/application/hub/main/resolver/controller/console/class_HubConsoleControllerResolver.php @@ -54,7 +54,7 @@ class HubConsoleControllerResolver extends BaseControllerResolver implements Con * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidControllerException Thrown if default controller is invalid */ - public final static function createHubConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) { + public static final function createHubConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) { // Create the new instance $resolverInstance = new HubConsoleControllerResolver(); diff --git a/application/hub/main/resolver/state/network/class_NetworkStateResolver.php b/application/hub/main/resolver/state/network/class_NetworkStateResolver.php index 5b8de9646..25639a695 100644 --- a/application/hub/main/resolver/state/network/class_NetworkStateResolver.php +++ b/application/hub/main/resolver/state/network/class_NetworkStateResolver.php @@ -50,7 +50,7 @@ class NetworkStateResolver extends BaseStateResolver implements StateResolver { * * @return $resolverInstance The prepared state resolver instance */ - public final static function createNetworkStateResolver () { + public static final function createNetworkStateResolver () { // Create the new instance $resolverInstance = new NetworkStateResolver(); diff --git a/application/hub/main/states/node/active/class_NodeActiveState.php b/application/hub/main/states/node/active/class_NodeActiveState.php index 9f1a42ce1..ff9c9e7ca 100644 --- a/application/hub/main/states/node/active/class_NodeActiveState.php +++ b/application/hub/main/states/node/active/class_NodeActiveState.php @@ -41,7 +41,7 @@ class NodeActiveState extends BaseNodeState implements Stateable { * @param $nodeInstance An instance of a NodeHelper class * @return $stateInstance An instance of a Stateable class */ - public final static function createNodeActiveState (NodeHelper $nodeInstance) { + public static final function createNodeActiveState (NodeHelper $nodeInstance) { // Get new instance $stateInstance = new NodeActiveState(); diff --git a/application/hub/main/states/node/announced/class_NodeAnnouncedState.php b/application/hub/main/states/node/announced/class_NodeAnnouncedState.php index 0e2c10a91..4a7b6f23c 100644 --- a/application/hub/main/states/node/announced/class_NodeAnnouncedState.php +++ b/application/hub/main/states/node/announced/class_NodeAnnouncedState.php @@ -41,7 +41,7 @@ class NodeAnnouncedState extends BaseState implements Stateable { * @param $nodeInstance An instance of a NodeHelper class * @return $stateInstance An instance of a Stateable class */ - public final static function createNodeAnnouncedState (NodeHelper $nodeInstance) { + public static final function createNodeAnnouncedState (NodeHelper $nodeInstance) { // Get new instance $stateInstance = new NodeAnnouncedState(); diff --git a/application/hub/main/states/node/init/class_NodeInitState.php b/application/hub/main/states/node/init/class_NodeInitState.php index ff41619fe..5c0fdd214 100644 --- a/application/hub/main/states/node/init/class_NodeInitState.php +++ b/application/hub/main/states/node/init/class_NodeInitState.php @@ -41,7 +41,7 @@ class NodeInitState extends BaseNodeState implements Stateable { * @param $nodeInstance An instance of a NodeHelper class * @return $stateInstance An instance of a Stateable class */ - public final static function createNodeInitState (NodeHelper $nodeInstance) { + public static final function createNodeInitState (NodeHelper $nodeInstance) { // Get new instance $stateInstance = new NodeInitState(); diff --git a/application/hub/main/states/node/virgin/class_NodeVirginState.php b/application/hub/main/states/node/virgin/class_NodeVirginState.php index fd8e498fe..2755250df 100644 --- a/application/hub/main/states/node/virgin/class_NodeVirginState.php +++ b/application/hub/main/states/node/virgin/class_NodeVirginState.php @@ -41,7 +41,7 @@ class NodeVirginState extends BaseNodeState implements Stateable { * @param $nodeInstance An instance of a NodeHelper class * @return $stateInstance An instance of a Stateable class */ - public final static function createNodeVirginState (NodeHelper $nodeInstance) { + public static final function createNodeVirginState (NodeHelper $nodeInstance) { // Get new instance $stateInstance = new NodeVirginState(); diff --git a/application/hub/main/states/peer/new/class_NewConnectionPeerState.php b/application/hub/main/states/peer/new/class_NewConnectionPeerState.php index 261646053..650545a66 100644 --- a/application/hub/main/states/peer/new/class_NewConnectionPeerState.php +++ b/application/hub/main/states/peer/new/class_NewConnectionPeerState.php @@ -37,7 +37,7 @@ class NewConnectionPeerState extends BasePeerState implements PeerStateable { * * @return $stateInstance An instance of a PeerStateable class */ - public final static function createNewConnectionPeerState () { + public static final function createNewConnectionPeerState () { // Get new instance $stateInstance = new NewConnectionPeerState(); diff --git a/application/hub/main/tags/package/class_PackageTags.php b/application/hub/main/tags/package/class_PackageTags.php index 510c59b57..e630c4928 100644 --- a/application/hub/main/tags/package/class_PackageTags.php +++ b/application/hub/main/tags/package/class_PackageTags.php @@ -53,7 +53,7 @@ class PackageTags extends BaseTags implements Tagable { * * @return $tagsInstance An instance of a Tagable class */ - public final static function createPackageTags () { + public static final function createPackageTags () { // Get new instance $tagsInstance = new PackageTags(); diff --git a/application/hub/main/tasks/hub/announcement/class_HubSelfAnnouncementTask.php b/application/hub/main/tasks/hub/announcement/class_HubSelfAnnouncementTask.php index e123fdf56..12806b57c 100644 --- a/application/hub/main/tasks/hub/announcement/class_HubSelfAnnouncementTask.php +++ b/application/hub/main/tasks/hub/announcement/class_HubSelfAnnouncementTask.php @@ -37,7 +37,7 @@ class HubSelfAnnouncementTask extends BaseTask implements Taskable, Visitable { * * @return $taskInstance An instance of a Visitable class */ - public final static function createHubSelfAnnouncementTask () { + public static final function createHubSelfAnnouncementTask () { // Get new instance $taskInstance = new HubSelfAnnouncementTask(); diff --git a/application/hub/main/tasks/hub/class_HubSelfConnectTask.php b/application/hub/main/tasks/hub/class_HubSelfConnectTask.php index 1700db1ff..009921c49 100644 --- a/application/hub/main/tasks/hub/class_HubSelfConnectTask.php +++ b/application/hub/main/tasks/hub/class_HubSelfConnectTask.php @@ -37,7 +37,7 @@ class HubSelfConnectTask extends BaseTask implements Taskable, Visitable { * * @return $taskInstance An instance of a Visitable class */ - public final static function createHubSelfConnectTask () { + public static final function createHubSelfConnectTask () { // Get new instance $taskInstance = new HubSelfConnectTask(); diff --git a/application/hub/main/tasks/hub/ping/class_HubPingTask.php b/application/hub/main/tasks/hub/ping/class_HubPingTask.php index 22ce92d72..b01b596ab 100644 --- a/application/hub/main/tasks/hub/ping/class_HubPingTask.php +++ b/application/hub/main/tasks/hub/ping/class_HubPingTask.php @@ -38,7 +38,7 @@ class HubPingTask extends BaseTask implements Visitable, Taskable { * @param $listInstance A Listable instance * @return $taskInstance An instance of a Visitable class */ - public final static function createHubPingTask (Listable $listInstance) { + public static final function createHubPingTask (Listable $listInstance) { // Get new instance $taskInstance = new HubPingTask(); diff --git a/application/hub/main/tasks/hub/update/class_HubUpdateCheckTask.php b/application/hub/main/tasks/hub/update/class_HubUpdateCheckTask.php index e3b5517c9..e4ca50316 100644 --- a/application/hub/main/tasks/hub/update/class_HubUpdateCheckTask.php +++ b/application/hub/main/tasks/hub/update/class_HubUpdateCheckTask.php @@ -37,7 +37,7 @@ class HubUpdateCheckTask extends BaseTask implements Visitable, Taskable { * * @return $taskInstance An instance of a Visitable class */ - public final static function createHubUpdateCheckTask () { + public static final function createHubUpdateCheckTask () { // Get new instance $taskInstance = new HubUpdateCheckTask(); diff --git a/application/hub/main/tasks/idle/class_IdleLoopTask.php b/application/hub/main/tasks/idle/class_IdleLoopTask.php index a5328581c..65ff79ddf 100644 --- a/application/hub/main/tasks/idle/class_IdleLoopTask.php +++ b/application/hub/main/tasks/idle/class_IdleLoopTask.php @@ -37,7 +37,7 @@ class IdleLoopTask extends BaseTask implements Visitable, Taskable { * * @return $taskInstance An instance of a Visitable class */ - public final static function createIdleLoopTask () { + public static final function createIdleLoopTask () { // Get new instance $taskInstance = new IdleLoopTask(); diff --git a/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php b/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php index 946cf77bd..590f0fc40 100644 --- a/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php +++ b/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php @@ -37,7 +37,7 @@ class NetworkPackageWriterTask extends BaseTask implements Taskable, Visitable { * * @return $taskInstance An instance of a Visitable class */ - public final static function createNetworkPackageWriterTask () { + public static final function createNetworkPackageWriterTask () { // Get new instance $taskInstance = new NetworkPackageWriterTask(); diff --git a/application/hub/main/template/announcement/class_AnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_AnnouncementTemplateEngine.php index 102d7e089..95099f435 100644 --- a/application/hub/main/template/announcement/class_AnnouncementTemplateEngine.php +++ b/application/hub/main/template/announcement/class_AnnouncementTemplateEngine.php @@ -78,7 +78,7 @@ class AnnouncementTemplateEngine extends BaseTemplateEngine implements Compileab * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public final static function createAnnouncementTemplateEngine (ManageableApplication $appInstance) { + public static final function createAnnouncementTemplateEngine (ManageableApplication $appInstance) { // Get a new instance $templateInstance = new AnnouncementTemplateEngine(); diff --git a/application/hub/main/template/connect/class_SelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_SelfConnectTemplateEngine.php index f4c874438..2647e4162 100644 --- a/application/hub/main/template/connect/class_SelfConnectTemplateEngine.php +++ b/application/hub/main/template/connect/class_SelfConnectTemplateEngine.php @@ -71,7 +71,7 @@ class SelfConnectTemplateEngine extends BaseTemplateEngine implements Compileabl * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public final static function createSelfConnectTemplateEngine (ManageableApplication $appInstance) { + public static final function createSelfConnectTemplateEngine (ManageableApplication $appInstance) { // Get a new instance $templateInstance = new SelfConnectTemplateEngine(); diff --git a/application/hub/main/template/objects/class_ObjectRegistryTemplateEngine.php b/application/hub/main/template/objects/class_ObjectRegistryTemplateEngine.php index 652f3282a..18fb7fc5d 100644 --- a/application/hub/main/template/objects/class_ObjectRegistryTemplateEngine.php +++ b/application/hub/main/template/objects/class_ObjectRegistryTemplateEngine.php @@ -83,7 +83,7 @@ class ObjectRegistryTemplateEngine extends BaseTemplateEngine implements Compile * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public final static function createObjectRegistryTemplateEngine (ManageableApplication $appInstance) { + public static final function createObjectRegistryTemplateEngine (ManageableApplication $appInstance) { // Get a new instance $templateInstance = new ObjectRegistryTemplateEngine(); diff --git a/application/hub/main/tools/class_HubTools.php b/application/hub/main/tools/class_HubTools.php index bf11d0097..409739ec7 100644 --- a/application/hub/main/tools/class_HubTools.php +++ b/application/hub/main/tools/class_HubTools.php @@ -59,7 +59,7 @@ class HubTools extends BaseFrameworkSystem { * * @retuen $selfInstance An instance of this class */ - public final static function getInstance () { + public static final function getInstance () { // Is the instance set if (is_null(self::$selfInstance)) { // Then set it diff --git a/application/hub/main/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php b/application/hub/main/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php index 6c622e400..af2f8acba 100644 --- a/application/hub/main/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php +++ b/application/hub/main/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php @@ -40,7 +40,7 @@ class ShutdownListenerPoolVisitor extends BaseVisitor implements PoolVisitor { * * @return $visitorInstance An instance a Visitorable class */ - public final static function createShutdownListenerPoolVisitor () { + public static final function createShutdownListenerPoolVisitor () { // Get new instance $visitorInstance = new ShutdownListenerPoolVisitor(); diff --git a/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php b/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php index d2abe68c1..2433d964d 100644 --- a/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php +++ b/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php @@ -40,7 +40,7 @@ class ShutdownSocketVisitor extends BaseVisitor implements Visitor { * * @return $visitorInstance An instance a Visitorable class */ - public final static function createShutdownSocketVisitor () { + public static final function createShutdownSocketVisitor () { // Get new instance $visitorInstance = new ShutdownSocketVisitor(); diff --git a/application/hub/main/visitor/tasks/class_ActiveTaskVisitor.php b/application/hub/main/visitor/tasks/class_ActiveTaskVisitor.php index f38b600d2..c3b617967 100644 --- a/application/hub/main/visitor/tasks/class_ActiveTaskVisitor.php +++ b/application/hub/main/visitor/tasks/class_ActiveTaskVisitor.php @@ -38,9 +38,9 @@ class ActiveTaskVisitor extends BaseVisitor implements TaskVisitor, QueryConnect /** * Creates an instance of this class * - * @return $visitorInstance An instance a Visitorable class + * @return $visitorInstance An instance a Visitorable class */ - public final static function createActiveTaskVisitor () { + public static final function createActiveTaskVisitor () { // Get new instance $visitorInstance = new ActiveTaskVisitor(); diff --git a/application/hub/main/visitor/tasks/class_ShutdownTaskVisitor.php b/application/hub/main/visitor/tasks/class_ShutdownTaskVisitor.php index 92ef09c87..3f3b5b120 100644 --- a/application/hub/main/visitor/tasks/class_ShutdownTaskVisitor.php +++ b/application/hub/main/visitor/tasks/class_ShutdownTaskVisitor.php @@ -40,7 +40,7 @@ class ShutdownTaskVisitor extends BaseVisitor implements TaskVisitor, QueryConne * * @return $visitorInstance An instance a Visitorable class */ - public final static function createShutdownTaskVisitor () { + public static final function createShutdownTaskVisitor () { // Get new instance $visitorInstance = new ShutdownTaskVisitor(); -- 2.39.2