Skip to content

Commit

Permalink
Merge branch 'rename-options-rendering' into 3.x
Browse files Browse the repository at this point in the history
Closes #2287
  • Loading branch information
akrabat committed Aug 14, 2017
2 parents afef745 + e3558a8 commit 052952c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Slim/Handlers/NotAllowed.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
if ($request->getMethod() === 'OPTIONS') {
$status = 200;
$contentType = 'text/plain';
$output = $this->renderPlainNotAllowedMessage($methods);
$output = $this->renderPlainOptionsMessage($methods);
} else {
$status = 405;
$contentType = $this->determineContentType($request);
Expand Down Expand Up @@ -70,12 +70,12 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
}

/**
* Render PLAIN not allowed message
* Render PLAIN message for OPTIONS response
*
* @param array $methods
* @return string
*/
protected function renderPlainNotAllowedMessage($methods)
protected function renderPlainOptionsMessage($methods)
{
$allow = implode(', ', $methods);

Expand Down

0 comments on commit 052952c

Please sign in to comment.