Merge pull request #647 from entering/status-code-message-instead-empty

lsmith77 · lsmith77 · commit 468a7738e9a9 · 2013-12-27T11:50:05.000-08:00
At Exception controller show status code message
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -173,7 +173,9 @@ protected function getExceptionMessage($exception)
         $exceptionMap = $this->container->getParameter('fos_rest.exception.messages');
         $showExceptionMessage = $this->isSubclassOf($exception, $exceptionMap);
 
-        return $showExceptionMessage || $this->container->get('kernel')->isDebug() ? $exception->getMessage() : '';
+        return $showExceptionMessage || $this->container->get('kernel')->isDebug()
+            ? $exception->getMessage()
+            : Response::$statusTexts[$this->getStatusCode($exception)];
     }
 
     /**
@@ -186,7 +188,7 @@ protected function getExceptionMessage($exception)
     protected function getStatusCode($exception)
     {
         $exceptionMap = $this->container->getParameter('fos_rest.exception.codes');
-        $isExceptionMappedToStatusCode = $this->isSubclassOf($exception, $exceptionMap);;
+        $isExceptionMappedToStatusCode = $this->isSubclassOf($exception, $exceptionMap);
 
         return ($isExceptionMappedToStatusCode) ? $isExceptionMappedToStatusCode : $exception->getStatusCode();
     }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,9 @@ protected function getExceptionMessage($exception)`
`173`	`173`	`$exceptionMap = $this->container->getParameter('fos_rest.exception.messages');`
`174`	`174`	`$showExceptionMessage = $this->isSubclassOf($exception, $exceptionMap);`
`175`	`175`
`176`		`- return $showExceptionMessage \|\| $this->container->get('kernel')->isDebug() ? $exception->getMessage() : '';`
	`176`	`+ return $showExceptionMessage \|\| $this->container->get('kernel')->isDebug()`
	`177`	`+ ? $exception->getMessage()`
	`178`	`+ : Response::$statusTexts[$this->getStatusCode($exception)];`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`/**`
`@@ -186,7 +188,7 @@ protected function getExceptionMessage($exception)`
`186`	`188`	`protected function getStatusCode($exception)`
`187`	`189`	`{`
`188`	`190`	`$exceptionMap = $this->container->getParameter('fos_rest.exception.codes');`
`189`		`- $isExceptionMappedToStatusCode = $this->isSubclassOf($exception, $exceptionMap);;`
	`191`	`+ $isExceptionMappedToStatusCode = $this->isSubclassOf($exception, $exceptionMap);`
`190`	`192`
`191`	`193`	`return ($isExceptionMappedToStatusCode) ? $isExceptionMappedToStatusCode : $exception->getStatusCode();`
`192`	`194`	`}`