Merge pull request #5 from clue-labs/examples

Restructure examples to be more accessible

Author: clue

composer.json

@@ -16,10 +16,12 @@
     "require": {
         "php": ">=5.3",
         "react/event-loop": "~0.4.0|~0.3.0",
-        "react/http": "~0.4.0|~0.3.0",
+        "react/http": "^0.4.4",
         "react/stream": "~0.4.0|~0.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8"
+        "clue/redis-react": "^0.5",
+        "phpunit/phpunit": "^5.0 || ^4.8",
+        "react/socket-client": "^0.5"
     }
 }

…ples/01-simple-periodic/eventsource.html examples/00-eventsource.htmlexamples/01-simple-periodic/eventsource.html renamed to examples/00-eventsource.html examples/01-simple-periodic/eventsource.html renamed to examples/00-eventsource.html

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use Clue\React\Sse\BufferedChannel;
 use React\Http\Request;
@@ -15,14 +15,19 @@
 $http->on('request', function (Request $request, Response $response) use ($channel) {
     if ($request->getPath() === '/') {
         $response->writeHead('200', array('Content-Type' => 'text/html'));
-        $response->end(file_get_contents(__DIR__ . '/eventsource.html'));
+        $response->end(file_get_contents(__DIR__ . '/00-eventsource.html'));
+        return;
+    }
+
+    if ($request->getPath() !== '/demo') {
+        $response->writeHead(404);
+        $response->end('Not Found');
         return;
     }
 
     echo 'connected' . PHP_EOL;
 
-    $headers = $request->getHeaders();
-    $id = isset($headers['Last-Event-ID']) ? $headers['Last-Event-ID'] : null;
+    $id = $request->getHeaderLine('Last-Event-ID');
 
     $response->writeHead(200, array('Content-Type' => 'text/event-stream'));
     $channel->connect($response, $id);

examples/01-simple-periodic/server.php examples/01-simple-periodic.phpexamples/01-simple-periodic/server.php renamed to examples/01-simple-periodic.php

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use Clue\React\Sse\BufferedChannel;
 use React\Http\Request;
@@ -17,14 +17,19 @@
 $http->on('request', function (Request $request, Response $response) use ($channel) {
     if ($request->getPath() === '/') {
         $response->writeHead('200', array('Content-Type' => 'text/html'));
-        $response->end(file_get_contents(__DIR__ . '/../01-simple-periodic/eventsource.html'));
+        $response->end(file_get_contents(__DIR__ . '/00-eventsource.html'));
+        return;
+    }
+
+    if ($request->getPath() !== '/demo') {
+        $response->writeHead(404);
+        $response->end('Not Found');
         return;
     }
 
     echo 'connected' . PHP_EOL;
 
-    $headers = $request->getHeaders();
-    $id = isset($headers['Last-Event-ID']) ? $headers['Last-Event-ID'] : null;
+    $id = $request->getHeaderLine('Last-Event-ID');
 
     $response->writeHead(200, array('Content-Type' => 'text/event-stream'));
     $channel->connect($response, $id);

examples/02-plaintext-chat/server.php examples/02-plaintext-chat.phpexamples/02-plaintext-chat/server.php renamed to examples/02-plaintext-chat.php

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use Clue\React\Sse\BufferedChannel;
 use React\Http\Request;
@@ -16,14 +16,19 @@
 $http->on('request', function (Request $request, Response $response) use ($channel) {
     if ($request->getPath() === '/') {
         $response->writeHead('200', array('Content-Type' => 'text/html'));
-        $response->end(file_get_contents(__DIR__ . '/../01-simple-periodic/eventsource.html'));
+        $response->end(file_get_contents(__DIR__ . '/00-eventsource.html'));
+        return;
+    }
+
+    if ($request->getPath() !== '/demo') {
+        $response->writeHead(404);
+        $response->end('Not Found');
         return;
     }
 
     echo 'connected' . PHP_EOL;
 
-    $headers = $request->getHeaders();
-    $id = isset($headers['Last-Event-ID']) ? $headers['Last-Event-ID'] : null;
+    $id = $request->getHeaderLine('Last-Event-ID');
 
     $response->writeHead(200, array('Content-Type' => 'text/event-stream'));
     $channel->connect($response, $id);