Use Clue\React\Socks PSR-4 namespace under src/

Author: clue

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "autoload": {
-        "psr-0": {"Socks": ""}
+        "psr-4": {"Clue\\React\\Socks\\": "src"}
     },
     "require": {
         "react/http-client": "0.3.*",

Socks/Client.php src/Client.phpSocks/Client.php renamed to src/Client.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Socks;
+namespace Clue\React\Socks;
 
 use React\Promise\When;
 use React\Promise\Deferred;
@@ -10,7 +10,7 @@
 use React\EventLoop\LoopInterface;
 use React\SocketClient\ConnectorInterface;
 use React\SocketClient\SecureConnector;
-use Socks\Connector;
+use Clue\React\Socks\Connector;
 use \Exception;
 use \InvalidArgumentException;
 use \UnexpectedValueException;
@@ -118,7 +118,7 @@ public function createSecureConnector()
     {
         return new SecureConnector($this->createConnector(), $this->loop);
     }
-    
+
     public function createConnector()
     {
         return new Connector($this);

Socks/Connector.php src/Connector.phpSocks/Connector.php renamed to src/Connector.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Socks;
+namespace Clue\React\Socks;
 
 use React\SocketClient\ConnectorInterface;
-use Socks\Client;
+use Clue\React\Socks\Client;
 
 class Connector implements ConnectorInterface
 {
     private $client;
-    
+
     public function __construct(Client $socksClient)
     {
         $this->client = $socksClient;
     }
-    
+
     public function create($host, $port)
     {
         return $this->client->getConnection($host, $port);

Socks/Factory.php src/Factory.phpSocks/Factory.php renamed to src/Factory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Socks;
+namespace Clue\React\Socks;
 
 use React\Dns\Resolver\Resolver;
 use React\EventLoop\LoopInterface;

Socks/Server.php src/Server.phpSocks/Server.php renamed to src/Server.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Socks;
+namespace Clue\React\Socks;
 
 use Evenement\EventEmitter;
 use React\Socket\ServerInterface;
@@ -93,17 +93,17 @@ public function onConnection(Connection $connection)
             $that->endConnection($connection);
         });
     }
-    
+
     /**
      * gracefully shutdown connection by flushing all remaining data and closing stream
-     * 
+     *
      * @param Stream $stream
      */
     public function endConnection(Stream $stream)
     {
         $tid = true;
         $loop = $this->loop;
-        
+
         // cancel below timer in case connection is closed in time
         $stream->once('close', function () use (&$tid, $loop) {
             // close event called before the timer was set up, so everything is okay
@@ -114,11 +114,11 @@ public function endConnection(Stream $stream)
                 $loop->cancelTimer($tid);
             }
         });
-        
+
         // shut down connection by pausing input data, flushing outgoing buffer and then exit
         $stream->pause();
         $stream->end();
-        
+
         // check if connection is not already closed
         if ($tid === true) {
             // fall back to forcefully close connection in 3 seconds if buffer can not be flushed

Socks/StreamReader.php src/StreamReader.phpSocks/StreamReader.php renamed to src/StreamReader.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Socks;
+namespace Clue\React\Socks;
 
 use React\Promise\Deferred;
 use React\Stream\Stream;

tests/ClientApiTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use Clue\React\Socks;
+
 class ClientApiTest extends TestCase
 {
     public function setUp()
@@ -13,7 +15,7 @@ public function setUp()
 
         $this->client = $factory->createClient('127.0.0.1', 9050);
     }
-    
+
     /**
      * @expectedException InvalidArgumentException
      */
@@ -42,7 +44,7 @@ public function testValidAuthVersion()
         $this->client->setAuth('username', 'password');
         $this->assertNull($this->client->setProtocolVersion(5));
     }
-    
+
     /**
      * @expectedException UnexpectedValueException
      */
@@ -51,12 +53,12 @@ public function testInvalidCanNotSetAuthenticationForSocks4()
         $this->client->setProtocolVersion(4);
         $this->client->setAuth('username', 'password');
     }
-    
+
     public function testUnsetAuth()
     {
         // unset auth even if it's not set is valid
         $this->client->unsetAuth();
-    
+
         $this->client->setAuth('username', 'password');
         $this->client->unsetAuth();
     }
@@ -106,7 +108,7 @@ public function testInvalidResolveRemoteVersion()
         $this->client->setResolveLocal(false);
         $this->client->setProtocolVersion('4');
     }
-    
+
     public function testSetTimeout()
     {
         $this->client->setTimeout(1);
@@ -118,7 +120,7 @@ public function testCreateHttpClient()
     {
         $this->assertInstanceOf('\React\HttpClient\Client', $this->client->createHttpClient());
     }
-    
+
     public function testCreateConnector()
     {
         $this->assertInstanceOf('\React\SocketClient\ConnectorInterface', $this->client->createConnector());

tests/FactoryTest.php

@@ -1,43 +1,43 @@
 <?php
 
-use Socks\Factory;
+use Clue\React\Socks\Factory;
 
 class FactoryTest extends TestCase
 {
     /** @var Factory */
     private $factory;
-    
+
     public function setUp()
     {
         $this->factory = new Factory($this->createLoop(), $this->createResolver());
     }
-    
+
     public function testCreateClient()
     {
         $client = $this->factory->createClient('localhost', 9050);
 
-        $this->assertInstanceOf('Socks\Client', $client);
+        $this->assertInstanceOf('Clue\React\Socks\Client', $client);
     }
-    
+
     public function testCreateServer()
     {
         $server = $this->factory->createServer($this->createSocket());
-        
-        $this->assertInstanceOf('Socks\Server', $server);
+
+        $this->assertInstanceOf('Clue\React\Socks\Server', $server);
     }
-    
+
     private function createLoop()
     {
         return React\EventLoop\Factory::create();
     }
-    
+
     private function createResolver()
     {
         return $this->getMockBuilder('React\Dns\Resolver\Resolver')
             ->disableOriginalConstructor()
             ->getMock();
     }
-    
+
     private function createSocket()
     {
         return $this->getMockBuilder('React\Socket\Server')

tests/PairTest.php

@@ -1,39 +1,39 @@
 <?php
 
-use Socks\Factory;
+use Clue\React\Socks\Factory;
 
 class PairTest extends TestCase
 {
     private $loop;
     private $factory;
-    
+
     public function setUp()
     {
         $this->loop = React\EventLoop\Factory::create();
-        
+
         $dnsResolverFactory = new React\Dns\Resolver\Factory();
         $dns = $dnsResolverFactory->createCached('8.8.8.8', $this->loop);
-        
+
         $this->factory = new Factory($this->loop, $dns);
     }
-    
+
     public function testClientHttpRequest()
     {
         $socket = $this->createSocketServer();
         $port = $socket->getPort();
         $this->assertNotEquals(0, $port);
-        
+
         $server = $this->factory->createServer($socket);
-        
+
         $server->on('connection', function () use ($socket) {
             // close server socket once first connection has been established
             $socket->shutdown();
         });
-        
+
         $client = $this->factory->createClient('127.0.0.1', $port);
-        
+
         $http = $client->createHttpClient();
-        
+
         $request = $http->request('GET', 'https://www.google.com/', array('user-agent'=>'none'));
         $request->on('response', function (React\HttpClient\Response $response) {
             // response received, do not care for the rest of the response body
@@ -47,15 +47,15 @@ public function testClientHttpRequest()
 //             $that->fail('timeout timer');
 //             $loop->stop();
 //         });
-        
+
         $this->loop->run();
     }
-    
+
     private function createSocketServer()
     {
         $socket = new React\Socket\Server($this->loop);
         $socket->listen(0);
-        
+
         return $socket;
     }
 }