From: Roland Haeder <roland@mxchange.org>
Date: Sat, 10 Jan 2015 22:21:32 +0000 (+0100)
Subject: Sometimes it is Listenable, somtimes HandleableProtocol ... ;-)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1d80851e8823f5cb20bdfddda4bbbacd8a71aaf8;p=core.git

Sometimes it is Listenable, somtimes HandleableProtocol ... ;-)

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

diff --git a/inc/classes/interfaces/handler/protocol/class_HandleableProtocol.php b/inc/classes/interfaces/handler/protocol/class_HandleableProtocol.php
index 0a65360e..8cfe6d60 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 protocol port number (if any)
+	 * Getter for port number to satify HandleableProtocol
 	 *
-	 * @return	$port	Port number used by the protocol (if any)
+	 * @return	$port	The port number
 	 */
-	function getProtocolPort ();
+	function getPort ();
 
 	/**
 	 * 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 438bc21d..6a93f752 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	$listenerInstance	An instance of a Listenable class
+	 * @param	$protocolInstance	An instance of a HandleableProtocol class
 	 * @param	$socketResource		A valid socket resource
 	 * @return	$isRegistered		Whether the given socket resource is registered
 	 */
-	function isSocketRegistered (Listenable $listenerInstance, $socketResource);
+	function isSocketRegistered (HandleableProtocol $protocolInstance, $socketResource);
 
 	/**
 	 * Registeres given socket for listener or throws an exception if it is already registered
 	 *
-	 * @param	$listenerInstance	An instance of a Listenable class
+	 * @param	$protocolInstance	An instance of a HandleableProtocol class
 	 * @param	$socketResource		A valid socket resource
 	 * @return	void
 	 * @throws	SocketAlreadyRegisteredException	If the given socket is already registered
 	 */
-	function registerSocket (Listenable $listenerInstance, $socketResource);
+	function registerSocket (HandleableProtocol $protocolInstance, $socketResource);
 
 	/**
 	 * Getter for given listener's socket resource
 	 *
-	 * @param	$listenerInstance	An instance of a Listenable class
+	 * @param	$protocolInstance	An instance of a HandleableProtocol class
 	 * @return	$socketResource		A valid socket resource
 	 * @throws	NoSocketRegisteredException		If the requested socket is not registered
 	 */
-	function getRegisteredSocketResource (Listenable $listenerInstance);
+	function getRegisteredSocketResource (HandleableProtocol $protocolInstance);
 
 	/**
 	 * "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 c78a56f2..bfc3bd2c 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	$listenerInstance	A Listenable instance
+	 * @param	$protocolInstance	A HandleableProtocol instance
 	 * @param	$packageData		Raw package data
 	 * @return	$containerInstance	An instance of this Container class
 	 */
-	public static final function createSocketContainer ($socketResource, Listenable $listenerInstance = NULL, array $packageData = array()) {
+	public static final function createSocketContainer ($socketResource, HandleableProtocol $protocolInstance = 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->setListenerInstance($listenerInstance);
+		$containerInstance->setProtocolInstance($protocolInstance);
 
 		// ... and package data
 		$containerInstance->setPackageData($packageData);