Continued with rewrite of sockets:

- imported BaseListener

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

diff --git a/application/hub/classes/factories/socket/class_SocketFactory.php b/application/hub/classes/factories/socket/class_SocketFactory.php
index 6b7c86b573e45dd6a1ca73a0da84d903129a0b7c..8e657c6cd646c9f8ea145cca04fe9be0b5e37b6d 100644 (file)
--- a/application/hub/classes/factories/socket/class_SocketFactory.php
+++ b/application/hub/classes/factories/socket/class_SocketFactory.php
@@ -3,6 +3,7 @@
 namespace Hub\Factory\Socket;
 
 // Import application-specific stuff
+use Hub\Listener\BaseListener;
 use Hub\Network\Package\NetworkPackage;
 
 // Import framework stuff
@@ -132,7 +133,7 @@ class SocketFactory extends ObjectFactory {
                // Is the socket resource valid?
                if (!$socketInstance->isValidSocket()) {
                        // Something bad happened
-                       throw new InvalidSocketException(array($listenerInstance, $socketInstance), BaseListener::EXCEPTION_INVALID_SOCKET);
+                       throw new InvalidSocketException(array($listenerInstance, $socketInstance->getSocketResource()), BaseListener::EXCEPTION_INVALID_SOCKET);
                } // END - if
 
                // Get socket error code for verification

diff --git a/application/hub/classes/handler/network/tcp/class_ b/application/hub/classes/handler/network/tcp/class_
index c4413218dfe4355c3a5c672807927102face3382..27e4500874e5e1339241607b8df25d632e784e1f 100644 (file)
--- a/application/hub/classes/handler/network/tcp/class_
+++ b/application/hub/classes/handler/network/tcp/class_
@@ -138,6 +138,7 @@ namespace Hub\Listener\;
 
 // Import application-specific stuff
 use Hub\Helper\Node\NodeHelper;
+use Hub\Listener\BaseListener;
 
 // Import framework stuff
 use CoreFramework\Listener\Listenable;

diff --git a/application/hub/classes/listener/tcp/class_ b/application/hub/classes/listener/tcp/class_
index c2a49dcce8454ef85ac208a973f4b3e26b1d64ad..2f677801630dda21e9b15d927974ef7a3b991982 100644 (file)
--- a/application/hub/classes/listener/tcp/class_
+++ b/application/hub/classes/listener/tcp/class_
@@ -137,6 +137,7 @@ namespace Hub\Listener\Tcp\;
 
 // Import application-specific stuff
 use Hub\Helper\Node\NodeHelper;
+use Hub\Listener\BaseListener;
 
 // Import framework stuff
 use CoreFramework\Listener\Listenable;

diff --git a/application/hub/classes/listener/tcp/class_TcpListener.php b/application/hub/classes/listener/tcp/class_TcpListener.php
index 68fb1a8bea8a9e9faf0d6ee2083745698c87f701..a5182f89ea9adb56e7da970d4645beeaf7059a58 100644 (file)
--- a/application/hub/classes/listener/tcp/class_TcpListener.php
+++ b/application/hub/classes/listener/tcp/class_TcpListener.php
@@ -4,6 +4,7 @@ namespace Hub\Listener\Tcp;
 
 // Import application-specific stuff
 use Hub\Helper\Connection\BaseConnectionHelper;
+use Hub\Listener\BaseListener;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;

diff --git a/application/hub/classes/listener/udp/class_ b/application/hub/classes/listener/udp/class_
index 4658765479ea419d7cc0be74b60c515e8aa2c4af..c14d4b227285de0e0dd183873d25d117d3ba9a53 100644 (file)
--- a/application/hub/classes/listener/udp/class_
+++ b/application/hub/classes/listener/udp/class_
@@ -4,6 +4,7 @@ namespace Hub\Listener\Udp\;
 
 // Import application-specific stuff
 use Hub\Helper\Node\NodeHelper;
+use Hub\Listener\BaseListener;
 
 // Import framework stuff
 use CoreFramework\Listener\Listenable;

diff --git a/application/hub/classes/listener/udp/class_UdpListener.php b/application/hub/classes/listener/udp/class_UdpListener.php
index dcb0a0453949b16a3c4629b39222e21682c1f043..a713502a996c2117cf56a885aa00ee6e7d50b91f 100644 (file)
--- a/application/hub/classes/listener/udp/class_UdpListener.php
+++ b/application/hub/classes/listener/udp/class_UdpListener.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Hub\Listener\Udp;
 
+// Import application-specific stuff
+use Hub\Listener\BaseListener;
+
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Listener\Listenable;

diff --git a/application/hub/classes/pools/peer/class_DefaultPeerPool.php b/application/hub/classes/pools/peer/class_DefaultPeerPool.php
index 995688906cd8427000cf304b1c25e3e605157254..1797f0e55712f410aca01cbde3e6e2a88aa38c6c 100644 (file)
--- a/application/hub/classes/pools/peer/class_DefaultPeerPool.php
+++ b/application/hub/classes/pools/peer/class_DefaultPeerPool.php
@@ -74,7 +74,7 @@ class DefaultPeerPool extends BasePool implements PoolablePeer {
                // Is it a valid resource?
                if (!$socketInstance->isValidSocket()) {
                        // Throw an exception
-                       throw new InvalidSocketException(array($this, $socketInstance), SocketHandler::EXCEPTION_INVALID_SOCKET);
+                       throw new InvalidSocketException(array($this, $socketInstance->getSocketResource()), SocketHandler::EXCEPTION_INVALID_SOCKET);
                } // END - if
 
                // Get error code

diff --git a/application/hub/classes/registry/socket/class_SocketRegistry.php b/application/hub/classes/registry/socket/class_SocketRegistry.php
index 088da4a0be343a27cf976ad36b6a399a97d6006b..d5d6079ca9cc8246cebf56424918807015193778 100644 (file)
--- a/application/hub/classes/registry/socket/class_SocketRegistry.php
+++ b/application/hub/classes/registry/socket/class_SocketRegistry.php
@@ -6,6 +6,7 @@ namespace Hub\Registry\Socket;
 use Hub\Container\Socket\StorableSocket;
 use Hub\Factory\Information\Connection\ConnectionInfoFactory;
 use Hub\Information\ShareableInfo;
+use Hub\Listener\BaseListener;
 use Hub\Network\Package\NetworkPackage;
 use Hub\Registry\Socket\RegisterableSocket;
 

diff --git a/application/hub/classes/resolver/state/peer/class_PeerStateResolver.php b/application/hub/classes/resolver/state/peer/class_PeerStateResolver.php
index c4241a05d1b782563fe7cb1cc79dbab52e717190..811224abd6df756409022b2113ba2d0f7885f341 100644 (file)
--- a/application/hub/classes/resolver/state/peer/class_PeerStateResolver.php
+++ b/application/hub/classes/resolver/state/peer/class_PeerStateResolver.php
@@ -84,7 +84,7 @@ class PeerStateResolver extends BaseStateResolver implements StateResolver {
                        // Still no socket resource?
                        if (!$socketInstance->isValidSocket())) {
                                // Then abort here with an exception (may happen after socket_shutdown())
-                               throw new InvalidSocketException(array($helperInstance, $socketInstance, 'unknown', 'unknown'), SocketHandler::EXCEPTION_INVALID_SOCKET);
+                               throw new InvalidSocketException(array($helperInstance, $socketInstance->getSocketResource()), SocketHandler::EXCEPTION_INVALID_SOCKET);
                        } // END - if
                } // END - if