cs: Fix code style (safe rules only).

src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php

@@ -1,75 +1,60 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-namespace Chill\TaskBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\TaskBundle\Repository\SingleTaskRepository;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\TaskBundle\Entity\SingleTask;
-use Chill\PersonBundle\Form\Type\PickPersonType;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
-use Chill\TaskBundle\Workflow\TaskWorkflowManager;
 
 /**
+ * Chill is a software for social workers
  *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+namespace Chill\TaskBundle\Form;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
+use Chill\PersonBundle\Form\Type\PickPersonType;
+use Chill\TaskBundle\Entity\SingleTask;
+use Chill\TaskBundle\Repository\SingleTaskRepository;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Chill\TaskBundle\Workflow\TaskWorkflowManager;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use function array_combine;
+use function array_map;
+
 class SingleTaskListType extends AbstractType
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
     /**
-     *
      * @var TaskWorkflowManager
      */
     protected $taskWorkflowManager;
-    
+
+    /**
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+
     public function __construct(
-        EntityManagerInterface $em, 
-        TokenStorageInterface $tokenStorage, 
+        EntityManagerInterface $em,
+        TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
         TaskWorkflowManager $taskWorkflowManager
     ) {
@@ -79,7 +64,6 @@ class SingleTaskListType extends AbstractType
         $this->taskWorkflowManager = $taskWorkflowManager;
     }
 
-    
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $statuses = [
@@ -87,56 +71,54 @@ class SingleTaskListType extends AbstractType
             'Tasks with expired deadline' => SingleTaskRepository::DATE_STATUS_ENDED,
             'Tasks with warning deadline reached' => SingleTaskRepository::DATE_STATUS_WARNING,
             'Current tasks' => SingleTaskRepository::DATE_STATUS_CURRENT,
-            'Closed tasks' => 'closed' 
+            'Closed tasks' => 'closed',
         ];
-        
+
         $builder
             ->add('user_id', ChoiceType::class, [
                 'choices' => $this->getUserChoices($options),
                 'placeholder' => 'Any user',
                 'required' => false,
-                'label' => 'Assignee'
-            ])
-            ;
-        
+                'label' => 'Assignee',
+            ]);
+
         if ($options['add_status']) {
             $builder
                 ->add('status', ChoiceType::class, [
                     'choices' => $statuses,
                     'expanded' => true,
                     'multiple' => true,
-                    'label' => 'status'
+                    'label' => 'status',
                 ]);
         }
-        
+
         if ($options['add_type']) {
             $types = $this->getTaskTypesChoices($options);
-            
+
             if (count($types) > 0) {
                 $builder->add('types', ChoiceType::class, [
                     'choices' => $types,
                     'required' => false,
                     'expanded' => true,
                     'multiple' => true,
-                    'label' => 'Task types'
+                    'label' => 'Task types',
                 ]);
             }
-            
         }
-        
-        if ($options['person'] === null) {
+
+        if (null === $options['person']) {
             $builder
                 ->add('person_id', PickPersonType::class, [
                     'centers' => $this->authorizationHelper
                         ->getReachableCenters(
                             $this->tokenStorage->getToken()->getUser(),
                             new Role(TaskVoter::SHOW)
-                            ),
+                        ),
                     'required' => false,
-                    'label' => 'Associated person'
-                ])
-            ;
+                    'label' => 'Associated person',
+                ]);
             $reachablesCenters = $this->getReachablesCenters();
+
             if (count($reachablesCenters) > 1) {
                 $builder
                     ->add('center_id', EntityType::class, [
@@ -144,7 +126,7 @@ class SingleTaskListType extends AbstractType
                         'choices' => $reachablesCenters,
                         'label' => 'Center',
                         'required' => false,
-                        'placeholder' => 'All centers'
+                        'placeholder' => 'All centers',
                     ]);
             }
         } else {
@@ -152,130 +134,8 @@ class SingleTaskListType extends AbstractType
             $builder
                 ->add('person_id', HiddenType::class);
             $builder->get('person_id')
-                ->addModelTransformer(new PersonToIdTransformer($this->em))
-                ;
+                ->addModelTransformer(new PersonToIdTransformer($this->em));
         }
-        
-    }
-    
-    protected function getUserChoices($options)
-    {
-        $users = $this->getUsersAssigneedToTask($options);
-        $choices = \array_combine(
-            // get usernames
-            \array_map(function(User $user) { return $user->getUsername(); }, $users),
-            // get ids    
-            \array_map(function(User $user) { return $user->getId(); }, $users)
-            );
-        $choices['Unassigned'] = '_unassigned';
-        
-        return $choices;
-    }
-    
-    protected function getTaskTypesChoices($options)
-    {
-        $qb = $this->em->createQueryBuilder();
-        $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
-        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
-        
-        $qb->select('DISTINCT task.type AS type')
-            ->from(SingleTask::class, 'task')
-            ->join('task.person', 'person')
-            ;
-        
-        $i = 0;
-        $orCenters = $qb->expr()->orX();
-        foreach($centers as $center) {
-            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
-            
-            if (count($circles) > 0) {
-                $andX = $qb->expr()->andX();
-                $andX
-                    ->add($qb->expr()->eq('person.center', ':center_'.$i))
-                    ->add($qb->expr()->in('task.circle', ':circles_'.$i))
-                    ;
-                $orCenters->add($andX);
-                
-                $qb
-                    ->setParameter('center_'.$i, $center)
-                    ->setParameter('circles_'.$i, $circles)
-                    ;
-                $i++;
-            }
-        }
-        
-        if ($i > 0) {
-            $qb->where($orCenters);
-        }
-        
-        $types = $qb->getQuery()->getResult();
-        
-        $choices = [];
-        
-        foreach ($types as $row) {
-            $fake = (new SingleTask())->setType($row['type']);
-            $label = $this->taskWorkflowManager->getWorkflowMetadata($fake, 'definition.name');
-            $choices[$label] = $row['type'];
-        }
-        
-        return $choices;
-    }
-    
-    /**
-     * Return a list of user having a task assigned.
-     * 
-     * @return User[]
-     */
-    protected function getUsersAssigneedToTask($options)
-    {
-        $qb = $this->em->createQueryBuilder();
-        $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
-        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
-        
-        $qb->select('DISTINCT user')
-            ->from(User::class, 'user')
-            ->join(SingleTask::class, 'task', \Doctrine\ORM\Query\Expr\Join::WITH, 'task.assignee = user')
-            ->join('task.person', 'person')
-            ->where("user.enabled = 'TRUE'")
-            ;
-        
-        if (NULL !== $options['person']) {
-            $qb
-                ->andWhere($qb->expr()->eq('task.person', ':person'))
-                ->setParameter('person', $options['person'])
-                ;
-        }
-        
-        $i = 0;
-        $circleCenterCond = $qb->expr()->orX();
-        foreach ($centers as $center) {
-            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
-            // add condition about person and circle
-            $circleCenterCond->add(
-                $qb->expr()->andX()
-                    ->add($qb->expr()->eq('person.center', ':center_'.$i))
-                    ->add($qb->expr()->in('task.circle', ':circles_'.$i))
-                );
-            
-            $qb->setParameter('center_'.$i, $center)
-                ->setParameter('circles_'.$i, $circles)
-                ;
-            // increase counter
-            $i++;
-        }
-        $qb->andWhere($circleCenterCond);   
-        
-        return $qb->getQuery()->getResult();
-    }
-    
-    protected function getReachablesCenters()
-    {
-        $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
-        
-        return $this->authorizationHelper->getReachableCenters($user, $role);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -290,7 +150,124 @@ class SingleTaskListType extends AbstractType
             ->setAllowedTypes('add_status', ['bool'])
             ->setDefined('add_type')
             ->setDefault('add_type', false)
-            ->setAllowedTypes('add_type', ['bool'])
-            ;
+            ->setAllowedTypes('add_type', ['bool']);
+    }
+
+    protected function getReachablesCenters()
+    {
+        $user = $this->tokenStorage->getToken()->getUser();
+        $role = new Role(TaskVoter::SHOW);
+
+        return $this->authorizationHelper->getReachableCenters($user, $role);
+    }
+
+    protected function getTaskTypesChoices($options)
+    {
+        $qb = $this->em->createQueryBuilder();
+        $user = $this->tokenStorage->getToken()->getUser();
+        $role = new Role(TaskVoter::SHOW);
+        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
+
+        $qb->select('DISTINCT task.type AS type')
+            ->from(SingleTask::class, 'task')
+            ->join('task.person', 'person');
+
+        $i = 0;
+        $orCenters = $qb->expr()->orX();
+
+        foreach ($centers as $center) {
+            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
+
+            if (count($circles) > 0) {
+                $andX = $qb->expr()->andX();
+                $andX
+                    ->add($qb->expr()->eq('person.center', ':center_' . $i))
+                    ->add($qb->expr()->in('task.circle', ':circles_' . $i));
+                $orCenters->add($andX);
+
+                $qb
+                    ->setParameter('center_' . $i, $center)
+                    ->setParameter('circles_' . $i, $circles);
+                ++$i;
+            }
+        }
+
+        if (0 < $i) {
+            $qb->where($orCenters);
+        }
+
+        $types = $qb->getQuery()->getResult();
+
+        $choices = [];
+
+        foreach ($types as $row) {
+            $fake = (new SingleTask())->setType($row['type']);
+            $label = $this->taskWorkflowManager->getWorkflowMetadata($fake, 'definition.name');
+            $choices[$label] = $row['type'];
+        }
+
+        return $choices;
+    }
+
+    protected function getUserChoices($options)
+    {
+        $users = $this->getUsersAssigneedToTask($options);
+        $choices = array_combine(
+            // get usernames
+            array_map(function (User $user) { return $user->getUsername(); }, $users),
+            // get ids
+            array_map(function (User $user) { return $user->getId(); }, $users)
+        );
+        $choices['Unassigned'] = '_unassigned';
+
+        return $choices;
+    }
+
+    /**
+     * Return a list of user having a task assigned.
+     *
+     * @param mixed $options
+     *
+     * @return User[]
+     */
+    protected function getUsersAssigneedToTask($options)
+    {
+        $qb = $this->em->createQueryBuilder();
+        $user = $this->tokenStorage->getToken()->getUser();
+        $role = new Role(TaskVoter::SHOW);
+        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
+
+        $qb->select('DISTINCT user')
+            ->from(User::class, 'user')
+            ->join(SingleTask::class, 'task', \Doctrine\ORM\Query\Expr\Join::WITH, 'task.assignee = user')
+            ->join('task.person', 'person')
+            ->where("user.enabled = 'TRUE'");
+
+        if (null !== $options['person']) {
+            $qb
+                ->andWhere($qb->expr()->eq('task.person', ':person'))
+                ->setParameter('person', $options['person']);
+        }
+
+        $i = 0;
+        $circleCenterCond = $qb->expr()->orX();
+
+        foreach ($centers as $center) {
+            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
+            // add condition about person and circle
+            $circleCenterCond->add(
+                $qb->expr()->andX()
+                    ->add($qb->expr()->eq('person.center', ':center_' . $i))
+                    ->add($qb->expr()->in('task.circle', ':circles_' . $i))
+            );
+
+            $qb->setParameter('center_' . $i, $center)
+                ->setParameter('circles_' . $i, $circles);
+            // increase counter
+            ++$i;
+        }
+        $qb->andWhere($circleCenterCond);
+
+        return $qb->getQuery()->getResult();
     }
 }

src/Bundle/ChillTaskBundle/Form/SingleTaskType.php

@@ -1,28 +1,37 @@
 <?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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\TaskBundle\Form;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\DateIntervalType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Form\Type\DateIntervalType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
 
 class SingleTaskType extends AbstractType
 {
-    private ParameterBagInterface $parameterBag;
     private CenterResolverDispatcherInterface $centerResolverDispatcher;
+
+    private ParameterBagInterface $parameterBag;
+
     private ScopeResolverDispatcher $scopeResolverDispatcher;
 
     public function __construct(
@@ -40,7 +49,7 @@ class SingleTaskType extends AbstractType
         $center = null;
         $isScopeConcerned = false;
 
-        if (NULL !== $task = $options['data']) {
+        if (null !== $task = $options['data']) {
             $center = $this->centerResolverDispatcher->resolveCenter($task);
             $isScopeConcerned = $this->scopeResolverDispatcher->isConcerned($task);
         }
@@ -48,23 +57,23 @@ class SingleTaskType extends AbstractType
         $builder
             ->add('title', TextType::class)
             ->add('description', ChillTextareaType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('assignee', UserPickerType::class, [
                 'required' => false,
                 'center' => $center,
-                'role'   => TaskVoter::SHOW,
+                'role' => TaskVoter::SHOW,
                 'placeholder' => 'Not assigned',
-                'attr' => [ 'class' => ' select2 ']
-                ])
+                'attr' => ['class' => ' select2 '],
+            ])
             ->add('startDate', ChillDateType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('endDate', ChillDateType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('warningInterval', DateIntervalType::class, [
-                'required' => false
+                'required' => false,
             ]);
 
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
@@ -72,7 +81,7 @@ class SingleTaskType extends AbstractType
                 ->add('circle', ScopePickerType::class, [
                     'center' => $center,
                     'role' => $options['role'],
-                    'required' => false
+                    'required' => false,
                 ]);
         }
     }
@@ -81,7 +90,6 @@ class SingleTaskType extends AbstractType
     {
         $resolver
             ->setRequired('role')
-            ->setAllowedTypes('role', [ Role::class, 'string' ])
-            ;
+            ->setAllowedTypes('role', [Role::class, 'string']);
     }
 }