Merge branch 'hotfix/50'

Close #50

Author: weierophinney

composer.json

@@ -37,7 +37,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",
-        "squizlabs/php_codesniffer": "^2.3.1"
+        "squizlabs/php_codesniffer": "^2.7"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -9,6 +9,12 @@
     <!-- inherit rules from: -->
     <rule ref="PSR2"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
         <properties>
             <property name="ignoreBlankLines" value="false"/>

phpcs.xml

@@ -153,7 +153,7 @@ public function __construct($status, $detail, $type = null, $title = null, array
         }
 
         // Ensure a valid HTTP status
-        if (!is_numeric($status)
+        if (! is_numeric($status)
             || ($status < 100)
             || ($status > 599)
         ) {
@@ -313,7 +313,7 @@ protected function createDetailFromException()
         /** @var Exception|Throwable $e */
         $e = $this->detail;
 
-        if (!$this->detailIncludesStackTrace) {
+        if (! $this->detailIncludesStackTrace) {
             return $e->getMessage();
         }
 

src/ApiProblem.php

@@ -69,7 +69,7 @@ public function getContent()
     public function getHeaders()
     {
         $headers = parent::getHeaders();
-        if (!$headers->has('content-type')) {
+        if (! $headers->has('content-type')) {
             $headers->addHeaderLine('content-type', ApiProblem::CONTENT_TYPE);
         }
 
@@ -86,7 +86,7 @@ public function getHeaders()
      */
     public function getReasonPhrase()
     {
-        if (!empty($this->reasonPhrase)) {
+        if (! empty($this->reasonPhrase)) {
             return $this->reasonPhrase;
         }
 

src/ApiProblemResponse.php

@@ -46,7 +46,7 @@ class ApiProblemListener extends AbstractListenerAggregate
      */
     public function __construct($filters = null)
     {
-        if (!empty($filters)) {
+        if (! empty($filters)) {
             if (is_string($filters)) {
                 $this->acceptFilters = [$filters];
             }
@@ -81,14 +81,14 @@ public function attach(EventManagerInterface $events, $priority = 1)
      */
     public function onRender(MvcEvent $e)
     {
-        if (!$this->validateErrorEvent($e)) {
+        if (! $this->validateErrorEvent($e)) {
             return;
         }
 
         // Next, do we have a view model in the result?
         // If not, nothing more to do.
         $model = $e->getResult();
-        if (!$model instanceof ModelInterface || $model instanceof ApiProblemModel) {
+        if (! $model instanceof ModelInterface || $model instanceof ApiProblemModel) {
             return;
         }
 
@@ -122,13 +122,13 @@ public function onDispatch(MvcEvent $e)
         $services = $app->getServiceManager();
         $config = $services->get('config');
 
-        if (!isset($config['zf-api-problem']['render_error_controllers'])) {
+        if (! isset($config['zf-api-problem']['render_error_controllers'])) {
             return;
         }
 
         $controller = $e->getRouteMatch()->getParam('controller');
         $controllers = $config['zf-api-problem']['render_error_controllers'];
-        if (!in_array($controller, $controllers)) {
+        if (! in_array($controller, $controllers)) {
             // The current controller is not in our list of controllers to handle
             return;
         }
@@ -150,13 +150,13 @@ public function onDispatch(MvcEvent $e)
      */
     public function onDispatchError(MvcEvent $e)
     {
-        if (!$this->validateErrorEvent($e)) {
+        if (! $this->validateErrorEvent($e)) {
             return;
         }
 
         // Marshall an ApiProblem and view model based on the exception
         $exception = $e->getParam('exception');
-        if (!$exception instanceof \Exception) {
+        if (! $exception instanceof \Exception) {
             // If it's not an exception, do not know what to do.
             return;
         }
@@ -178,24 +178,24 @@ public function onDispatchError(MvcEvent $e)
     protected function validateErrorEvent(MvcEvent $e)
     {
         // only worried about error pages
-        if (!$e->isError()) {
+        if (! $e->isError()) {
             return false;
         }
 
         // and then, only if we have an Accept header...
         $request = $e->getRequest();
-        if (!$request instanceof HttpRequest) {
+        if (! $request instanceof HttpRequest) {
             return false;
         }
 
         $headers = $request->getHeaders();
-        if (!$headers->has('Accept')) {
+        if (! $headers->has('Accept')) {
             return false;
         }
 
         // ... that matches certain criteria
         $accept = $headers->get('Accept');
-        if (!$this->matchAcceptCriteria($accept)) {
+        if (! $this->matchAcceptCriteria($accept)) {
             return false;
         }
 

src/Listener/ApiProblemListener.php

@@ -66,7 +66,7 @@ public function onRenderError(MvcEvent $e)
 
         $exception = $e->getParam('exception');
         if ($exception instanceof \Exception
-            && !$exception instanceof ViewExceptionInterface
+            && ! $exception instanceof ViewExceptionInterface
         ) {
             $code = $exception->getCode();
             if ($code >= 100 && $code <= 600) {

src/Listener/RenderErrorListener.php

@@ -76,7 +76,7 @@ public function displayExceptions()
     public function sendContent(SendResponseEvent $e)
     {
         $response = $e->getResponse();
-        if (!$response instanceof ApiProblemResponse) {
+        if (! $response instanceof ApiProblemResponse) {
             return $this;
         }
         $response->getApiProblem()->setDetailIncludesStackTrace($this->displayExceptions());
@@ -97,7 +97,7 @@ public function sendContent(SendResponseEvent $e)
     public function sendHeaders(SendResponseEvent $e)
     {
         $response = $e->getResponse();
-        if (!$response instanceof ApiProblemResponse) {
+        if (! $response instanceof ApiProblemResponse) {
             return $this;
         }
 
@@ -118,7 +118,7 @@ public function sendHeaders(SendResponseEvent $e)
     public function __invoke(SendResponseEvent $event)
     {
         $response = $event->getResponse();
-        if (!$response instanceof ApiProblemResponse) {
+        if (! $response instanceof ApiProblemResponse) {
             return $this;
         }
 

src/Listener/SendApiProblemResponseListener.php

@@ -40,7 +40,7 @@ public function setDisplayExceptions($flag)
      */
     public function render($nameOrModel, $values = null)
     {
-        if (!$nameOrModel instanceof ApiProblemModel) {
+        if (! $nameOrModel instanceof ApiProblemModel) {
             return '';
         }
 

src/View/ApiProblemRenderer.php

@@ -41,7 +41,7 @@ public function selectRenderer(ViewEvent $e)
     {
         $model = $e->getModel();
 
-        if (!$model instanceof ApiProblemModel) {
+        if (! $model instanceof ApiProblemModel) {
             // unrecognized model; do nothing
             return;
         }
@@ -61,13 +61,13 @@ public function selectRenderer(ViewEvent $e)
     public function injectResponse(ViewEvent $e)
     {
         $result = $e->getResult();
-        if (!is_string($result)) {
+        if (! is_string($result)) {
             // We don't have a string, and thus, no JSON
             return;
         }
 
         $model = $e->getModel();
-        if (!$model instanceof ApiProblemModel) {
+        if (! $model instanceof ApiProblemModel) {
             // Model is not an ApiProblemModel; we cannot handle it here
             return;
         }