From: Roland Haeder <roland@mxchange.org>
Date: Sun, 11 Jan 2015 23:22:30 +0000 (+0100)
Subject: And back to Listenable ... :-(
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a93fdaaefa26ed90176803d74cec058bcae5e8b9;p=core.git

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 6a93f752..84f3c05c 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	$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 bfc3bd2c..c5d88629 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();
 
@@ -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);