Merge pull request #98 from CSBill/analysis-XVBGwK

Applied fixes from StyleCI
SolidInvoice · May 20, 2016 · 3c795a3 · 3c795a3
2 parents 87fba36 + 7155cf8
commit 3c795a3
Show file tree

Hide file tree

Showing 123 changed files with 636 additions and 636 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -17,7 +17,7 @@ class AppKernel extends Kernel implements ContainerClassKernelInterface
 {
     public function registerBundles()
     {
-        $bundles = array(
+        $bundles = [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
@@ -61,9 +61,9 @@ public function registerBundles()
             new CSBill\CronBundle\CSBillCronBundle(),
             new CSBill\MoneyBundle\CSBillMoneyBundle(),
             new CSBill\MenuBundle\CSBillMenuBundle(),
-        );
+        ];
 
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'])) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();

diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -168,7 +168,7 @@ public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $
  */
 class RequirementCollection implements IteratorAggregate
 {
-    private $requirements = array();
+    private $requirements = [];
 
     /**
      * Gets the current RequirementCollection as an Iterator.
@@ -279,7 +279,7 @@ public function all()
      */
     public function getRequirements()
     {
-        $array = array();
+        $array = [];
         foreach ($this->requirements as $req) {
             if (!$req->isOptional()) {
                 $array[] = $req;
@@ -296,7 +296,7 @@ public function getRequirements()
      */
     public function getFailedRequirements()
     {
-        $array = array();
+        $array = [];
         foreach ($this->requirements as $req) {
             if (!$req->isFulfilled() && !$req->isOptional()) {
                 $array[] = $req;
@@ -313,7 +313,7 @@ public function getFailedRequirements()
      */
     public function getRecommendations()
     {
-        $array = array();
+        $array = [];
         foreach ($this->requirements as $req) {
             if ($req->isOptional()) {
                 $array[] = $req;
@@ -330,7 +330,7 @@ public function getRecommendations()
      */
     public function getFailedRecommendations()
     {
-        $array = array();
+        $array = [];
         foreach ($this->requirements as $req) {
             if (!$req->isFulfilled() && $req->isOptional()) {
                 $array[] = $req;
@@ -432,7 +432,7 @@ public function __construct()
         );
 
         if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
-            $timezones = array();
+            $timezones = [];
             foreach (DateTimeZone::listAbbreviations() as $abbreviations) {
                 foreach ($abbreviations as $abbreviation) {
                     $timezones[$abbreviation['timezone_id']] = true;

diff --git a/app/app_check.php b/app/app_check.php
@@ -29,7 +29,7 @@
 
 echo '> Checking CSBill requirements:'.PHP_EOL.'  ';
 
-$messages = array();
+$messages = [];
 foreach ($appRequirements->getRequirements() as $req) {
     /** @var $req Requirement */
     if ($helpText = get_error_message($req, $lineSize)) {
@@ -108,15 +108,15 @@ function echo_title($title, $style = null)
 function echo_style($style, $message)
 {
     // ANSI color codes
-    $styles = array(
+    $styles = [
         'reset' => "\033[0m",
         'red' => "\033[31m",
         'green' => "\033[32m",
         'yellow' => "\033[33m",
         'error' => "\033[37;41m",
         'success' => "\033[37;42m",
         'title' => "\033[34m",
-    );
+    ];
     $supports = has_color_support();
 
     echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');

diff --git a/app/autoload.php b/app/autoload.php
@@ -13,6 +13,6 @@
 
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/app/check.php b/app/check.php
@@ -28,7 +28,7 @@
 
 echo '> Checking Symfony requirements:'.PHP_EOL.'  ';
 
-$messages = array();
+$messages = [];
 foreach ($symfonyRequirements->getRequirements() as $req) {
     /** @var $req Requirement */
     if ($helpText = get_error_message($req, $lineSize)) {
@@ -108,15 +108,15 @@ function echo_title($title, $style = null)
 function echo_style($style, $message)
 {
     // ANSI color codes
-    $styles = array(
+    $styles = [
         'reset' => "\033[0m",
         'red' => "\033[31m",
         'green' => "\033[32m",
         'yellow' => "\033[33m",
         'error' => "\033[37;41m",
         'success' => "\033[37;42m",
         'title' => "\033[34m",
-    );
+    ];
     $supports = has_color_support();
 
     echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');

diff --git a/src/CSBill/ApiBundle/Security/ApiTokenAuthenticator.php b/src/CSBill/ApiBundle/Security/ApiTokenAuthenticator.php
@@ -105,9 +105,9 @@ public function authenticateToken(TokenInterface $token, UserProviderInterface $
 
         $roles = array_merge(
             $user->getRoles(),
-            array(
+            [
                 'ROLE_API_AUTHENTICATED',
-            )
+            ]
         );
 
         return new PreAuthenticatedToken($user, $apiToken, $providerKey, $roles);
@@ -129,7 +129,7 @@ public function supportsToken(TokenInterface $token, $providerKey)
      */
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
     {
-        $response = array('message' => $exception->getMessage());
+        $response = ['message' => $exception->getMessage()];
 
         $content = $this->serializer->serialize($response, $request->getRequestFormat());
 

diff --git a/src/CSBill/ApiBundle/Security/Provider/ApiTokenUserProvider.php b/src/CSBill/ApiBundle/Security/Provider/ApiTokenUserProvider.php
@@ -50,7 +50,7 @@ public function getUsernameForToken($token)
      */
     public function loadUserByUsername($username)
     {
-        $user = $this->userRepository->findOneBy(array('username' => $username));
+        $user = $this->userRepository->findOneBy(['username' => $username]);
 
         if (!$user) {
             throw new UsernameNotFoundException();

diff --git a/src/CSBill/ClientBundle/Controller/AjaxController.php b/src/CSBill/ClientBundle/Controller/AjaxController.php
@@ -32,13 +32,13 @@ public function infoAction(Client $client, $type = 'quote')
     {
         $content = $this->renderView(
             'CSBillClientBundle:Ajax:info.html.twig',
-            array(
+            [
                 'client' => $client,
                 'type' => $type,
-            )
+            ]
         );
 
-        return $this->json(array('content' => $content));
+        return $this->json(['content' => $content]);
     }
 
     /**
@@ -60,9 +60,9 @@ public function addcontactAction(Request $request, Client $client)
         $contact = new Contact();
         $contact->setClient($client);
 
-        $form = $this->createForm('contact', $contact, array('allow_delete' => false));
+        $form = $this->createForm('contact', $contact, ['allow_delete' => false]);
 
-        $response = array();
+        $response = [];
 
         $form->handleRequest($request);
 
@@ -81,10 +81,10 @@ public function addcontactAction(Request $request, Client $client)
 
         $content = $this->renderView(
             'CSBillClientBundle:Ajax:contact_add.html.twig',
-            array(
+            [
                 'form' => $form->createView(),
                 'client' => $client,
-            )
+            ]
         );
         $response['content'] = $content;
 
@@ -111,7 +111,7 @@ public function editcontactAction(Request $request, Contact $contact)
 
         $originalContactDetails = $contact->getAdditionalDetails()->toArray();
 
-        $form = $this->createForm('contact', $contact, array('allow_delete' => false));
+        $form = $this->createForm('contact', $contact, ['allow_delete' => false]);
 
         if ($request->isMethod('POST')) {
             $contact->getAdditionalDetails()->clear();
@@ -128,16 +128,16 @@ public function editcontactAction(Request $request, Contact $contact)
         }
 
         return $this->json(
-            array(
+            [
                 'content' => $this->renderView(
                     'CSBillClientBundle:Ajax:contact_edit.html.twig',
-                    array(
+                    [
                         'form' => $form->createView(),
                         'contact' => $contact,
-                    )
+                    ]
                 ),
                 'status' => $status,
-            )
+            ]
         );
     }
 
@@ -208,7 +208,7 @@ public function deleteclientAction(Client $client)
 
         $this->flash($this->trans('client.delete_success'), 'success');
 
-        return $this->json(array('status' => 'success'));
+        return $this->json(['status' => 'success']);
     }
 
     /**

diff --git a/src/CSBill/ClientBundle/Entity/Contact.php b/src/CSBill/ClientBundle/Entity/Contact.php
@@ -299,7 +299,7 @@ public function getAdditionalDetail($type)
      */
     public function serialize()
     {
-        return serialize(array($this->id, $this->firstname, $this->lastname, $this->created, $this->updated));
+        return serialize([$this->id, $this->firstname, $this->lastname, $this->created, $this->updated]);
     }
 
     /**

diff --git a/src/CSBill/ClientBundle/Form/Client.php b/src/CSBill/ClientBundle/Form/Client.php
@@ -29,26 +29,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'contacts',
             new ContactType(),
-            array(
+            [
                 'type' => 'contact',
                 'allow_add' => true,
                 'allow_delete' => true,
                 'by_reference' => false,
                 'prototype' => true,
                 'prototype_name' => '__contact_prototype__',
-            )
+            ]
         );
 
         $builder->add(
             'addresses',
             'collection',
-            array(
+            [
                 'type' => new AddressType(),
                 'allow_add' => true,
                 'allow_delete' => true,
                 'by_reference' => false,
                 'required' => false,
-            )
+            ]
         );
     }
 
@@ -57,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array('data_class' => 'CSBill\ClientBundle\Entity\Client'));
+        $resolver->setDefaults(['data_class' => 'CSBill\ClientBundle\Entity\Client']);
     }
 
     /**

diff --git a/src/CSBill/ClientBundle/Form/ConstraintBuilder.php b/src/CSBill/ClientBundle/Form/ConstraintBuilder.php
@@ -23,7 +23,7 @@ class ConstraintBuilder
      */
     public static function build(array $options)
     {
-        $constraints = array();
+        $constraints = [];
 
         foreach ($options as $constraint) {
             $constraint = str_replace(' ', '', self::humanize($constraint));

diff --git a/src/CSBill/ClientBundle/Form/Contact.php b/src/CSBill/ClientBundle/Form/Contact.php
@@ -29,7 +29,7 @@ class Contact extends AbstractType
     /**
      * @param array $types
      */
-    public function __construct(array $types = array())
+    public function __construct(array $types = [])
     {
         $this->types = $types;
     }
@@ -47,11 +47,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $contactDetails = $builder->create(
                     'details_'.$item->getName(),
                     new PrimaryContactDetailType($item),
-                    array(
+                    [
                         'required' => true,
                         'property_path' => 'primaryDetails',
                         'by_reference' => true,
-                    )
+                    ]
                 );
 
                 $contactDetails->addModelTransformer(new DataTransformer\ContactDetailTransformer($item));
@@ -65,7 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'additionalDetails',
             new ContactDetailType(),
-            array(
+            [
                 'type' => new ContactDetail($this->types),
                 'allow_add' => true,
                 'allow_delete' => true,
@@ -76,10 +76,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'prototype' => true,
                 'prototype_name' => '__contact_details_prototype__',
                 'error_bubbling' => false,
-                'options' => array(
+                'options' => [
                     'data_class' => 'CSBill\ClientBundle\Entity\AdditionalContactDetail',
-                ),
-            )
+                ],
+            ]
         );
     }
 
@@ -97,11 +97,11 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
-            array(
+            [
                 'data_class' => 'CSBill\ClientBundle\Entity\Contact',
                 'csrf_protection' => false,
                 'allow_delete' => true,
-            )
+            ]
         );
     }
 

diff --git a/src/CSBill/ClientBundle/Form/ContactDetail.php b/src/CSBill/ClientBundle/Form/ContactDetail.php
@@ -35,12 +35,12 @@ public function __construct(array $types)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $options = array(
+        $options = [
             'data_class' => null,
-            'attr' => array(
+            'attr' => [
                 'class' => 'input-group-select-val',
-            ),
-        );
+            ],
+        ];
 
         $builder->add(
             $builder