Add and apply cs fixer config

jsor · Feb 17, 2015 · e9ffe96 · e9ffe96
1 parent d2f4e6d
commit e9ffe96
Show file tree

Hide file tree

Showing 18 changed files with 104 additions and 85 deletions.
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,20 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(__DIR__)
+;
+
+return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->fixers(array(
+        'concat_with_spaces',
+        'ordered_use',
+        'extra_empty_lines',
+        'phpdoc_params',
+        'remove_lines_between_uses',
+        'return',
+        'unused_use',
+        'whitespacy_lines',
+        'short_array_syntax'
+    ))
+    ->finder($finder);
diff --git a/src/EventListener/ExceptionConversionListener.php b/src/EventListener/ExceptionConversionListener.php
@@ -3,7 +3,6 @@
 namespace Jsor\Stack\Hal\EventListener;
 
 use Jsor\Stack\Hal\ExceptionConverter;
-use Jsor\Stack\Hal\Response\VndErrorResponse;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
@@ -46,8 +45,8 @@ public function onKernelException(GetResponseForExceptionEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::EXCEPTION => 'onKernelException',
-        );
+        ];
     }
 }
diff --git a/src/EventListener/RequestFormatValidationListener.php b/src/EventListener/RequestFormatValidationListener.php
@@ -31,8 +31,8 @@ public function onKernelRequest(GetResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::REQUEST => 'onKernelRequest'
-        );
+        ];
     }
 }
diff --git a/src/EventListener/ResponseConversionListener.php b/src/EventListener/ResponseConversionListener.php
@@ -28,8 +28,8 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::VIEW => 'onKernelView'
-        );
+        ];
     }
 }
diff --git a/src/Exception/ErrorException.php b/src/Exception/ErrorException.php
@@ -24,9 +24,9 @@ public function __construct(array $errors,
 
     public function getHal()
     {
-        $data = array(
+        $data = [
             'message' => $this->getMessage()
-        );
+        ];
 
         if ($this->logref) {
             $data['@logref'] = $this->logref;
@@ -43,9 +43,9 @@ private function appendErrors(Hal $hal, array $errors)
     {
         foreach ($errors as $error) {
             if (!is_array($error)) {
-                $error = array(
+                $error = [
                     'message' => (string) $error
-                );
+                ];
             }
 
             $hal->addResource('errors', new Hal(null, $error));

diff --git a/src/Exception/FormErrorException.php b/src/Exception/FormErrorException.php
@@ -26,9 +26,9 @@ public function __construct(FormInterface $form,
 
     public function getHal()
     {
-        $data = array(
+        $data = [
             'message' => $this->getMessage()
-        );
+        ];
 
         if ($this->logref) {
             $data['@logref'] = $this->logref;
@@ -45,9 +45,9 @@ private function appendErrors(Hal $hal, FormInterface $form, $path)
     {
         /* @var $error FormError */
         foreach ($form->getErrors() as $error) {
-            $data = array(
+            $data = [
                 'message' => $error->getMessage()
-            );
+            ];
 
             $path = rtrim($path, '/');
 

diff --git a/src/Exception/ValidationErrorException.php b/src/Exception/ValidationErrorException.php
@@ -25,9 +25,9 @@ public function __construct(ConstraintViolationListInterface $violationList,
 
     public function getHal()
     {
-        $data = array(
+        $data = [
             'message' => $this->getMessage()
-        );
+        ];
 
         if ($this->logref) {
             $data['@logref'] = $this->logref;
@@ -39,10 +39,10 @@ public function getHal()
             $path = str_replace('][', '/', $violation->getPropertyPath());
             $path = '/' . trim($path, '[]');
 
-            $data = array(
+            $data = [
                 'message' => $violation->getMessage(),
                 'path' => $path
-            );
+            ];
 
             $hal->addResource('errors', new Hal(null, $data));
         }

diff --git a/src/ExceptionConverter.php b/src/ExceptionConverter.php
@@ -96,7 +96,7 @@ public static function logException(LoggerInterface $logger, \Exception $excepti
         );
 
         $isCritical = !$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500;
-        $context = array('exception' => $exception);
+        $context = ['exception' => $exception];
 
         if ($isCritical) {
             $logger->critical($message, $context);

diff --git a/src/Response/CreatedResponse.php b/src/Response/CreatedResponse.php
@@ -6,7 +6,7 @@
 
 class CreatedResponse extends HalResponse
 {
-    public function __construct(Hal $hal, $headers = array(), $prettyPrint = true)
+    public function __construct(Hal $hal, $headers = [], $prettyPrint = true)
     {
         parent::__construct($hal, 201, $headers, $prettyPrint);
 
@@ -15,7 +15,7 @@ public function __construct(Hal $hal, $headers = array(), $prettyPrint = true)
         }
     }
 
-    public static function create($hal = null, $status = 201, $headers = array(), $prettyPrint = true)
+    public static function create($hal = null, $status = 201, $headers = [], $prettyPrint = true)
     {
         return new static($hal, $headers, $prettyPrint);
     }

diff --git a/src/Response/HalResponse.php b/src/Response/HalResponse.php
@@ -12,7 +12,7 @@ class HalResponse extends Response
     protected $requestFormat;
     protected $prettyPrint;
 
-    public function __construct(Hal $hal, $status = 200, $headers = array(), $prettyPrint = true)
+    public function __construct(Hal $hal, $status = 200, $headers = [], $prettyPrint = true)
     {
         parent::__construct(null, $status, $headers);
 
@@ -23,7 +23,7 @@ public function __construct(Hal $hal, $status = 200, $headers = array(), $pretty
         $this->headers->set('Content-Type', 'application/hal+json');
     }
 
-    public static function create($hal = null, $status = 200, $headers = array(), $prettyPrint = true)
+    public static function create($hal = null, $status = 200, $headers = [], $prettyPrint = true)
     {
         return new static($hal, $status, $headers, $prettyPrint);
     }

diff --git a/src/Response/VndErrorResponse.php b/src/Response/VndErrorResponse.php
@@ -10,14 +10,14 @@
 
 class VndErrorResponse extends HalResponse
 {
-    public function __construct(Hal $hal, $status = 500, $headers = array(), $prettyPrint = true)
+    public function __construct(Hal $hal, $status = 500, $headers = [], $prettyPrint = true)
     {
         parent::__construct($hal, $status, $headers, $prettyPrint);
 
         $this->headers->set('Content-Type', 'application/vnd.error+json');
     }
 
-    public static function create($hal = null, $status = 500, $headers = array(), $prettyPrint = true)
+    public static function create($hal = null, $status = 500, $headers = [], $prettyPrint = true)
     {
         return new static($hal, $status, $headers, $prettyPrint);
     }

diff --git a/tests/Exception/FormErrorExceptionTest.php b/tests/Exception/FormErrorExceptionTest.php
@@ -19,9 +19,9 @@ public function it_serializes_exception_to_json()
 
         $form = $formFactory->create(new FormType());
 
-        $data = array(
+        $data = [
             'additional' => 'foo'
-        );
+        ];
 
         $form->submit($data);
 

diff --git a/tests/Exception/ValidationErrorExceptionTest.php b/tests/Exception/ValidationErrorExceptionTest.php
@@ -13,15 +13,15 @@ class ValidationErrorExceptionTest extends \PHPUnit_Framework_TestCase
     /** @test */
     public function it_serializes_exception_to_json()
     {
-        $constraint = new Collection(array(
+        $constraint = new Collection([
             'email' => new Email(),
             'name' => new NotBlank(),
             'birthday' => new Date(),
-        ));
+        ]);
 
-        $data = array(
+        $data = [
             'additional' => 'foo'
-        );
+        ];
 
         $builder = new ValidatorBuilder();
 

diff --git a/tests/Fixtures/Form/FormType.php b/tests/Fixtures/Form/FormType.php
@@ -11,14 +11,14 @@ class FormType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('person', new PersonType(), array(
+            ->add('person', new PersonType(), [
                 'mapped' => false
-            ))
-            ->add('newsletter', 'checkbox', array(
-                'constraints' => array(
+            ])
+            ->add('newsletter', 'checkbox', [
+                'constraints' => [
                     new NotBlank()
-                ),
-            ));
+                ],
+            ]);
     }
 
     public function getName()

diff --git a/tests/Fixtures/Form/NameType.php b/tests/Fixtures/Form/NameType.php
@@ -12,20 +12,20 @@ class NameType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('first_name', 'text', array(
+            ->add('first_name', 'text', [
                 'mapped' => false,
-                'constraints' => array(
+                'constraints' => [
                     new NotBlank(),
-                    new Length(array('min' => 4)),
-                ),
-            ))
-            ->add('last_name', 'text', array(
+                    new Length(['min' => 4]),
+                ],
+            ])
+            ->add('last_name', 'text', [
                 'mapped' => false,
-                'constraints' => array(
+                'constraints' => [
                     new NotBlank(),
-                    new Length(array('min' => 4)),
-                ),
-            ));
+                    new Length(['min' => 4]),
+                ],
+            ]);
     }
 
     public function getName()

diff --git a/tests/Fixtures/Form/PersonType.php b/tests/Fixtures/Form/PersonType.php
@@ -12,19 +12,19 @@ class PersonType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('gender', 'choice', array(
-                'choices' => array('m' => 'Male', 'f' => 'Female'),
+            ->add('gender', 'choice', [
+                'choices' => ['m' => 'Male', 'f' => 'Female'],
                 'mapped' => false,
-                'constraints' => array(
+                'constraints' => [
                     new NotBlank()
-                ),
-            ))
-            ->add('name', new NameType(), array(
+                ],
+            ])
+            ->add('name', new NameType(), [
                 'mapped' => false,
-                'constraints' => array(
+                'constraints' => [
                     new Valid()
-                )
-            ));
+                ]
+            ]);
     }
 
     public function getName()

diff --git a/tests/Negotiation/HalNegotiatorTest.php b/tests/Negotiation/HalNegotiatorTest.php
@@ -17,20 +17,20 @@ public function it_accepts_hal_headers($acceptHeader, $expected)
 
     public static function provideAcceptHeaders()
     {
-        return array(
-            array('application/hal+json,application/json;q=0.9,*/*;q=0.8', 'json'),
-            array('application/json;q=0.9,*/*;q=0.8', 'json'),
-            array('application/x-json;q=0.9,*/*;q=0.8', 'json'),
+        return [
+            ['application/hal+json,application/json;q=0.9,*/*;q=0.8', 'json'],
+            ['application/json;q=0.9,*/*;q=0.8', 'json'],
+            ['application/x-json;q=0.9,*/*;q=0.8', 'json'],
 
-            array('application/hal+xml,text/xml;q=0.9,*/*;q=0.8', 'xml'),
-            array('text/xml;q=0.9,*/*;q=0.8', 'xml'),
-            array('application/xml;q=0.9,*/*;q=0.8', 'xml'),
-            array('application/x-xml;q=0.9,*/*;q=0.8', 'xml'),
+            ['application/hal+xml,text/xml;q=0.9,*/*;q=0.8', 'xml'],
+            ['text/xml;q=0.9,*/*;q=0.8', 'xml'],
+            ['application/xml;q=0.9,*/*;q=0.8', 'xml'],
+            ['application/x-xml;q=0.9,*/*;q=0.8', 'xml'],
 
-            array('text/html, application/json;q=0.8, text/csv;q=0.7', 'html'),
-            array('text/html', 'html'),
-            array('text/*, text/html, text/html;level=1, */*', 'html'),
-            array('text/html; q=0.0', null),
-        );
+            ['text/html, application/json;q=0.8, text/csv;q=0.7', 'html'],
+            ['text/html', 'html'],
+            ['text/*, text/html, text/html;level=1, */*', 'html'],
+            ['text/html; q=0.0', null],
+        ];
     }
 }
diff --git a/tests/RequestFormatNegotiatorTest.php b/tests/RequestFormatNegotiatorTest.php
@@ -33,20 +33,20 @@ public function it_accepts_hal_headers($acceptHeader, $format)
 
     public static function provideAcceptHeaders()
     {
-        return array(
-            array('application/hal+json,application/json;q=0.9,*/*;q=0.8', 'json'),
-            array('application/json;q=0.9,*/*;q=0.8', 'json'),
-            array('application/x-json;q=0.9,*/*;q=0.8', 'json'),
-
-            array('application/hal+xml,text/xml;q=0.9,*/*;q=0.8', 'xml'),
-            array('text/xml;q=0.9,*/*;q=0.8', 'xml'),
-            array('application/xml;q=0.9,*/*;q=0.8', 'xml'),
-            array('application/x-xml;q=0.9,*/*;q=0.8', 'xml'),
-
-            array('text/html, application/json;q=0.8, text/csv;q=0.7', 'html'),
-            array('text/html', 'html'),
-            array('text/*, text/html, text/html;level=1, */*', 'html'),
-            array('text/html; q=0.0', 'html'),
-        );
+        return [
+            ['application/hal+json,application/json;q=0.9,*/*;q=0.8', 'json'],
+            ['application/json;q=0.9,*/*;q=0.8', 'json'],
+            ['application/x-json;q=0.9,*/*;q=0.8', 'json'],
+
+            ['application/hal+xml,text/xml;q=0.9,*/*;q=0.8', 'xml'],
+            ['text/xml;q=0.9,*/*;q=0.8', 'xml'],
+            ['application/xml;q=0.9,*/*;q=0.8', 'xml'],
+            ['application/x-xml;q=0.9,*/*;q=0.8', 'xml'],
+
+            ['text/html, application/json;q=0.8, text/csv;q=0.7', 'html'],
+            ['text/html', 'html'],
+            ['text/*, text/html, text/html;level=1, */*', 'html'],
+            ['text/html; q=0.0', 'html'],
+        ];
     }
 }