Merge pull request #2800 from RyanNerd/null-comparison-improvement

Make null comparisons more clear in ErrorHandler
slimphp · Aug 13, 2019 · ed5ecf2 · ed5ecf2
2 parents fabf552 + 7062a5f
commit ed5ecf2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Slim/Handlers/ErrorHandler.php b/Slim/Handlers/ErrorHandler.php
@@ -138,7 +138,7 @@ public function __invoke(
         $this->exception = $exception;
         $this->method = $request->getMethod();
         $this->statusCode = $this->determineStatusCode();
-        if (is_null($this->contentType)) {
+        if ($this->contentType === null) {
             $this->contentType = $this->determineContentType($request);
         }
 
@@ -227,7 +227,7 @@ protected function determineContentType(ServerRequestInterface $request): ?strin
      */
     protected function determineRenderer(): callable
     {
-        if (!is_null($this->contentType) && array_key_exists($this->contentType, $this->errorRenderers)) {
+        if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
             $renderer = $this->errorRenderers[$this->contentType];
         } else {
             $renderer = $this->defaultErrorRenderer;
@@ -289,7 +289,7 @@ protected function logError(string $error): void
     protected function respond(): ResponseInterface
     {
         $response = $this->responseFactory->createResponse($this->statusCode);
-        if (!is_null($this->contentType) && array_key_exists($this->contentType, $this->errorRenderers)) {
+        if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
             $response = $response->withHeader('Content-type', $this->contentType);
         } else {
             $response = $response->withHeader('Content-type', $this->defaultErrorRendererContentType);