Merge branch 'master' of https://github.com/dingo/api

Author: hskrasek

src/Event/RequestWasMatched.php

@@ -24,8 +24,8 @@ class RequestWasMatched
     /**
      * Create a new request was matched event.
      *
-     * @param \Dingo\Api\Http\Request                   $response
-     * @param \Illuminate\Contracts\Container\Container $content
+     * @param \Dingo\Api\Http\Request                   $request
+     * @param \Illuminate\Contracts\Container\Container $app
      *
      * @return void
      */

src/Routing/Route.php

@@ -217,8 +217,9 @@ protected function mergeControllerProperties()
     /**
      * Find the controller options and whether or not it will apply to this routes controller method.
      *
-     * @param string   $option
-     * @param \Closure $callback
+     * @param string $name
+     *
+     * @return array
      */
     protected function findControllerPropertyOptions($name)
     {

src/Transformer/Adapter/Fractal.php

@@ -161,7 +161,7 @@ protected function createResource($response, $transformer, array $parameters)
      */
     public function parseFractalIncludes(Request $request)
     {
-        $includes = $request->get($this->includeKey);
+        $includes = $request->input($this->includeKey);
 
         if (! is_array($includes)) {
             $includes = array_filter(explode($this->includeSeparator, $includes));