From fa4217760d89dacd39c3609e39aac55828531e6c Mon Sep 17 00:00:00 2001
From: Steve Mareigner <steve@eukles.com>
Date: Mon, 26 Feb 2018 15:37:10 +0100
Subject: [PATCH 1/3] Update some phpDoc

---
 src/Slim/Handlers/Strategies/ActionStrategy.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Slim/Handlers/Strategies/ActionStrategy.php b/src/Slim/Handlers/Strategies/ActionStrategy.php
index 0965a0f..9f75aea 100644
--- 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,

From 2b516ff7e536d1f25a59d545be198f2280adc44c Mon Sep 17 00:00:00 2001
From: Steve Mareigner <steve@eukles.com>
Date: Mon, 26 Feb 2018 16:40:59 +0100
Subject: [PATCH 2/3] Add conflict info

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 2c5f5b8..fb8f541 100644
--- 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": "<3.0"
   }
 }

From 542f29b312f376529c33902661ca46eeaf5e548e Mon Sep 17 00:00:00 2001
From: wollanup <steve.mareigner@gmail.com>
Date: Mon, 26 Feb 2018 16:43:24 +0100
Subject: [PATCH 3/3] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fb8f541..48b417e 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,6 @@
     "slim/slim": "3.*"
   },
   "conflict": {
-    "wollanup/php-api-rest": "<3.0"
+    "wollanup/php-api-rest-swagger": "<0.1"
   }
 }