Skip to content

Add some conflict info #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 26, 2018
Merged

Add some conflict info #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa42177
Update some phpDoc
stiv-pro Feb 26, 2018
2b516ff
Add conflict info
stiv-pro Feb 26, 2018
542f29b
Update composer.json
wollanup Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@
"phpunit/phpunit": "^6.0",
"propel/propel": "~2.0@dev",
"slim/slim": "3.*"
},
"conflict": {
"wollanup/php-api-rest-swagger": "<0.1"
}
}
5 changes: 3 additions & 2 deletions src/Slim/Handlers/Strategies/ActionStrategy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public function __construct(ContainerInterface $container)
* @param array $routeArguments
*
* @return mixed
* @throws \Exception
*/
public function __invoke(
callable $callable,
Expand Down Expand Up @@ -95,6 +96,7 @@ public function callAction(
* @param $routeArguments
*
* @return array
* @throws \ReflectionException
*/
protected function buildParams(
callable $callable,
Expand Down Expand Up @@ -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,
Expand Down