And back to Listenable ... :-(

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php b/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php
index 6a93f752fb0d7c437d006055709650263951124a..84f3c05ceeb056bd807ec59e14558732c9d385ed 100644 (file)
--- 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       $listenerlInstance      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 bfc3bd2cc3967dfd4c83747db23d7955dadd1f64..c5d886290286705e14d2e5ec2b83ff687b85af85 100644 (file)
--- 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();
 
@@ -54,8 +54,8 @@ class SocketContainer extends BaseContainer implements Registerable {
                // Set the resource ...
                $containerInstance->setSocketResource($socketResource);
 
-               // ..., protocol instance ...
-               $containerInstance->setProtocolInstance($protocolInstance);
+               // ..., listener instance ...
+               $containerInstance->setListenerInstance($listenerInstance);
 
                // ... and package data
                $containerInstance->setPackageData($packageData);