Adhere to Psr7 amid other things...

nbish11 · Apr 28, 2016 · f0e317f · f0e317f
1 parent dd3c152
commit f0e317f
Show file tree

Hide file tree

Showing 42 changed files with 2,984 additions and 892 deletions.
diff --git a/build/logs/clover.xml b/build/logs/clover.xml
diff --git a/composer.json b/composer.json
@@ -13,7 +13,8 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0"
+        "php": "^5.5 || ^7.0",
+        "psr/http-message": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -22,7 +23,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Meek\\Http\\Tests\\": "tests/"
+            "Meek\\Http\\": "tests/"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/example/FictionalRouter.php b/example/FictionalRouter.php
diff --git a/example/functions.php b/example/functions.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Gets the current HTTP request as sent by the client.
+ *
+ * @return Psr\Http\Message\RequestInterface The current request.
+ */
+function get_current_request() {
+    static $request;
+
+    if (!$request) {
+        $request = Meek\Http\ServerRequest::createFromGlobals();
+    }
+
+    return $request;
+}
+
+/**
+ * Sends a HTTP response to the client.
+ *
+ * @param string  $body    The response body to send to the client.
+ * @param integer $code    The HTTP status code.
+ * @param array   $headers A list of optional headers to add to the response.
+ *
+ * @return Psr\Http\Message\RequestInterface The sent response.
+ */
+function send_response($body = '', $code = 200, array $headers = []) {
+    $response = new Meek\Http\Response(null, $code, $headers);
+    $response->getBody()->write($body);
+
+    return $response->prepare(get_current_request())->send();
+}
diff --git a/example/index.php b/example/index.php
@@ -6,69 +6,15 @@
 
 // include external libraries
 require_once '../vendor/autoload.php';
-require_once 'FictionalRouter.php';
-
-// use statements
-use Meek\Http\Request;
-use Meek\Http\Session\PdoStorageDriver;
-use Meek\Http\Session;
-use Meek\Http\Response;
-use Meek\Http\RedirectedResponse;
-use Meek\Http\Exception as HttpException;
-
-// get the current request
-$request = Request::createFromGlobals();
-
-// manipulate the current URI
-$uri = $request->getUri();
-$uri->setPath(substr($uri->getPath(), strlen('/meek-http')));
-
-// initialize a session
-$dbh = new PDO('mysql:host=localhost;dbname=test', 'root', '', [
-    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
-]);
-$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-$handler = new PdoStorageDriver($dbh);
-$session = new Session($handler);
-
-$request->setSession($session);
-$request->session->start();
-
-// setup and initalize our application's routes
-$router = new FictionalRouter();
-
-// basic usage
-$router->map('GET', '/', function ($request) {
-    $username = $request->session->get('username', 'World');
-
-    return new Response(sprintf('Hello, %s!', $username));
-});
-
-// working with headers and redirections
-$router->map('GET', '/login', function ($request) {
-    $username = $request->server->get('PHP_AUTH_USER');
-    $password = $request->server->get('PHP_AUTH_PW');
-
-    if ($username === 'admin' && $password === 'password') {
-        $request->session->set('username', $username);
-        return new RedirectedResponse('/meek-http/account');
-    }
-
-    return new Response('Please sign in.', 401, [
-        'WWW-Authenticate' => sprintf('Basic realm=%s', 'site_login')
-    ]);
-});
-
-// working with JSON responses
-$router->map('GET', '/api/v1', function () {
-    $user = new stdClass();
-    $user->name = 'Nathan';
-    $user->dob = '24-02-1991';
-
-    return new Meek\Http\JsonResponse($user);
-});
-
-// save session to store and dispatch request
-$request->session->save();
-$router->dispatch($request);
+require_once 'functions.php';
+
+// dispatch a response based on the current request
+send_response('<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+    </head>
+    <body>
+        <video src="video.mp4" controls="controls"></video>
+    </body>
+</html>');
diff --git a/src/Collections/FileList.php b/src/Collections/FileList.php
diff --git a/src/Collections/ServerData.php b/src/Collections/ServerData.php