cs fixer fixes

Author: Adam Grabek

Module.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @copyright Copyright (c) 2014 Zend Technologies USA Inc. (http://www.zend.com)
@@ -17,40 +18,40 @@
 use ZF\ApiProblem\View\ApiProblemStrategy;
 
 /**
- * ZF2 module
+ * ZF2 module.
  */
 class Module
 {
     /**
-     * Retrieve autoloader configuration
+     * Retrieve autoloader configuration.
      *
      * @return array
      */
     public function getAutoloaderConfig()
     {
         return [
             'Zend\Loader\StandardAutoloader' => ['namespaces' => [
-                __NAMESPACE__ => __DIR__ . '/src/',
+                __NAMESPACE__ => __DIR__.'/src/',
             ]],
         ];
     }
 
     /**
-     * Retrieve module configuration
+     * Retrieve module configuration.
      *
      * @return array
      */
     public function getConfig()
     {
-        return include __DIR__ . '/config/module.config.php';
+        return include __DIR__.'/config/module.config.php';
     }
 
     /**
-     * Listener for bootstrap event
+     * Listener for bootstrap event.
      *
      * Attaches a render event.
      *
-     * @param  \Zend\Mvc\MvcEvent $e
+     * @param \Zend\Mvc\MvcEvent $e
      */
     public function onBootstrap($e)
     {
@@ -65,7 +66,6 @@ public function onBootstrap($e)
         /** @var SendResponseListener $sendResponseListener */
         $sendResponseListener = $serviceManager->get('SendResponseListener');
 
-
         $apiProblemListener->attach($eventManager);
         $eventManager->attach(MvcEvent::EVENT_RENDER, [$this, 'onRender'], 100);
 
@@ -77,11 +77,11 @@ public function onBootstrap($e)
     }
 
     /**
-     * Listener for the render event
+     * Listener for the render event.
      *
      * Attaches a rendering/response strategy to the View.
      *
-     * @param  \Zend\Mvc\MvcEvent $e
+     * @param \Zend\Mvc\MvcEvent $e
      */
     public function onRender($e)
     {

ModuleTest.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * Creator: adamgrabek
  * Date: 08.06.2016
- * Time: 00:06
+ * Time: 00:06.
  */
 
 namespace ZF\ApiProblem;
@@ -17,31 +18,26 @@
 use ZF\ApiProblem\Listener\ApiProblemListener;
 use ZF\ApiProblem\Listener\SendApiProblemResponseListener;
 
-
 class ModuleTest extends TestCase
 {
-
     public function testOnBootstrap()
     {
         $module = new Module();
 
-
-        $application = $this->getMock(Application::class, [], [], '', FALSE);
+        $application = $this->getMock(Application::class, [], [], '', false);
         $serviceLocator = $this->getMockForAbstractClass(ServiceLocatorInterface::class);
         $serviceLocator->method('get')->will($this->returnCallback([$this, 'serviceLocator']));
 
         $eventManager = new EventManager(new SharedEventManager());
         $event = $this->getMock(MvcEvent::class);
 
-
         $application->method('getServiceManager')->willReturn($serviceLocator);
         $application->method('getEventManager')->willReturn($eventManager);
         $event->expects($this->once())->method('getTarget')->willReturn($application);
 
         $module->onBootstrap($event);
     }
 
-
     public function serviceLocator($service)
     {
         switch ($service) {
@@ -60,4 +56,4 @@ public function serviceLocator($service)
                 //
         }
     }
-}
+}

composer.json

@@ -38,7 +38,8 @@
         "phpunit/phpunit": "~4.7",
         "zendframework/zend-console": "2.6.*",
         "zendframework/zend-loader": "2.5.*",
-        "squizlabs/php_codesniffer": "^2.3.1"
+        "squizlabs/php_codesniffer": "^2.3.1",
+        "fabpot/php-cs-fixer": "1.9.*"
     },
     "autoload": {
         "psr-4": {

config/module.config.php

@@ -1,9 +1,9 @@
 <?php
+
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @copyright Copyright (c) 2014 Zend Technologies USA Inc. (http://www.zend.com)
  */
-
 use ZF\ApiProblem\Factory\ApiProblemListenerFactory;
 use ZF\ApiProblem\Factory\ApiProblemRendererFactory;
 use ZF\ApiProblem\Factory\ApiProblemStrategyFactory;
@@ -17,25 +17,25 @@
 
 return [
     'service_manager' => [
-        'aliases'   => [
-            'ZF\ApiProblem\ApiProblemListener'  => ApiProblemListener::class,
+        'aliases' => [
+            'ZF\ApiProblem\ApiProblemListener' => ApiProblemListener::class,
             'ZF\ApiProblem\RenderErrorListener' => RenderErrorListener::class,
-            'ZF\ApiProblem\ApiProblemRenderer'  => ApiProblemRenderer::class,
-            'ZF\ApiProblem\ApiProblemStrategy'  => ApiProblemStrategy::class,
+            'ZF\ApiProblem\ApiProblemRenderer' => ApiProblemRenderer::class,
+            'ZF\ApiProblem\ApiProblemStrategy' => ApiProblemStrategy::class,
         ],
         'factories' => [
-            ApiProblemListener::class             => ApiProblemListenerFactory::class,
-            RenderErrorListener::class            => RenderErrorListenerFactory::class,
+            ApiProblemListener::class => ApiProblemListenerFactory::class,
+            RenderErrorListener::class => RenderErrorListenerFactory::class,
             SendApiProblemResponseListener::class => SendApiProblemResponseListenerFactory::class,
-            ApiProblemRenderer::class             => ApiProblemRendererFactory::class,
-            ApiProblemStrategy::class             => ApiProblemStrategyFactory::class,
+            ApiProblemRenderer::class => ApiProblemRendererFactory::class,
+            ApiProblemStrategy::class => ApiProblemStrategyFactory::class,
         ],
     ],
 
     'view_manager' => [
         // Enable this in your application configuration in order to get full
         // exception stack traces in your API-Problem responses.
-        'display_exceptions' => FALSE,
+        'display_exceptions' => false,
     ],
 
     'zf-api-problem' => [

src/ApiProblem.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @copyright Copyright (c) 2014 Zend Technologies USA Inc. (http://www.zend.com)
@@ -7,19 +8,20 @@
 namespace ZF\ApiProblem;
 
 /**
- * Object describing an API-Problem payload
+ * Object describing an API-Problem payload.
  */
 class ApiProblem
 {
     /**
-     * Additional details to include in report
+     * Additional details to include in report.
      *
      * @var array
      */
     protected $additionalDetails = [];
 
     /**
-     * URL describing the problem type; defaults to HTTP status codes
+     * URL describing the problem type; defaults to HTTP status codes.
+     *
      * @var string
      */
     protected $type = 'http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html';
@@ -47,19 +49,19 @@ class ApiProblem
     protected $status;
 
     /**
-     * Normalized property names for overloading
+     * Normalized property names for overloading.
      *
      * @var array
      */
     protected $normalizedProperties = [
-        'type'   => 'type',
+        'type' => 'type',
         'status' => 'status',
-        'title'  => 'title',
+        'title' => 'title',
         'detail' => 'detail',
     ];
 
     /**
-     * Status titles for common problems
+     * Status titles for common problems.
      *
      * @var array
      */
@@ -113,7 +115,7 @@ class ApiProblem
     protected $title;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * Create an instance using the provided information. If nothing is
      * provided for the type field, the class default will be used;
@@ -141,7 +143,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)
         ) {
@@ -150,7 +152,7 @@ public function __construct($status, $detail, $type = null, $title = null, array
 
         $this->status = $status;
         $this->detail = $detail;
-        $this->title  = $title;
+        $this->title = $title;
 
         if (null !== $type) {
             $this->type = $type;
@@ -160,17 +162,20 @@ public function __construct($status, $detail, $type = null, $title = null, array
     }
 
     /**
-     * Retrieve properties
+     * Retrieve properties.
+     *
+     * @param string $name
      *
-     * @param  string $name
      * @return mixed
+     *
      * @throws Exception\InvalidArgumentException
      */
     public function __get($name)
     {
         $normalized = strtolower($name);
         if (in_array($normalized, array_keys($this->normalizedProperties))) {
             $prop = $this->normalizedProperties[$normalized];
+
             return $this->{$prop};
         }
 
@@ -189,15 +194,15 @@ public function __get($name)
     }
 
     /**
-     * Cast to an array
+     * Cast to an array.
      *
      * @return array
      */
     public function toArray()
     {
         $problem = [
-            'type'   => $this->type,
-            'title'  => $this->getTitle(),
+            'type' => $this->type,
+            'title' => $this->getTitle(),
             'status' => $this->getStatus(),
             'detail' => $this->getDetail(),
         ];
@@ -209,17 +214,19 @@ public function toArray()
      * Set the flag indicating whether an exception detail should include a
      * stack trace and previous exception information.
      *
-     * @param  bool $flag
+     * @param bool $flag
+     *
      * @return ApiProblem
      */
     public function setDetailIncludesStackTrace($flag)
     {
         $this->detailIncludesStackTrace = (bool) $flag;
+
         return $this;
     }
 
     /**
-     * Retrieve the API-Problem detail
+     * Retrieve the API-Problem detail.
      *
      * If an exception was provided, creates the detail message from it;
      * otherwise, detail as provided is used.
@@ -236,7 +243,7 @@ protected function getDetail()
     }
 
     /**
-     * Retrieve the API-Problem HTTP status code
+     * Retrieve the API-Problem HTTP status code.
      *
      * If an exception was provided, creates the status code from it;
      * otherwise, code as provided is used.
@@ -253,7 +260,7 @@ protected function getStatus()
     }
 
     /**
-     * Retrieve the title
+     * Retrieve the title.
      *
      * If the default $type is used, and the $status is found in
      * $problemStatusTitles, then use the matching title.
@@ -309,9 +316,9 @@ protected function createDetailFromException()
         $e = $e->getPrevious();
         while ($e) {
             $previous[] = [
-                'code'    => (int) $e->getCode(),
+                'code' => (int) $e->getCode(),
                 'message' => trim($e->getMessage()),
-                'trace'   => $e->getTrace(),
+                'trace' => $e->getTrace(),
             ];
             $e = $e->getPrevious();
         }
@@ -329,7 +336,7 @@ protected function createDetailFromException()
      */
     protected function createStatusFromException()
     {
-        $e      = $this->detail;
+        $e = $this->detail;
         $status = $e->getCode();
 
         if (!empty($status)) {