Remove from/import and update to PHP5.4.

Author: Hywan

Bin/Client.php

@@ -34,28 +34,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace {
+namespace Hoa\Websocket\Bin;
 
-from('Hoa')
-
-/**
- * \Hoa\Websocket\Client
- */
--> import('Websocket.Client')
-
-/**
- * \Hoa\Socket\Client
- */
--> import('Socket.Client')
-
-/**
- * \Hoa\Console\Readline
- */
--> import('Console.Readline.~');
-
-}
-
-namespace Hoa\Websocket\Bin {
+use Hoa\Console;
+use Hoa\Socket;
+use Hoa\Websocket;
 
 /**
  * Class \Hoa\Websocket\Bin\Client.
@@ -67,18 +50,18 @@
  * @license    New BSD License
  */
 
-class Client extends \Hoa\Console\Dispatcher\Kit {
+class Client extends Console\Dispatcher\Kit {
 
     /**
      * Options description.
      *
      * @var \Hoa\Websocket\Bin\Client array
      */
-    protected $options = array(
-        array('server', \Hoa\Console\GetOption::REQUIRED_ARGUMENT, 's'),
-        array('help',   \Hoa\Console\GetOption::NO_ARGUMENT,       'h'),
-        array('help',   \Hoa\Console\GetOption::NO_ARGUMENT,       '?')
-    );
+    protected $options = [
+        ['server', Console\GetOption::REQUIRED_ARGUMENT, 's'],
+        ['help',   Console\GetOption::NO_ARGUMENT,       'h'],
+        ['help',   Console\GetOption::NO_ARGUMENT,       '?']
+    ];
 
 
 
@@ -109,9 +92,9 @@ public function main ( ) {
         }
 
 
-        $readline = new \Hoa\Console\Readline();
-        $client   = new \Hoa\Websocket\Client(
-            new \Hoa\Socket\Client('tcp://' . $server)
+        $readline = new Console\Readline();
+        $client   = new Websocket\Client(
+            new Socket\Client('tcp://' . $server)
         );
         $client->setHost('localhost');
         $client->connect();
@@ -142,16 +125,14 @@ public function usage ( ) {
 
         echo 'Usage   : websocket:client <options>', "\n",
              'Options :', "\n",
-             $this->makeUsageOptionsList(array(
+             $this->makeUsageOptionsList([
                  's'    => 'Server URI (default: 127.0.0.1:8889).',
                  'help' => 'This help.'
-             )), "\n";
+             ]), "\n";
 
         return;
     }
 }
 
-}
-
 __halt_compiler();
 Basic WebSocket client.

Client.php

@@ -34,23 +34,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace {
+namespace Hoa\Websocket;
 
-from('Hoa')
-
-/**
- * \Hoa\Websocket\Connection
- */
--> import('Websocket.Connection')
-
-/**
- * \Hoa\Http\Response
- */
--> import('Http.Response.~');
-
-}
-
-namespace Hoa\Websocket {
+use Hoa\Core;
+use Hoa\Http;
+use Hoa\Socket;
 
 /**
  * Class \Hoa\Websocket\Client.
@@ -97,14 +85,14 @@ class Client extends Connection {
      * @return  void
      * @throw   \Hoa\Socket\Exception
      */
-    public function __construct ( \Hoa\Socket\Client $client, $endPoint = '/',
-                                  \Hoa\Http\Response $response = null ) {
+    public function __construct ( Socket\Client $client, $endPoint = '/',
+                                  Http\Response $response = null ) {
 
         parent::__construct($client);
         $this->setEndPoint($endPoint);
 
         if(null === $response)
-            $response = new \Hoa\Http\Response(false);
+            $response = new Http\Response(false);
 
         $this->setResponse($response);
 
@@ -164,12 +152,12 @@ public function receive ( ) {
      */
     protected function doHandshake ( ) {
 
-        static $_tail = array('A', 'Q', 'g', 'w');
+        static $_tail = ['A', 'Q', 'g', 'w'];
 
         $connection = $this->getConnection();
         $connection->connect();
         $connection->setStreamBlocking(true);
-        $key        = substr(base64_encode(\Hoa\Core::uuid()), 0, 21) .
+        $key        = substr(base64_encode(Core::uuid()), 0, 21) .
                       $_tail[mt_rand(0, 3)] . '==';
         $expected   = base64_encode(sha1($key . Protocol\Rfc6455::GUID, true));
 
@@ -203,18 +191,18 @@ protected function doHandshake ( ) {
                 'response.' . "\n\n" .
                 'Client:' . "\n" . '    %s' . "\n" .
                 'Server:' . "\n" . '    %s',
-                0, array(
+                0, [
                     str_replace("\n", "\n" . '    ', $request),
                     str_replace("\n", "\n" . '    ', $buffer)
-                ));
+                ]);
 
         $currentNode = $connection->getCurrentNode();
         $currentNode->setHandshake(SUCCEED);
         $currentNode->setProtocolImplementation(new Protocol\Rfc6455($connection));
 
         $this->_on->fire(
             'open',
-            new \Hoa\Core\Event\Bucket()
+            new Core\Event\Bucket()
         );
 
         return;
@@ -277,7 +265,7 @@ public function getEndPoint ( ) {
      * @param   \Hoa\Http\Response  $response    Response.
      * @return  \Hoa\Http\Response
      */
-    public function setResponse ( \Hoa\Http\Response $response ) {
+    public function setResponse ( Http\Response $response ) {
 
         $old             = $this->_response;
         $this->_response = $response;
@@ -326,5 +314,3 @@ public function getHost ( ) {
                          : null);
     }
 }
-
-}