cs: Second part - ignore test/app subdirectory.

.php_cs.dist.php

@@ -15,6 +15,7 @@ $config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php
 $config
     ->getFinder()
     ->ignoreDotFiles(false)
+    ->notPath('tests/app')
     ->name(['.php_cs.dist.php']);
 
 $rules = $config->getRules();

docs/source/development/user-interface/widgets/ChillMainConfiguration.php

@@ -29,8 +29,7 @@ namespace Chill\MainBundle\DependencyInjection;
        public function __construct(
            array $widgetFactories = [],
            ContainerBuilder $containerBuilder
-       )
-       {
+       ) {
            // we register here widget factories (see below)
            $this->setWidgetFactories($widgetFactories);
            // we will need the container builder later...

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -50,7 +50,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
         foreach ($persons as $person) {
             $activityNbr = rand(0, 3);
 
-            for ($i = 0; $i < $activityNbr; ++$i ) {
+            for ($i = 0; $i < $activityNbr; ++$i) {
                 $activity = $this->newRandomActivity($person);
 
                 if (null !== $activity) {

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -30,8 +30,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         TranslatorInterface $translator
-    )
-    {
+    ) {
         $this->translator = $translator;
         $this->authorizationChecker = $authorizationChecker;
     }

src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php

@@ -71,8 +71,7 @@ class TranslatableActivityReasonTest extends TypeTestCase
     protected function getTranslatableStringHelper(
         $locale = 'en',
         $fallbackLocale = 'en'
-    )
-    {
+    ) {
         $prophet = new \Prophecy\Prophet();
         $requestStack = $prophet->prophesize();
         $request = $prophet->prophesize();

src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php

@@ -26,11 +26,11 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
  */
 class ActivityVoterTest extends KernelTestCase
 {
-    use PrepareUserTrait;
-    use PrepareCenterTrait;
-    use PrepareScopeTrait;
-    use PreparePersonTrait;
     use PrepareActivityTrait;
+    use PrepareCenterTrait;
+    use PreparePersonTrait;
+    use PrepareScopeTrait;
+    use PrepareUserTrait;
 
     /**
      * @var \Prophecy\Prophet
@@ -132,8 +132,7 @@ class ActivityVoterTest extends KernelTestCase
         Center $center,
         $attribute,
         $message
-    )
-    {
+    ) {
         $token = $this->prepareToken($user);
         $activity = $this->prepareActivity($scope, $this->preparePerson($center));
 

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php

@@ -54,8 +54,7 @@ class CustomFieldChoice extends AbstractCustomField
         TranslatorInterface $translator,
         TwigEngine $templating,
         TranslatableStringHelper $translatableStringHelper
-    )
-    {
+    ) {
         $this->defaultLocales = $translator->getFallbackLocales();
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php

@@ -41,8 +41,7 @@ class CustomFieldText extends AbstractCustomField
         RequestStack $requestStack,
         TwigEngine $templating,
         TranslatableStringHelper $translatableStringHelper
-    )
-    {
+    ) {
         $this->requestStack = $requestStack;
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php

@@ -41,8 +41,7 @@ class CustomFieldTitle extends AbstractCustomField
         RequestStack $requestStack,
         TwigEngine $templating,
         TranslatableStringHelper $translatableStringHelper
-    )
-    {
+    ) {
         $this->requestStack = $requestStack;
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;

src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php

@@ -25,8 +25,7 @@ class CustomFieldDataTransformer implements DataTransformerInterface
     public function __construct(
         CustomFieldInterface $customFieldDefinition,
         CustomField $customField
-    )
-    {
+    ) {
         $this->customFieldDefinition = $customFieldDefinition;
         $this->customField = $customField;
     }

src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php

@@ -39,8 +39,7 @@ class CustomFieldsHelper
     public function __construct(
         EntityManagerInterface $em,
         CustomFieldProvider $provider
-    )
-    {
+    ) {
         $this->em = $em;
         $this->provider = $provider;
     }

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -137,8 +137,7 @@ class DocGeneratorTemplateController extends AbstractController
     public function listTemplateApiAction(
         string $entityClassName,
         DocGeneratorTemplateRepository $templateRepository
-    ): Response
-    {
+    ): Response {
         $entities = $templateRepository->findByEntity($entityClassName);
 
         $ret = [];

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -551,8 +551,7 @@ class ParticipationController extends AbstractController
         Request $request,
         Participation $participation,
         bool $multiple = false
-    )
-    {
+    ) {
         $em = $this->getDoctrine()->getManager();
 
         if ($em->contains($participation)) {

src/Bundle/ChillEventBundle/Search/EventSearch.php

@@ -92,8 +92,7 @@ class EventSearch extends AbstractSearch
         $limit = 50,
         array $options = [],
         $format = 'html'
-    )
-    {
+    ) {
         $total = $this->count($terms);
         $paginator = $this->paginationFactory->create($total);
 

src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php

@@ -476,8 +476,7 @@ class ParticipationControllerTest extends WebTestCase
     protected function getRandomEventWithMultipleParticipations(
         $centerName = 'Center A',
         $circleName = 'social'
-    )
-    {
+    ) {
         $event = $this->getRandomEvent($centerName, $circleName);
 
         return $event->getParticipations()->count() > 1 ?

src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

@@ -714,8 +714,7 @@ class CRUDController extends AbstractController
         int $totalItems,
         PaginatorInterface $paginator,
         ?FilterOrderHelper $filterOrder = null
-    )
-    {
+    ) {
         $query = $this->queryEntities($action, $request, $paginator, $filterOrder);
 
         return $query->getQuery()->getResult();

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -206,6 +206,7 @@ class ExportController extends AbstractController
      *
      * @param string $alias
      * @param array $data the data from previous step. Required for steps 'formatter' and 'generate_formatter'
+     * @param mixed $step
      *
      * @return \Symfony\Component\Form\Form
      */

src/Bundle/ChillMainBundle/Controller/NotificationController.php

@@ -35,8 +35,7 @@ class NotificationController extends AbstractController
         NotificationRepository $notificationRepository,
         NotificationRenderer $notificationRenderer,
         PaginatorFactory $paginatorFactory
-    )
-    {
+    ) {
         $currentUser = $this->security->getUser();
 
         $notificationsNbr = $notificationRepository->countAllForAttendee(($currentUser));

src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php

@@ -526,8 +526,7 @@ class PermissionsGroupController extends AbstractController
     private function createDeleteRoleScopeForm(
         PermissionsGroup $permissionsGroup,
         RoleScope $roleScope
-    )
-    {
+    ) {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
                 'admin_permissionsgroup_delete_role_scope',

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php

@@ -47,8 +47,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     private function compileAggregators(
         Definition $chillManagerDefinition,
         ContainerBuilder $container
-    )
-    {
+    ) {
         $taggedServices = $container->findTaggedServiceIds(
             'chill.export_aggregator'
         );
@@ -79,8 +78,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     private function compileExportElementsProvider(
         Definition $chillManagerDefinition,
         ContainerBuilder $container
-    )
-    {
+    ) {
         $taggedServices = $container->findTaggedServiceIds(
             'chill.export_elements_provider'
         );
@@ -111,8 +109,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     private function compileExports(
         Definition $chillManagerDefinition,
         ContainerBuilder $container
-    )
-    {
+    ) {
         $taggedServices = $container->findTaggedServiceIds(
             'chill.export'
         );
@@ -143,8 +140,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     private function compileFilters(
         Definition $chillManagerDefinition,
         ContainerBuilder $container
-    )
-    {
+    ) {
         $taggedServices = $container->findTaggedServiceIds(
             'chill.export_filter'
         );
@@ -175,8 +171,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     private function compileFormatters(
         Definition $chillManagerDefinition,
         ContainerBuilder $container
-    )
-    {
+    ) {
         $taggedServices = $container->findTaggedServiceIds(
             'chill.export_formatter'
         );

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -27,8 +27,7 @@ class Configuration implements ConfigurationInterface
     public function __construct(
         array $widgetFactories,
         ContainerBuilder $containerBuilder
-    )
-    {
+    ) {
         $this->setWidgetFactories($widgetFactories);
         $this->containerBuilder = $containerBuilder;
     }

src/Bundle/ChillMainBundle/Export/ExportManager.php

@@ -92,8 +92,7 @@ class ExportManager
         AuthorizationCheckerInterface $authorizationChecker,
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage
-    )
-    {
+    ) {
         $this->logger = $logger;
         $this->em = $em;
         $this->authorizationChecker = $authorizationChecker;
@@ -602,8 +601,7 @@ class ExportManager
         QueryBuilder $qb,
         $data,
         array $center
-    )
-    {
+    ) {
         $aggregators = $this->retrieveUsedAggregators($data);
 
         foreach ($aggregators as $alias => $aggregator) {
@@ -626,8 +624,7 @@ class ExportManager
         QueryBuilder $qb,
         $data,
         array $centers
-    )
-    {
+    ) {
         $filters = $this->retrieveUsedFilters($data);
 
         foreach ($filters as $alias => $filter) {

src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php

@@ -55,8 +55,7 @@ class CSVFormatter implements FormatterInterface
     public function __construct(
         TranslatorInterface $translator,
         ExportManager $manager
-    )
-    {
+    ) {
         $this->translator = $translator;
         $this->exportManager = $manager;
     }

src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php

@@ -102,8 +102,7 @@ trait AppendScopeChoiceTypeTrait
         TranslatableStringHelper $translatableStringHelper,
         ObjectManager $om,
         $name = 'scope'
-    )
-    {
+    ) {
         $reachableScopes = $authorizationHelper
             ->getReachableScopes($user, $role, $center);
 

src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php

@@ -58,8 +58,7 @@ class PickCenterType extends AbstractType
         TokenStorageInterface $tokenStorage,
         ExportManager $exportManager,
         AuthorizationHelper $authorizationHelper
-    )
-    {
+    ) {
         $this->exportManager = $exportManager;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;

src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php

@@ -21,8 +21,7 @@ final class NotificationRenderer
     public function __construct(
         AccompanyingPeriodNotificationRenderer $accompanyingPeriodNotificationRenderer,
         ActivityNotificationRenderer $activityNotificationRenderer
-    )
-    {
+    ) {
         // TODO configure automatically
         // TODO CREER UNE INTERFACE POUR ETRE SUR QUE LES RENDERERS SONT OK
 

src/Bundle/ChillMainBundle/Search/SearchProvider.php

@@ -138,8 +138,7 @@ class SearchProvider
         $limit = 50,
         array $options = [],
         $format = 'html'
-    )
-    {
+    ) {
         $terms = $this->parse($pattern);
         $search = $this->getByName($name);
 
@@ -169,8 +168,7 @@ class SearchProvider
         $limit = 50,
         array $options = [],
         $format = 'html'
-    )
-    {
+    ) {
         $terms = $this->parse($pattern);
         $results = [];
 

src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php

@@ -35,6 +35,7 @@ class AddressRender implements ChillEntityRenderInterface
 
     /**
      * @param Address addr
+     * @param mixed $addr
      */
     public function renderBox($addr, array $options): string
     {

src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php

@@ -136,8 +136,7 @@ class PaginatorTest extends KernelTestCase
         $itemPerpage,
         $pageNumber,
         $expectedHasPage
-    )
-    {
+    ) {
         $paginator = $this->generatePaginator($totalItems, $itemPerpage);
 
         $this->assertEquals($expectedHasPage, $paginator->hasPage($pageNumber));

src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php

@@ -30,9 +30,9 @@ use function array_map;
  */
 class AuthorizationHelperTest extends KernelTestCase
 {
-    use PrepareUserTrait;
     use PrepareCenterTrait;
     use PrepareScopeTrait;
+    use PrepareUserTrait;
     use ProphecyTrait;
 
     public function setUp()
@@ -247,8 +247,7 @@ class AuthorizationHelperTest extends KernelTestCase
         Role $role,
         Center $center,
         $message
-    )
-    {
+    ) {
         $reachableScopes = $this->getAuthorizationHelper()
             ->getReachableScopes($user, $role, $center);
 

src/Bundle/ChillMainBundle/Tests/TestHelper.php

@@ -27,8 +27,7 @@ class TestHelper
     public static function getAuthenticatedClientOptions(
         $username = 'center a_social',
         $password = 'password'
-    )
-    {
+    ) {
         return [
             'PHP_AUTH_USER' => $username,
             'PHP_AUTH_PW' => $password,

src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php

@@ -39,8 +39,7 @@ class RoleScopeScopePresence extends ConstraintValidator
         RoleProvider $roleProvider,
         LoggerInterface $logger,
         TranslatorInterface $translator
-    )
-    {
+    ) {
         $this->roleProvider = $roleProvider;
         $this->logger = $logger;
         $this->translator = $translator;

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php

@@ -30,7 +30,7 @@ class LoadHouseholdPosition extends Fixture
     public function load(ObjectManager $manager)
     {
         foreach (self::POSITIONS_DATA as [$name, $share, $allowHolder,
-            $ordering, $ref]) {
+            $ordering, $ref, ]) {
             $position = (new Position())
                 ->setLabel(['fr' => $name])
                 ->setAllowHolder($allowHolder)

src/Bundle/ChillPersonBundle/Entity/Household/Household.php

@@ -197,7 +197,9 @@ class Household
                         }
 
                         return -1;
-                    } elseif ($b->getPosition() === null) {
+                    }
+
+                    if ($b->getPosition() === null) {
                         return 1;
                     }
 

src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php

@@ -26,9 +26,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
  */
 class PersonVoterTest extends KernelTestCase
 {
-    use PrepareUserTrait;
     use PrepareCenterTrait;
     use PrepareScopeTrait;
+    use PrepareUserTrait;
 
     /**
      * @var \Prophecy\Prophet

src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php

@@ -22,8 +22,7 @@ class AddAPersonWidget implements WidgetInterface
         $place,
         array $context,
         array $config
-    )
-    {
+    ) {
         return $env->render('ChillPersonBundle:Widget:homepage_add_a_person.html.twig');
     }
 }

src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php

@@ -59,8 +59,7 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
         ObjectManager $manager,
         array $name,
         array $options = []
-    )
-    {
+    ) {
         echo $name['fr'] . " \n";
 
         $cFGroup = (new CustomFieldsGroup())

src/Bundle/ChillReportBundle/Form/ReportType.php

@@ -49,8 +49,7 @@ class ReportType extends AbstractType
         TokenStorageInterface $tokenStorage,
         TranslatableStringHelper $translatableStringHelper,
         ObjectManager $om
-    )
-    {
+    ) {
         $this->authorizationHelper = $helper;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->translatableStringHelper = $translatableStringHelper;

src/Bundle/ChillReportBundle/Search/ReportSearch.php

@@ -46,8 +46,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
         EntityManagerInterface $em,
         AuthorizationHelper $helper,
         TokenStorageInterface $tokenStorage
-    )
-    {
+    ) {
         $this->em = $em;
         $this->helper = $helper;
 

src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php

@@ -416,8 +416,7 @@ class ReportControllerTest extends WebTestCase
         Person $person,
         CustomFieldsGroup $group,
         \Symfony\Component\BrowserKit\Client $client
-    )
-    {
+    ) {
         $url = sprintf(
             'fr/person/%d/report/cfgroup/%d/new',
             $person->getId(),

src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php

@@ -25,9 +25,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
  */
 class ReportVoterTest extends KernelTestCase
 {
-    use PrepareUserTrait;
     use PrepareCenterTrait;
     use PrepareScopeTrait;
+    use PrepareUserTrait;
 
     /**
      * @var \Prophecy\Prophet
@@ -131,8 +131,7 @@ class ReportVoterTest extends KernelTestCase
         $action,
         $message,
         ?User $user = null
-    )
-    {
+    ) {
         $token = $this->prepareToken($user);
         $result = $this->voter->vote($token, $report, [$action]);
         $this->assertEquals($expectedResult, $result, $message);

src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php

@@ -31,8 +31,7 @@ class MenuBuilder implements LocalMenuBuilderInterface
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         TranslatorInterface $translator
-    )
-    {
+    ) {
         $this->translator = $translator;
         $this->authorizationChecker = $authorizationChecker;
     }

src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php

@@ -32,8 +32,6 @@ class ThirdPartyTypeManager
      * Method used during the load of the manager by Dependency Injection
      *
      * @param \Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface $provider
-     *
-     * @return self
      */
     public function addProvider(ThirdPartyTypeProviderInterface $provider): self
     {