cs: Fix code style (safe rules only).

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -1,38 +1,42 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
-use Doctrine\ORM\EntityManagerInterface;
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Translation\TranslatorInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Translation\TranslatorInterface;
 
 abstract class AbstractElementController extends Controller
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
      * @var LoggerInterface
      */
     protected $chillMainLogger;
-    
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -44,94 +48,14 @@ abstract class AbstractElementController extends Controller
     }
 
     /**
-     * @return AbstractElement the newly created element
-     */
-    abstract protected function createNewElement();
-    
-    abstract protected function getType();
-
-    /**
-     * 
-     */
-    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
-    {
-        /* @var $element \Chill\AMLI\BudgetBundle\Entity\AbstractElement */
-        $element = $this->createNewElement()
-            ->setPerson($person)
-            ;
-        
-        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
-        
-        $form = $this->createForm($this->getType(), $element);
-        $form->add('submit', SubmitType::class);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() and $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($element);
-            $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
-            
-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $person->getId()
-            ]);
-        } elseif ($form->isSubmitted()) {
-            $this->addFlash('error', $this->translator->trans('This form contains errors'));
-        }
-        
-        return $this->render($template, array(
-            'form' => $form->createView(),
-            'person' => $person,
-            'element' => $element
-        ));
-    }
-
-    /**
-     * 
-     * @param AbstractElement $element
-     * @param Request $request
-     * @param string $template
-     * @param string $flashOnSuccess
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
-    {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
-        
-        $form = $this->createForm($this->getType(), $element);
-        $form->add('submit', SubmitType::class);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() and $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans($flashOnSuccess));
-            
-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $element->getPerson()->getId()
-            ]);
-        }
-        
-        return $this->render($template, array(
-            'element' => $element,
-            'form' => $form->createView(),
-            'person' => $element->getPerson()
-        ));
-    }
-    
-    /**
-     * 
      * Route(
      *  "{_locale}/family-members/family-members/{id}/delete",
      *  name="chill_family_members_family_members_delete"
-     * )
-     * 
-     * @param AbstractElement $element
-     * @param Request $request
+     * ).
+     *
+     * @param mixed $template
+     * @param mixed $flashMessage
+     *
      * @return \Symfony\Component\BrowserKit\Response
      */
     protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
@@ -145,63 +69,140 @@ abstract class AbstractElementController extends Controller
             $form->handleRequest($request);
 
             if ($form->isValid()) {
-                $this->chillMainLogger->notice("A budget element has been removed", array(
-                   'family_element' => get_class($element),
-                   'by_user' => $this->getUser()->getUsername(),
-                   'family_member_id' => $element->getId(),
-                   'amount' => $element->getAmount(),
-                   'type' => $element->getType()
-                ));
+                $this->chillMainLogger->notice('A budget element has been removed', [
+                    'family_element' => get_class($element),
+                    'by_user' => $this->getUser()->getUsername(),
+                    'family_member_id' => $element->getId(),
+                    'amount' => $element->getAmount(),
+                    'type' => $element->getType(),
+                ]);
 
                 $em = $this->getDoctrine()->getManager();
                 $em->remove($element);
                 $em->flush();
 
                 $this->addFlash('success', $this->translator
-                        ->trans($flashMessage));
+                    ->trans($flashMessage));
 
-                return $this->redirectToRoute('chill_budget_elements_index', array(
-                     'id' => $element->getPerson()->getId()
-                  ));
+                return $this->redirectToRoute('chill_budget_elements_index', [
+                    'id' => $element->getPerson()->getId(),
+                ]);
             }
         }
 
-
-        return $this->render($template, array(
-           'element' => $element,
-           'delete_form' => $form->createView()
-        ));
+        return $this->render($template, [
+            'element' => $element,
+            'delete_form' => $form->createView(),
+        ]);
     }
-    
+
+    /**
+     * @param string $template
+     * @param string $flashOnSuccess
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
+    {
+        $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
+
+        $form = $this->createForm($this->getType(), $element);
+        $form->add('submit', SubmitType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() and $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->flush();
+
+            $this->addFlash('success', $this->translator->trans($flashOnSuccess));
+
+            return $this->redirectToRoute('chill_budget_elements_index', [
+                'id' => $element->getPerson()->getId(),
+            ]);
+        }
+
+        return $this->render($template, [
+            'element' => $element,
+            'form' => $form->createView(),
+            'person' => $element->getPerson(),
+        ]);
+    }
+
+    /**
+     * @param mixed $template
+     * @param mixed $flashMessageOnSuccess
+     */
+    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
+    {
+        /* @var $element \Chill\AMLI\BudgetBundle\Entity\AbstractElement */
+        $element = $this->createNewElement()
+            ->setPerson($person);
+
+        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
+
+        $form = $this->createForm($this->getType(), $element);
+        $form->add('submit', SubmitType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() and $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($element);
+            $em->flush();
+
+            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
+
+            return $this->redirectToRoute('chill_budget_elements_index', [
+                'id' => $person->getId(),
+            ]);
+        }
+
+        if ($form->isSubmitted()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
+        }
+
+        return $this->render($template, [
+            'form' => $form->createView(),
+            'person' => $person,
+            'element' => $element,
+        ]);
+    }
+
     /**
      * Route(
      *  "{_locale}/family-members/family-members/{id}/view",
      *  name="chill_family_members_family_members_view"
-     * )
+     * ).
+     *
+     * @param mixed $template
      */
     protected function _view(AbstractElement $element, $template)
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
-        
-        return $this->render($template, array(
-            'element' => $element
-        ));
+
+        return $this->render($template, [
+            'element' => $element,
+        ]);
     }
-    
+
+    /**
+     * @return AbstractElement the newly created element
+     */
+    abstract protected function createNewElement();
+
+    abstract protected function getType();
+
     /**
      * Creates a form to delete a help request entity by id.
      *
-     * @param mixed $id The entity id
-     *
      * @return \Symfony\Component\Form\Form The form
      */
     private function createDeleteForm()
     {
         return $this->createFormBuilder()
             ->setMethod(Request::METHOD_DELETE)
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
     }
-
 }

src/Bundle/ChillBudgetBundle/Controller/ChargeController.php

@@ -1,102 +1,96 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\AMLI\BudgetBundle\Controller\AbstractElementController;
 use Chill\AMLI\BudgetBundle\Entity\Charge;
 use Chill\AMLI\BudgetBundle\Form\ChargeType;
 use Chill\PersonBundle\Entity\Person;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Request;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ChargeController extends AbstractElementController
 {
-    protected function getType()
-    {
-        return ChargeType::class;
-    }
-    
-    protected function createNewElement()
-    {
-        return new Charge();
-    }
-    
     /**
-     * 
      * @Route(
-     *  "{_locale}/budget/charge/{id}/view",
-     *  name="chill_budget_charge_view"
+     *     "{_locale}/budget/charge/{id}/delete",
+     *     name="chill_budget_charge_delete"
      * )
-     * @param Charge $charge
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function deleteAction(Request $request, Charge $charge)
+    {
+        return $this->_delete(
+            $charge,
+            $request,
+            '@ChillAMLIBudget/Charge/confirm_delete.html.twig',
+            'Charge deleted'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/{id}/edit",
+     *     name="chill_budget_charge_edit"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function editAction(Request $request, Charge $charge)
+    {
+        return $this->_edit(
+            $charge,
+            $request,
+            '@ChillAMLIBudget/Charge/edit.html.twig',
+            'Charge updated'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/by-person/{id}/new",
+     *     name="chill_budget_charge_new"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newAction(Request $request, Person $person)
+    {
+        return $this->_new(
+            $person,
+            $request,
+            '@ChillAMLIBudget/Charge/new.html.twig',
+            'Charge created'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/{id}/view",
+     *     name="chill_budget_charge_view"
+     * )
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function viewAction(Charge $charge)
     {
         return $this->_view($charge, '@ChillAMLIBudget/Charge/view.html.twig');
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/charge/by-person/{id}/new",
-     *  name="chill_budget_charge_new"
-     * )
-     * 
-     * @param Request $request
-     * @param Person $person
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function newAction(Request $request, Person $person)
+
+    protected function createNewElement()
     {
-        return $this->_new(
-            $person, 
-            $request, 
-            '@ChillAMLIBudget/Charge/new.html.twig', 
-            'Charge created');
+        return new Charge();
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/charge/{id}/edit",
-     *  name="chill_budget_charge_edit"
-     * )
-     * 
-     * @param Request $request
-     * @param Charge $charge
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function editAction(Request $request, Charge $charge)
+
+    protected function getType()
     {
-        return $this->_edit(
-            $charge, 
-            $request, 
-            '@ChillAMLIBudget/Charge/edit.html.twig', 
-            'Charge updated');
-    }
-    
-    /**
-     * 
-     * @Route(
-     *  "{_locale}/budget/charge/{id}/delete",
-     *  name="chill_budget_charge_delete"
-     * )
-     * 
-     * @param Request $request
-     * @param Charge $charge
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function deleteAction(Request $request, Charge $charge)
-    {
-        return $this->_delete(
-            $charge, 
-            $request, 
-            '@ChillAMLIBudget/Charge/confirm_delete.html.twig', 
-            'Charge deleted');
+        return ChargeType::class;
     }
 }

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -1,46 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Translation\TranslatorInterface;
-use Psr\Log\LoggerInterface;
+use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
 use Chill\AMLI\BudgetBundle\Entity\Charge;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
+use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_merge;
 
 class ElementController extends Controller
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
-    
-    /**
-     *
      * @var CalculatorManager
      */
     protected $calculator;
-    
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $chillMainLogger;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -52,45 +55,44 @@ class ElementController extends Controller
         $this->chillMainLogger = $chillMainLogger;
         $this->calculator = $calculator;
     }
-    
+
     /**
      * @Route(
-     *  "{_locale}/budget/elements/by-person/{id}",
-     *  name="chill_budget_elements_index"
+     *     "{_locale}/budget/elements/by-person/{id}",
+     *     name="chill_budget_elements_index"
      * )
      */
     public function indexAction(Person $person)
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $person);
-        
+
         $charges = $this->em
             ->getRepository(Charge::class)
             ->findByPerson($person);
         $ressources = $this->em
             ->getRepository(Resource::class)
             ->findByPerson($person);
-        
-        $now = new \DateTime('now');
-        
+
+        $now = new DateTime('now');
+
         $actualCharges = $this->em
             ->getRepository(Charge::class)
             ->findByPersonAndDate($person, $now);
         $actualResources = $this->em
             ->getRepository(Resource::class)
             ->findByPersonAndDate($person, $now);
-        
-        $elements = \array_merge($actualCharges, $actualResources);
-        
+
+        $elements = array_merge($actualCharges, $actualResources);
+
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
-        
-        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', array(
+
+        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', [
             'person' => $person,
             'charges' => $charges,
             'resources' => $ressources,
-            'results' => $results ?? []
-        ));
+            'results' => $results ?? [],
+        ]);
     }
-
 }

src/Bundle/ChillBudgetBundle/Controller/ResourceController.php

@@ -1,103 +1,96 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\AMLI\BudgetBundle\Controller\AbstractElementController;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
 use Chill\AMLI\BudgetBundle\Form\ResourceType;
 use Chill\PersonBundle\Entity\Person;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Request;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ResourceController extends AbstractElementController
 {
-
-    protected function getType()
-    {
-        return ResourceType::class;
-    }
-    
-    protected function createNewElement()
-    {
-        return new Resource();
-    }
-    
     /**
-     * 
      * @Route(
-     *  "{_locale}/budget/resource/{id}/view",
-     *  name="chill_budget_resource_view"
+     *     "{_locale}/budget/resource/{id}/delete",
+     *     name="chill_budget_resource_delete"
      * )
-     * @param Request $request
-     * @param Resource $resource
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function deleteAction(Request $request, Resource $resource)
+    {
+        return $this->_delete(
+            $resource,
+            $request,
+            '@ChillAMLIBudget/Resource/confirm_delete.html.twig',
+            'Resource deleted'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/resource/{id}/edit",
+     *     name="chill_budget_resource_edit"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function editAction(Request $request, Resource $resource)
+    {
+        return $this->_edit(
+            $resource,
+            $request,
+            '@ChillAMLIBudget/Resource/edit.html.twig',
+            'Resource updated'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/resource/by-person/{id}/new",
+     *     name="chill_budget_resource_new"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newAction(Request $request, Person $person)
+    {
+        return $this->_new(
+            $person,
+            $request,
+            '@ChillAMLIBudget/Resource/new.html.twig',
+            'Resource created'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/resource/{id}/view",
+     *     name="chill_budget_resource_view"
+     * )
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function viewAction(Resource $resource)
     {
         return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig');
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/resource/by-person/{id}/new",
-     *  name="chill_budget_resource_new"
-     * )
-     * 
-     * @param Request $request
-     * @param Person $person
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function newAction(Request $request, Person $person)
+
+    protected function createNewElement()
     {
-        return $this->_new(
-            $person, 
-            $request, 
-            '@ChillAMLIBudget/Resource/new.html.twig', 
-            'Resource created');
+        return new Resource();
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/resource/{id}/edit",
-     *  name="chill_budget_resource_edit"
-     * )
-     * 
-     * @param Request $request
-     * @param Resource $resource
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function editAction(Request $request, Resource $resource)
+
+    protected function getType()
     {
-        return $this->_edit(
-            $resource, 
-            $request, 
-            '@ChillAMLIBudget/Resource/edit.html.twig', 
-            'Resource updated');
-    }
-    
-    /**
-     * 
-     * @Route(
-     *  "{_locale}/budget/resource/{id}/delete",
-     *  name="chill_budget_resource_delete"
-     * )
-     * 
-     * @param Request $request
-     * @param Resource $resource
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function deleteAction(Request $request, Resource $resource)
-    {
-        return $this->_delete($resource, 
-            $request, 
-            '@ChillAMLIBudget/Resource/confirm_delete.html.twig', 
-            'Resource deleted');
+        return ResourceType::class;
     }
 }