Merge pull request #59 from wollanup/develop

Add some conflict info
wollanup · Feb 26, 2018 · 1d5befc · 1d5befc
2 parents d07787b + 542f29b
commit 1d5befc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -35,5 +35,8 @@
     "phpunit/phpunit": "^6.0",
     "propel/propel": "~2.0@dev",
     "slim/slim": "3.*"
+  },
+  "conflict": {
+    "wollanup/php-api-rest-swagger": "<0.1"
   }
 }
diff --git a/src/Slim/Handlers/Strategies/ActionStrategy.php b/src/Slim/Handlers/Strategies/ActionStrategy.php
@@ -48,6 +48,7 @@ public function __construct(ContainerInterface $container)
      * @param array                  $routeArguments
      *
      * @return mixed
+     * @throws \Exception
      */
     public function __invoke(
         callable $callable,
@@ -95,6 +96,7 @@ public function callAction(
      * @param                                $routeArguments
      *
      * @return array
+     * @throws \ReflectionException
      */
     protected function buildParams(
         callable $callable,
@@ -200,8 +202,7 @@ protected function buildResponse($result, ResponseInterface $response)
      * @param array                  $routeArguments
      *
      * @return mixed
-     * @throws ResponseBuilderException
-     * @throws ResponseFormatterException
+     * @throws \Exception
      */
     protected function callHandler(
         callable $callable,