Merge branch 'refs/heads/standalone'

reactphp · May 25, 2014 · a6acf40 · a6acf40
2 parents 8cac929 + 4b64274
commit a6acf40
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+composer.lock
+vendor
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+before_script:
+  - composer install --dev --prefer-source
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Socket Component
 
+[![Build Status](https://secure.travis-ci.org/reactphp/socket.png?branch=master)](http://travis-ci.org/reactphp/socket)
+
 Library for building an evented socket server.
 
 The socket component provides a more usable interface for a socket-layer
@@ -18,7 +20,7 @@ or in a client context.
 ## Usage
 
 Here is a server that closes the connection if you send it anything.
-
+```php
     $loop = React\EventLoop\Factory::create();
 
     $socket = new React\Socket\Server($loop);
@@ -34,15 +36,15 @@ Here is a server that closes the connection if you send it anything.
     $socket->listen(1337);
 
     $loop->run();
-
+```    
 You can change the host the socket is listening on through a second parameter 
 provided to the listen method:
-
+```php
     $socket->listen(1337, '192.168.0.1');
-
+```
 Here's a client that outputs the output of said server and then attempts to
 send it a string.
-
+```php
     $loop = React\EventLoop\Factory::create();
 
     $client = stream_socket_client('tcp://127.0.0.1:1337');
@@ -51,3 +53,4 @@ send it a string.
     $conn->write("Hello World!\n");
 
     $loop->run();
+```
diff --git a/composer.json b/composer.json
@@ -10,7 +10,9 @@
         "react/stream": "0.4.*"
     },
     "autoload": {
-        "psr-4": { "React\\Socket\\": "" }
+        "psr-4": {
+            "React\\Socket\\": "src"
+        }
     },
     "extra": {
         "branch-alias": {

diff --git a/Connection.php → src/Connection.php b/Connection.php → src/Connection.php
diff --git a/ConnectionException.php → src/ConnectionException.php b/ConnectionException.php → src/ConnectionException.php
diff --git a/ConnectionInterface.php → src/ConnectionInterface.php b/ConnectionInterface.php → src/ConnectionInterface.php
diff --git a/Server.php → src/Server.php b/Server.php → src/Server.php
diff --git a/ServerInterface.php → src/ServerInterface.php b/ServerInterface.php → src/ServerInterface.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,6 +2,6 @@
 
 $loader = @include __DIR__ . '/../vendor/autoload.php';
 if (!$loader) {
-    $loader = require __DIR__ . '/../../../vendor/autoload.php';
+    $loader = require __DIR__ . '/../../../../vendor/autoload.php';
 }
 $loader->addPsr4('React\\Tests\\Socket\\', __DIR__);