Merge branch 'hotfix/103'

Close #103

Author: weierophinney

NOTES.md

@@ -360,7 +360,7 @@ Additionally, it MAY need:
 - Options (any other options/metadata regarding the route to pass on to the
   router)
 
-Finally, by having `route()` reurn the `Route` instance, the user can further
+Finally, by having `route()` return the `Route` instance, the user can further
 customize it. I would argue that *only* options be mutable, however, as the
 combination of path + HTTP method is what determines whether or not routes have
 conflicts.

doc/book/features.md

@@ -43,7 +43,7 @@ features it provides include:
   routing library that best fits the project needs. By default, we provide
   wrappers for Aura.Router, FastRoute, and the zend-mvc router.
 
-- **contaienr-interop**
+- **container-interop**
 
   Expressive encourages the use of Dependency Injection, and defines its
   `Application` class to compose a container-interop `ContainerInterface`

doc/book/router/interface.md

@@ -157,7 +157,7 @@ namespace Zend\Expressive\Router;
 class RouteResult
 {
     /**
-     * Create an instance repesenting a route success.
+     * Create an instance representing a route success.
      *
      * @param string $name Name of matched route.
      * @param callable|string $middleware Middleware associated with the
@@ -168,7 +168,7 @@ class RouteResult
     public static function fromRouteMatch($name, $middleware, array $params);
 
     /**
-     * Create an instance repesenting a route failure.
+     * Create an instance representing a route failure.
      *
      * @param null|int|array $methods HTTP methods allowed for the current URI, if any
      * @return static
@@ -183,7 +183,7 @@ class RouteResult
     public function isSuccess();
 
     /**
-     * Retreive the matched route name, if possible.
+     * Retrieve the matched route name, if possible.
      *
      * If this result represents a failure, return false; otherwise, return the
      * matched route name.
@@ -203,7 +203,7 @@ class RouteResult
     /**
      * Returns the matched params.
      *
-     * Guaranted to return an array, even if it is simply empty.
+     * Guaranteed to return an array, even if it is simply empty.
      *
      * @return array
      */

src/Container/WhoopsFactory.php

@@ -37,7 +37,7 @@
  * ]
  * </code>
  *
- * All values are booleans; ommision of any implies boolean false.
+ * All values are booleans; omission of any implies boolean false.
  */
 class WhoopsFactory
 {

src/Router/RouteResult.php

@@ -76,7 +76,7 @@ public static function fromRouteMatch($name, $middleware, array $params)
     }
 
     /**
-     * Create an instance repesenting a route failure.
+     * Create an instance representing a route failure.
      *
      * @param null|int|array $methods HTTP methods allowed for the current URI, if any
      * @return static
@@ -108,7 +108,7 @@ public function isSuccess()
     }
 
     /**
-     * Retreive the matched route name, if possible.
+     * Retrieve the matched route name, if possible.
      *
      * If this result represents a failure, return false; otherwise, return the
      * matched route name.

src/Router/Zf2.php

@@ -170,7 +170,7 @@ private function createRouter()
     }
 
     /**
-     * Create a succesful RouteResult from the given RouteMatch.
+     * Create a successful RouteResult from the given RouteMatch.
      *
      * @param RouteMatch $match
      * @return RouteResult

src/TemplatedErrorHandler.php

@@ -120,7 +120,7 @@ public function __invoke(Request $request, Response $response, $err = null)
      * If a template renderer is present, passes the following to the template
      * specified in the $templateError property:
      *
-     * - error (the error itsel)
+     * - error (the error itself)
      * - uri
      * - status (response status)
      * - reason (reason associated with response status)