From d66698c6c8077a1eebaede1be5107fca74432c0b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 26 Dec 2014 18:59:14 +0100 Subject: [PATCH] The protocol handler was mostly not correct as a listener was really used here. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../handler/protocol/class_HandleableProtocol.php | 6 +++--- .../registry/socket/class_RegisterableSocket.php | 12 ++++++------ .../main/container/socket/class_SocketContainer.php | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/inc/classes/interfaces/handler/protocol/class_HandleableProtocol.php b/inc/classes/interfaces/handler/protocol/class_HandleableProtocol.php index 8cfe6d60..0a65360e 100644 --- a/inc/classes/interfaces/handler/protocol/class_HandleableProtocol.php +++ b/inc/classes/interfaces/handler/protocol/class_HandleableProtocol.php @@ -23,11 +23,11 @@ */ interface HandleableProtocol extends Handleable { /** - * Getter for port number to satify HandleableProtocol + * Getter for protocol port number (if any) * - * @return $port The port number + * @return $port Port number used by the protocol (if any) */ - function getPort (); + function getProtocolPort (); /** * Getter for protocol name diff --git a/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php b/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php index 6a93f752..438bc21d 100644 --- a/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php +++ b/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php @@ -26,30 +26,30 @@ interface RegisterableSocket extends Registerable { * Checks whether given socket resource is registered. If $socketResource is * FALSE only the instance will be checked. * - * @param $protocolInstance An instance of a HandleableProtocol class + * @param $listenerInstance An instance of a Listenable class * @param $socketResource A valid socket resource * @return $isRegistered Whether the given socket resource is registered */ - function isSocketRegistered (HandleableProtocol $protocolInstance, $socketResource); + function isSocketRegistered (Listenable $listenerInstance, $socketResource); /** * Registeres given socket for listener or throws an exception if it is already registered * - * @param $protocolInstance An instance of a HandleableProtocol class + * @param $listenerInstance An instance of a Listenable class * @param $socketResource A valid socket resource * @return void * @throws SocketAlreadyRegisteredException If the given socket is already registered */ - function registerSocket (HandleableProtocol $protocolInstance, $socketResource); + function registerSocket (Listenable $listenerInstance, $socketResource); /** * Getter for given listener's socket resource * - * @param $protocolInstance An instance of a HandleableProtocol class + * @param $listenerInstance An instance of a Listenable class * @return $socketResource A valid socket resource * @throws NoSocketRegisteredException If the requested socket is not registered */ - function getRegisteredSocketResource (HandleableProtocol $protocolInstance); + function getRegisteredSocketResource (Listenable $listenerInstance); /** * "Getter" for protocol/connection instance from given package data diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php index bfc3bd2c..c78a56f2 100644 --- a/inc/classes/main/container/socket/class_SocketContainer.php +++ b/inc/classes/main/container/socket/class_SocketContainer.php @@ -36,11 +36,11 @@ class SocketContainer extends BaseContainer implements Registerable { * Creates an instance of this Container class and prepares it for usage * * @param $socketResource A valid socket resource - * @param $protocolInstance A HandleableProtocol instance + * @param $listenerInstance A Listenable instance * @param $packageData Raw package data * @return $containerInstance An instance of this Container class */ - public static final function createSocketContainer ($socketResource, HandleableProtocol $protocolInstance = NULL, array $packageData = array()) { + public static final function createSocketContainer ($socketResource, Listenable $listenerInstance = NULL, array $packageData = array()) { // Get a new instance $containerInstance = new SocketContainer(); @@ -55,7 +55,7 @@ class SocketContainer extends BaseContainer implements Registerable { $containerInstance->setSocketResource($socketResource); // ..., protocol instance ... - $containerInstance->setProtocolInstance($protocolInstance); + $containerInstance->setListenerInstance($listenerInstance); // ... and package data $containerInstance->setPackageData($packageData); -- 2.30.2