Simplify configuration by using regexes.

Create an household context

See merge request Chill-Projet/chill-bundles!74

.gitlab-ci.yml

@@ -11,14 +11,15 @@ before_script:
   - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
   # Install and run Composer
   - curl -sS https://getcomposer.org/installer | php
-  - php composer.phar install
+  - php -d memory_limit=2G composer.phar install
   - php tests/app/bin/console doctrine:migrations:migrate -n
-  - php tests/app/bin/console doctrine:fixtures:load -n
+  - php -d memory_limit=2G tests/app/bin/console doctrine:fixtures:load -n
+  - echo "before_script finished"
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ee/ci/services/README.html for examples.
 services:
-  - name: postgres:12
+  - name: postgis/postgis:12-3.1-alpine
     alias: db
   - name: redis
     alias: redis
@@ -38,4 +39,4 @@ variables:
 # Run our tests
 test:
   script:
-    - bin/phpunit --colors=never
+    - php -d memory_limit=3G bin/phpunit --colors=never

.php-cs-fixer.dist.php

@@ -1,71 +0,0 @@
-<?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.
- *
- * @see https://www.champs-libres.coop/
- */
-
-declare(strict_types=1);
-
-use drupol\PhpCsFixerConfigsPhp\Config\Php7;
-use PhpCsFixer\RuleSet\RuleSetDescriptionInterface;
-use PhpCsFixer\RuleSet\RuleSets;
-
-require __DIR__ . '/vendor/autoload.php';
-
-$vendorDirectory = dirname((new ReflectionClass(Php7::class))->getFileName(), 5);
-
-$config = require $vendorDirectory . '/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
-
-$config
-    ->getFinder()
-    ->ignoreDotFiles(false);
-
-$rules = $config->getRules();
-
-$riskyRules = array_reduce(
-    array_filter(
-        RuleSets::getSetDefinitions(),
-        static function (RuleSetDescriptionInterface $ruleset): bool {
-            return $ruleset->isRisky();
-        }
-    ),
-    static function (array $carry, RuleSetDescriptionInterface $ruleSetDescription): array {
-        return array_merge($carry, array_keys($ruleSetDescription->getRules()));
-    },
-    []
-);
-
-$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
-
-// Remove properties containing the word 'risky'.
-// Remove custom risky properties
-$rules = array_filter(
-    array_filter(
-        array_diff_key(
-            $rules,
-            array_flip($riskyRules)
-        ),
-        static function (string $property): bool {
-            return false === strpos(strtolower($property), 'risky');
-        },
-        ARRAY_FILTER_USE_KEY
-    ),
-    static function (string $property): bool {
-        return false === in_array(
-            $property,
-            [
-                'static_lambda',
-                'ordered_interfaces',
-                'psr4',
-            ]
-        );
-    },
-    ARRAY_FILTER_USE_KEY
-);
-
-return $config->setRules($rules);

composer.json

@@ -1,9 +1,69 @@
 {
     "name": "chill-project/chill-bundles",
-    "license": "AGPL-3.0-only",
     "type": "library",
     "description": "Most used bundles for chill-project",
-    "keywords": ["chill", "social worker"],
+    "keywords": [
+        "chill",
+        "social worker"
+    ],
+    "license": "AGPL-3.0-only",
+    "require": {
+        "champs-libres/async-uploader-bundle": "dev-sf4",
+        "composer/package-versions-deprecated": "^1.10",
+        "doctrine/doctrine-bundle": "^2.1",
+        "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/orm": "^2.7",
+        "drupol/php-conventions": "^5.0",
+        "erusev/parsedown": "^1.7",
+        "graylog2/gelf-php": "^1.5",
+        "knplabs/knp-menu": "^3.1",
+        "knplabs/knp-menu-bundle": "^3.0",
+        "knplabs/knp-time-bundle": "^1.12",
+        "league/csv": "^9.6",
+        "phpoffice/phpspreadsheet": "^1.16",
+        "sensio/framework-extra-bundle": "^5.5",
+        "symfony/asset": "4.*",
+        "symfony/browser-kit": "^5.2",
+        "symfony/css-selector": "^5.2",
+        "symfony/expression-language": "4.*",
+        "symfony/form": "4.*",
+        "symfony/intl": "4.*",
+        "symfony/monolog-bundle": "^3.5",
+        "symfony/security-bundle": "4.*",
+        "symfony/serializer": "^5.2",
+        "symfony/swiftmailer-bundle": "^3.5",
+        "symfony/templating": "4.*",
+        "symfony/translation": "4.*",
+        "symfony/twig-bundle": "^4.4",
+        "symfony/validator": "4.*",
+        "symfony/webpack-encore-bundle": "^1.11",
+        "symfony/workflow": "4.*",
+        "symfony/yaml": "4.*",
+        "twig/extra-bundle": "^2.12 || ^3.0",
+        "twig/intl-extra": "^3.0",
+        "twig/markdown-extra": "^3.3",
+        "twig/twig": "^2.12 || ^3.0"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "fakerphp/faker": "^1.13",
+        "nelmio/alice": "^3.8",
+        "phpunit/phpunit": "^7.0",
+        "symfony/debug-bundle": "^5.1",
+        "symfony/dotenv": "^5.1",
+        "symfony/maker-bundle": "^1.20",
+        "symfony/phpunit-bridge": "^5.2",
+        "symfony/stopwatch": "^5.1",
+        "symfony/var-dumper": "4.*",
+        "symfony/web-profiler-bundle": "^5.0"
+    },
+    "config": {
+        "bin-dir": "bin",
+        "vendor-dir": "tests/app/vendor"
+    },
     "autoload": {
         "psr-4": {
             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
@@ -24,65 +84,10 @@
             "App\\": "tests/app/src/"
         }
     },
-    "require": {
-        "champs-libres/async-uploader-bundle": "dev-sf4",
-        "graylog2/gelf-php": "^1.5",
-        "symfony/form": "4.*",
-        "symfony/twig-bundle": "^4.4",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0",
-        "composer/package-versions-deprecated": "^1.10",
-        "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.7",
-        "symfony/asset": "4.*",
-        "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "4.*",
-        "symfony/translation": "4.*",
-        "symfony/validator": "4.*",
-        "sensio/framework-extra-bundle": "^5.5",
-        "symfony/yaml": "4.*",
-        "symfony/webpack-encore-bundle": "^1.11",
-        "knplabs/knp-menu": "^3.1",
-        "knplabs/knp-menu-bundle": "^3.0",
-        "symfony/templating": "4.*",
-        "twig/intl-extra": "^3.0",
-        "symfony/workflow": "4.*",
-        "symfony/expression-language": "4.*",
-        "knplabs/knp-time-bundle": "^1.12",
-        "symfony/intl": "4.*",
-        "symfony/swiftmailer-bundle": "^3.5",
-        "league/csv": "^9.6",
-        "phpoffice/phpspreadsheet": "^1.16",
-        "symfony/browser-kit": "^5.2",
-        "symfony/css-selector": "^5.2",
-        "twig/markdown-extra": "^3.3",
-        "erusev/parsedown": "^1.7",
-        "symfony/serializer": "^5.2"
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "require-dev": {
-        "drupol/php-conventions": "5.*",
-        "fakerphp/faker": "^1.13",
-        "phpunit/phpunit": "^7.0",
-        "symfony/dotenv": "^5.1",
-        "symfony/maker-bundle": "^1.20",
-        "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "symfony/stopwatch": "^5.1",
-        "symfony/web-profiler-bundle": "^5.0",
-        "symfony/var-dumper": "4.*",
-        "symfony/debug-bundle": "^5.1",
-        "symfony/phpunit-bridge": "^5.2"
-    },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         }
-    },
-    "config": {
-      "bin-dir": "bin"
     }
 }

docs/source/_static/code/exports/BirthdateFilter.php

@@ -1,20 +1,17 @@
 <?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\PersonBundle\Export\Filter;
 
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use DateTime;
-use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Validator\Constraints;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Doctrine\ORM\Query\Expr;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Symfony\Component\Form\FormError;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
 class BirthdateFilter implements FilterInterface, ExportElementValidatedInterface
 {
@@ -25,16 +22,78 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
         return null;
     }
 
+    // we give information on which type of export this filter applies
+    public function applyOn()
+    {
+        return 'person';
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by person\'s birthdate';
+    }
+
+    // we build a form to collect some parameters from the users
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    {
+        $builder->add('date_from', DateType::class, array(
+            'label' => "Born after this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
+            'widget'=> 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ));
+        
+        $builder->add('date_to', DateType::class, array(
+            'label' => "Born before this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
+            'widget'=> 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ));
+        
+    }
+   
+    // the form created above must be validated. The process of validation
+    // is executed here. This function is added by the interface 
+    // `ExportElementValidatedInterface`, and can be ignore if there is 
+    // no need for a validation
+    public function validateForm($data, ExecutionContextInterface $context)
+    { 
+        $date_from = $data['date_from'];
+        $date_to   = $data['date_to'];
+        
+        if ($date_from === null) {
+            $context->buildViolation('The "date from" should not be empty')
+                //->atPath('date_from')
+                ->addViolation();
+        }
+        
+        if ($date_to === null) {
+            $context->buildViolation('The "date to" should not be empty')
+                //->atPath('date_to')
+                ->addViolation();
+        }
+        
+        if (
+            ($date_from !== null && $date_to !== null)
+            &&
+            $date_from >= $date_to
+        ) {
+            $context->buildViolation('The date "date to" should be after the '
+                . 'date given in "date from" field')
+                ->addViolation();
+        }
+    }
+
+
     // here, we alter the query created by Export
     public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
         // we create the clause here
-        $clause = $qb->expr()->between(
-            'person.birthdate',
-            ':date_from',
-            ':date_to'
-        );
+        $clause = $qb->expr()->between('person.birthdate', ':date_from', 
+            ':date_to');
 
         // we have to take care **not to** remove previous clauses...
         if ($where instanceof Expr\Andx) {
@@ -49,76 +108,16 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
         $qb->setParameter('date_to', $data['date_to']);
     }
 
-    // we give information on which type of export this filter applies
-    public function applyOn()
-    {
-        return 'person';
-    }
-
-    // we build a form to collect some parameters from the users
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
-    {
-        $builder->add('date_from', DateType::class, [
-            'label' => 'Born after this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ]);
-
-        $builder->add('date_to', DateType::class, [
-            'label' => 'Born before this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ]);
-    }
-
     // here, we create a simple string which will describe the action of
     // the filter in the Response
     public function describeAction($data, $format = 'string')
     {
-        return ['Filtered by person\'s birtdate: '
-            . 'between %date_from% and %date_to%', [
+        return array('Filtered by person\'s birtdate: '
+            . 'between %date_from% and %date_to%', array(
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y'),
-            ], ];
+                '%date_to%'   => $data['date_to']->format('d-m-Y')
+            ));
     }
 
-    public function getTitle()
-    {
-        return 'Filter by person\'s birthdate';
-    }
 
-    // the form created above must be validated. The process of validation
-    // is executed here. This function is added by the interface
-    // `ExportElementValidatedInterface`, and can be ignore if there is
-    // no need for a validation
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        $date_from = $data['date_from'];
-        $date_to = $data['date_to'];
-
-        if (null === $date_from) {
-            $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
-                ->addViolation();
-        }
-
-        if (null === $date_to) {
-            $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
-                ->addViolation();
-        }
-
-        if (
-            (null !== $date_from && null !== $date_to)
-            && $date_from >= $date_to
-        ) {
-            $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
-                ->addViolation();
-        }
-    }
 }

docs/source/_static/code/exports/CountPerson.php

@@ -1,97 +1,62 @@
 <?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\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\Query;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class CountPerson implements ExportInterface
 {
     /**
+     *
      * @var EntityManagerInterface
      */
     protected $entityManager;
 
     public function __construct(
             EntityManagerInterface $em
-    ) {
+            )
+    {
         $this->entityManager = $em;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // this export does not add any form
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription()
-    {
-        return 'Count peoples by various parameters.';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        // the Closure which will be executed by the formatter.
-        return function ($value) {
-            switch ($value) {
-                case '_header':
-                  // we have to process specifically the '_header' string,
-                  // which will be used by the formatter to show a column title
-                    return $this->getTitle();
-
-                default:
-                  // for all value, we do not process them and return them
-                  // immediatly
-                    return $value;
-            }
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        // this array match the result keys in the query. We have only
-        // one column.
-        return ['export_result'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'Count peoples';
-    }
-
     public function getType()
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function getDescription()
+    {
+        return "Count peoples by various parameters.";
+    }
+
+    public function getTitle()
+    {
+        return "Count peoples";
+    }
+
+    public function requiredRole()
+    {
+        return new Role(PersonVoter::STATS);
+    }
+
+    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
     {
         // we gather all center the user choose.
-        $centers = array_map(function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -100,18 +65,55 @@ class CountPerson implements ExportInterface
                 ->join('person.center', 'center')
                 ->andWhere('center IN (:authorized_centers)')
                 ->setParameter('authorized_centers', $centers);
+                ;
+
 
         return $qb;
     }
 
-    public function requiredRole()
+    public function getResult($qb, $data)
     {
-        return new Role(PersonVoter::STATS);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getQueryKeys($data)
+    {
+        // this array match the result keys in the query. We have only
+        // one column.
+        return array('export_result');
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+
+        // the Closure which will be executed by the formatter.
+        return function($value) {
+            switch($value) {
+                case '_header':
+                  // we have to process specifically the '_header' string,
+                  // which will be used by the formatter to show a column title
+                  return $this->getTitle();
+                default:
+                  // for all value, we do not process them and return them
+                  // immediatly
+                  return $value;
+            };
+        };
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return array(FormatterInterface::TYPE_TABULAR);
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {
+        // this export does not add any form
     }
 
     public function supportsModifiers()
     {
         // explain the export manager which formatters and filters are allowed
-        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
+        return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
     }
+
 }

docs/source/development/api.rst

@@ -13,6 +13,9 @@ API
 
 Chill provides a basic framework to build REST api.
 
+Basic configuration
+*******************
+
 Configure a route
 =================
 
@@ -34,7 +37,7 @@ You can also:
     * `How to create your custom normalizer <https://symfony.com/doc/current/serializer/custom_normalizer.html>`_
 
 Auto-loading the routes
-***********************
+=======================
 
 Ensure that those lines are present in your file `app/config/routing.yml`:
 
@@ -47,7 +50,7 @@ Ensure that those lines are present in your file `app/config/routing.yml`:
 
 
 Create your model
-*****************
+=================
 
 Create your model on the usual way:
 
@@ -87,7 +90,7 @@ Create your model on the usual way:
 
 
 Configure api
-*************
+=============
 
 Configure the api using Yaml (see the full configuration: :ref:`api_full_configuration`):
 
@@ -171,7 +174,7 @@ Configure the api using Yaml (see the full configuration: :ref:`api_full_configu
       }
 
 The :code:`_index` and :code:`_entity` action
-=============================================
+*********************************************
 
 The :code:`_index` and :code:`_entity` action are default actions:
 
@@ -189,7 +192,7 @@ Entity:
    Path: :code:`/api/1.0/person/accompanying-period/origin/{id}.{_format}`
 
 Role
-====
+****
 
 By default, the key `base_role` is used to check ACL. Take care of creating the :code:`Voter` required to take that into account.
 
@@ -216,7 +219,7 @@ You can also define a role for each method. In this case, this role is used for
                            HEAD: MY ROLE_SEE
 
 Customize the controller
-========================
+************************
 
 You can customize the controller by hooking into the default actions. Take care of extending :code:`Chill\MainBundle\CRUD\Controller\ApiController`.
 
@@ -264,7 +267,7 @@ And set your controller in configuration:
                            HEAD: true
 
 Create your own actions
-=======================
+***********************
 
 You can add your own actions:
 
@@ -361,8 +364,297 @@ Then, create the corresponding action into your controller:
        }
    }
 
+Managing association
+********************
+
+ManyToOne association
+=====================
+
+In ManyToOne association, you can add associated entities using the :code:`PATCH` request. By default, the serializer deserialize entities only with their id and discriminator type, if any.
+
+Example:
+
+.. code-block:: bash
+
+   curl -X 'PATCH' \
+     'http://localhost:8001/api/1.0/person/accompanying-course/2668.json' \
+     -H 'accept: */*' \
+     -H 'Content-Type: application/json' \
+      # see the data sent to the server: \
+     -d '{
+     "type": "accompanying_period",
+     "id": 2668,
+     "origin": { "id": 11 }
+   }'
+
+ManyToMany associations
+=======================
+
+In OneToMany association, you can easily create route for adding and removing entities, using :code:`POST` and :code:`DELETE` requests.
+
+Prepare your entity, creating the methods :code:`addYourEntity` and :code:`removeYourEntity`:
+
+.. code-block:: php
+
+   namespace Chill\PersonBundle\Entity;
+
+   use Chill\MainBundle\Entity\Scope;
+   use Doctrine\Common\Collections\ArrayCollection;
+   use Doctrine\Common\Collections\Collection;
+   use Doctrine\ORM\Mapping as ORM;
+   use Symfony\Component\Serializer\Annotation\Groups;
+   use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+
+   /**
+    * AccompanyingPeriod Class
+    *
+    * @ORM\Entity
+    * @ORM\Table(name="chill_person_accompanying_period")
+    * @DiscriminatorMap(typeProperty="type", mapping={
+    *  "accompanying_period"=AccompanyingPeriod::class
+    *  })
+    */
+   class AccompanyingPeriod
+   {
+       /**
+        * @var Collection
+        * @ORM\ManyToMany(
+        *     targetEntity=Scope::class,
+        *     cascade={}
+        *     )
+        * @Groups({"read"})
+        */
+       private $scopes;
+
+       public function addScope(Scope $scope): self
+       {
+           $this->scopes[] = $scope;
+
+           return $this;
+       }
+
+       public function removeScope(Scope $scope): void
+       {
+           $this->scopes->removeElement($scope);
+       }
+
+
+Create your route into the configuration:
+
+.. code-block:: yaml
+
+   chill_main:
+       apis:
+           -
+               class: Chill\PersonBundle\Entity\AccompanyingPeriod
+               name: accompanying_course
+               base_path: /api/1.0/person/accompanying-course
+               controller: Chill\PersonBundle\Controller\AccompanyingCourseApiController
+               actions:
+                   scope:
+                       methods:
+                           POST: true
+                           DELETE: true
+                           GET: false
+                           HEAD: false
+                           PUT: false
+                           PATCH: false
+                       roles:
+                           POST: CHILL_PERSON_ACCOMPANYING_PERIOD_SEE
+                           DELETE: CHILL_PERSON_ACCOMPANYING_PERIOD_SEE
+                           GET: null
+                           HEAD: null
+                           PUT: null
+                           PATCH: null
+                       controller_action: null
+                       path: null
+                       single-collection: single
+
+This will create a new route, which will accept two methods: DELETE and POST:
+
+.. code-block:: raw
+
+   +--------------+---------------------------------------------------------------------------------------+
+   | Property     | Value                                                                                 |
+   +--------------+---------------------------------------------------------------------------------------+
+   | Route Name   | chill_api_single_accompanying_course_scope                                            |
+   | Path         | /api/1.0/person/accompanying-course/{id}/scope.{_format}                              |
+   | Path Regex   | {^/api/1\.0/person/accompanying\-course/(?P<id>[^/]++)/scope\.(?P<_format>[^/]++)$}sD |
+   | Host         | ANY                                                                                   |
+   | Host Regex   |                                                                                       |
+   | Scheme       | ANY                                                                                   |
+   | Method       | POST|DELETE                                                                           |
+   | Requirements | {id}: \d+                                                                             |
+   | Class        | Symfony\Component\Routing\Route                                                       |
+   | Defaults     | _controller: csapi_accompanying_course_controller:scopeApi                            |
+   | Options      | compiler_class: Symfony\Component\Routing\RouteCompiler                               |
+   +--------------+---------------------------------------------------------------------------------------+
+
+
+
+Then, create the controller action. Call the method:
+
+.. code-block:: php
+
+   namespace Chill\PersonBundle\Controller;
+
+   use Chill\MainBundle\CRUD\Controller\ApiController;
+   use Symfony\Component\HttpFoundation\Request;
+   use Symfony\Component\HttpFoundation\Response;
+   use Chill\MainBundle\Entity\Scope;
+
+   class MyController extends ApiController
+   {
+       public function scopeApi($id, Request $request, string $_format): Response
+       {
+           return $this->addRemoveSomething('scope', $id, $request, $_format, 'scope', Scope::class, [ 'groups' => [ 'read' ] ]);
+       }
+   }
+
+This will allow to add a scope by his id, and delete them.
+
+Curl requests:
+
+.. code-block:: bash
+
+   # add a scope with id 5
+   curl -X 'POST' \
+     'http://localhost:8001/api/1.0/person/accompanying-course/2868/scope.json' \
+     -H 'accept: */*' \
+     -H 'Content-Type: application/json' \
+     -d '{
+     "type": "scope",
+     "id": 5
+   }'
+
+   # remove a scope with id 5
+   curl -X 'DELETE' \
+     'http://localhost:8001/api/1.0/person/accompanying-course/2868/scope.json' \
+     -H 'accept: */*' \
+     -H 'Content-Type: application/json' \
+     -d '{
+     "id": 5,
+     "type": "scope"
+   }'
+
+Deserializing an association where multiple types are allowed
+=============================================================
+
+Sometimes, multiples types are allowed as association to one entity:
+
+.. code-block:: php
+
+   namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+   use Chill\PersonBundle\Entity\Person;
+   use Chill\ThirdPartyBundle\Entity\ThirdParty;
+   use Doctrine\ORM\Mapping as ORM;
+
+   class Resource
+   {
+
+
+       /**
+        * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+        * @ORM\JoinColumn(nullable=true)
+        */
+       private $thirdParty;
+
+       /**
+        * @ORM\ManyToOne(targetEntity=Person::class)
+        * @ORM\JoinColumn(nullable=true)
+        */
+       private $person;
+
+
+       /**
+        *
+        * @param $resource Person|ThirdParty
+        */
+       public function setResource($resource): self
+       {
+          // ...
+       }
+       
+       
+       /**
+        * @return ThirdParty|Person
+        * @Groups({"read", "write"})
+        */
+       public function getResource()
+       {
+           return $this->person ?? $this->thirdParty;
+       }
+   }
+
+This is not well taken into account by the Symfony serializer natively.
+
+You must, then, create your own CustomNormalizer. You can help yourself using this:
+
+.. code-block:: php
+
+   namespace Chill\PersonBundle\Serializer\Normalizer;
+
+   use Chill\PersonBundle\Entity\Person;
+   use Chill\ThirdPartyBundle\Entity\ThirdParty;
+   use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+   use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
+   use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+   use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+   use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+   use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+   use Symfony\Component\Serializer\Exception;
+   use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
+
+
+   class AccompanyingPeriodResourceNormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+   {
+       use DenormalizerAwareTrait;
+       use ObjectToPopulateTrait;
+
+       public function __construct(ResourceRepository $repository)
+       {
+           $this->repository = $repository;
+       }
+
+       public function denormalize($data, string $type, string $format = null, array $context = [])
+       {
+           // .. snipped for brevity
+
+           if ($resource === NULL) {
+               $resource = new Resource();
+           }
+
+           if (\array_key_exists('resource', $data)) {
+               $res = $this->denormalizer->denormalize(
+                   $data['resource'],
+                   // call for a "multiple type"
+                   DiscriminatedObjectDenormalizer::TYPE,
+                   $format,
+                   // into the context, we add the list of allowed types:
+                   [ 
+                       DiscriminatedObjectDenormalizer::ALLOWED_TYPES => 
+                       [ 
+                           Person::class, ThirdParty::class
+                       ]
+                   ]
+               );
+
+               $resource->setResource($res);
+           } 
+
+           return $resource;
+       }
+       
+
+       public function supportsDenormalization($data, string $type, string $format = null)
+       {
+           return $type === Resource::class;
+       }  
+   }
+
 Serialization for collection
-============================
+****************************
 
 A specific model has been defined for returning collection:
 
@@ -381,8 +673,9 @@ A specific model has been defined for returning collection:
        }
    }
 
+Where this is relevant, this model should be re-used in custom controller actions.
 
-This can be achieved quickly by assembling results into a :code:`Chill\MainBundle\Serializer\Model\Collection`. The pagination information is given by using :code:`Paginator` (see :ref:`Pagination <pagination-ref>`).
+In custom actions, this can be achieved quickly by assembling results into a :code:`Chill\MainBundle\Serializer\Model\Collection`. The pagination information is given by using :code:`Paginator` (see :ref:`Pagination <pagination-ref>`).
 
 .. code-block:: php
 
@@ -400,10 +693,11 @@ This can be achieved quickly by assembling results into a :code:`Chill\MainBundl
        }
    }
 
+
 .. _api_full_configuration:
 
 Full configuration example
-==========================
+**************************
 
 .. code-block:: yaml
 

docs/source/development/pagination/example.php

@@ -1,24 +1,19 @@
 <?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\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+
+
+class ItemController extends Controller {
 
-class ItemController extends Controller
-{
     public function yourAction()
     {
         $em = $this->getDoctrine()->getManager();
         // first, get the number of total item are available
         $total = $em
-            ->createQuery('SELECT COUNT (item.id) FROM ChillMyBundle:Item item')
+             ->createQuery("SELECT COUNT (item.id) FROM ChillMyBundle:Item item")
              ->getSingleScalarResult();
 
         // get the PaginatorFactory
@@ -30,19 +25,18 @@ class ItemController extends Controller
 
         // launch your query on item. Limit the query to the results
         // for the current page using the paginator
-        $items = $em->createQuery('SELECT item FROM ChillMyBundle:Item item WHERE <your clause>')
+        $items = $em->createQuery("SELECT item FROM ChillMyBundle:Item item WHERE <your clause>")
             // use the paginator to get the first item number
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             // use the paginator to get the number of items to display
             ->setMaxResults($paginator->getItemsPerPage());
 
-        return $this
-            ->render(
-                'ChillMyBundle:Item:list.html.twig',
-                [
+        return $this->render('ChillMyBundle:Item:list.html.twig', array(
                 'items' => $items,
-                    'paginator' => $paginator,
-                ]
+                'paginator' => $paginator
+                )
         );
     }
+
 }
+

docs/source/development/timelines.rst

@@ -97,7 +97,7 @@ The has the following signature :
          * 
          * @param string $context
          * @param mixed[] $args the argument to the context.
-         * @return string[]
+         * @return TimelineSingleQuery
          * @throw  \LogicException if the context is not supported
          */
         public function fetchQuery($context, array $args);
@@ -163,18 +163,16 @@ The has the following signature :
 The `fetchQuery` function
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The fetchQuery function help to build the UNION query to gather events. This function should return an associative array MUST have the following key :
+The fetchQuery function help to build the UNION query to gather events. This function should return an instance of :code:`TimelineSingleQuery`. For you convenience, this object may be build using an associative array with the following keys:
 
 * `id` : the name of the id column
 * `type`: a string to indicate the type
 * `date`: the name of the datetime column, used to order entities by date
-* `FROM` (in capital) : the FROM clause. May contains JOIN instructions
+* `FROM`: the FROM clause. May contains JOIN instructions
+* `WHERE`: the WHERE clause;
+* `parameters`: the parameters to pass to the query
 
-Those key are optional:
-
-* `WHERE` (in capital) : the WHERE clause. 
-
- Where relevant, the data must be quoted to avoid SQL injection.
+The parameters should be replaced into the query by :code:`?`. They will be replaced into the query using prepared statements.
 
 `$context` and `$args` are defined by the bundle which will call the timeline rendering. You may use them to build a different query depending on this context.
 
@@ -186,6 +184,15 @@ For instance, if the context is `'person'`, the args will be this array :
         'person' => $person //a \Chill\PersonBundle\Entity\Person entity
     );
 
+For the context :code:`center`, the args will be:
+
+.. code-block:: php
+
+    array(
+        'centers' => [ ]  // an array of \Chill\MainBundle\Entity\Center entities
+    );
+
+
 You should find in the bundle documentation which contexts are arguments the bundle defines.
 
 .. note::
@@ -199,13 +206,12 @@ Example of an implementation :
     namespace Chill\ReportBundle\Timeline;
 
     use Chill\MainBundle\Timeline\TimelineProviderInterface;
+    use Chill\MainBundle\Timeline\TimelineSingleQuery;
     use Doctrine\ORM\EntityManager;
 
     /**
      * Provide report for inclusion in timeline
      *
-     * @author Julien Fastré <julien.fastre@champs-libres.coop>
-     * @author Champs Libres <info@champs-libres.coop>
      */
     class TimelineReportProvider implements TimelineProviderInterface
     {
@@ -227,16 +233,17 @@ Example of an implementation :
                 
                 $metadata = $this->em->getClassMetadata('ChillReportBundle:Report');
                 
-                return array(
+                return TimelineSingleQuery::fromArray([
                    'id' => $metadata->getColumnName('id'),
                    'type' => 'report',
                    'date' => $metadata->getColumnName('date'),
                    'FROM' => $metadata->getTableName(),
-                   'WHERE' => sprintf('%s = %d',
+                   'WHERE' => sprintf('%s = ?',
                          $metadata
-                            ->getAssociationMapping('person')['joinColumns'][0]['name'],
-                         $args['person']->getId())
-                );
+                            ->getAssociationMapping('person')['joinColumns'][0]['name'])
+                         )
+                   'parameters' => [ $args['person']->getId() ]
+                ]);
             }
 
         //....

docs/source/development/useful-snippets/controller-secured-for-person.php

@@ -1,27 +1,19 @@
 <?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\HealthBundle\Controller;
 
 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
 
 class ConsultationController extends Controller
 {
     /**
+     * 
      * @param int $id personId
-     *
-     * @throws type
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @throws type
      */
     public function listAction($id)
     {
@@ -29,8 +21,8 @@ class ConsultationController extends Controller
         $person = $this->get('chill.person.repository.person')
             ->find($id);
         
-        if (null === $person) {
-            throw $this->createNotFoundException('The person is not found');
+        if ($person === null) {
+            throw $this->createNotFoundException("The person is not found");
         }
         
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
@@ -54,9 +46,10 @@ class ConsultationController extends Controller
             ->setParameter('circles', $circles)
             ->getResult();
         
-        return $this->render('ChillHealthBundle:Consultation:list.html.twig', [
+        return $this->render('ChillHealthBundle:Consultation:list.html.twig', array(
                 'person' => $person,
-            'consultations' => $consultations,
-        ]);
+                'consultations' => $consultations
+            ));    
     }
 }
+

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

@@ -1,41 +1,40 @@
 <?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.
- */
+   # Chill\MainBundle\DependencyInjection\Configuration.php
   
    namespace Chill\MainBundle\DependencyInjection;
 
-   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
    use Symfony\Component\Config\Definition\Builder\TreeBuilder;
    use Symfony\Component\Config\Definition\ConfigurationInterface;
+   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
    use Symfony\Component\DependencyInjection\ContainerBuilder;
 
    /**
- * Configure the main bundle.
+    * Configure the main bundle
     */
    class Configuration implements ConfigurationInterface
    {
+       
        use AddWidgetConfigurationTrait;
        
        /**
+	*
 	* @var ContainerBuilder
 	*/
        private $containerBuilder;
 
-    public function __construct(
-        array $widgetFactories = [],
-        ContainerBuilder $containerBuilder
-    ) {
+       
+       public function __construct(array $widgetFactories = array(), 
+	       ContainerBuilder $containerBuilder)
+       {
            // we register here widget factories (see below)
 	   $this->setWidgetFactories($widgetFactories);
            // we will need the container builder later...
 	   $this->containerBuilder = $containerBuilder;
        }
        
+       /**
+	* {@inheritDoc}
+	*/
        public function getConfigTreeBuilder()
        {
 	   $treeBuilder = new TreeBuilder();
@@ -45,6 +44,7 @@ class Configuration implements ConfigurationInterface
 	       ->children()
 
                    // ...
+
 		   ->arrayNode('widgets')
 		       ->canBeDisabled()
 		       ->children()
@@ -53,8 +53,12 @@ class Configuration implements ConfigurationInterface
 		       ->end() // end of widgets/children
 		   ->end() // end of widgets
 		  ->end() // end of root/children
-            ->end(); // end of root
+	       ->end() // end of root
+	   ;
+
 	   
 	   return $treeBuilder;
        }
    }
+
+

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

@@ -1,17 +1,16 @@
 <?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.
- */
+#Chill\MainBundle\DependencyInjection\ChillMainExtension.php
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
+use Chill\MainBundle\DependencyInjection\Configuration;
 
 /**
  * This class load config for chillMainExtension.
@@ -19,23 +18,19 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesExtensionInterface
 {
     /**
-     * widget factory.
+     * widget factory
      * 
      * @var WidgetFactoryInterface[]
      */
-    protected $widgetFactories = [];
+    protected $widgetFactories = array();
     
     public function addWidgetFactory(WidgetFactoryInterface $factory)
     {
         $this->widgetFactories[] = $factory;
     }
     
-    public function getConfiguration(array $config, ContainerBuilder $container)
-    {
-        return new Configuration($this->widgetFactories, $container);
-    }
-
     /**
+     * 
      * @return WidgetFactoryInterface[]
      */
     public function getWidgetFactories()
@@ -50,11 +45,15 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
         $config = $this->processConfiguration($configuration, $configs);
         
         // add the key 'widget' without the key 'enable'
-        $container->setParameter(
-            'chill_main.widgets',
-            ['homepage' => $config['widgets']['homepage']]
-        );
+        $container->setParameter('chill_main.widgets', 
+            array('homepage' => $config['widgets']['homepage']));
 
         // ... 
     }
+    
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->widgetFactories, $container);
+    }
+    
 }

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

@@ -1,17 +1,12 @@
 <?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.
- */
+# Chill/PersonBundle/Widget/PersonListWidgetFactory
 
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
-use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 /**
  * add configuration for the person_list widget.
@@ -34,6 +29,7 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
         $node->scalarNode('filtering_class')
                 ->defaultNull()
                 ->end();
+            
     }
      
    /*
@@ -43,7 +39,17 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
     */   
     public function getAllowedPlaces()
     {
-        return ['homepage'];
+        return array('homepage');
+    }
+    
+   /* 
+    * return the widget alias
+    *
+    * @return string
+    */
+    public function getWidgetAlias()
+    {
+        return 'person_list';
     }
     
     /*
@@ -59,13 +65,5 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
         return 'chill_person.widget.person_list';
     }
     
-    /*
-     * return the widget alias
-     *
-     * @return string
-     */
-    public function getWidgetAlias()
-    {
-        return 'person_list';
-    }
 }
+

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

@@ -1,26 +1,18 @@
 <?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.
- */
+# Chill/PersonBundle/Widget/PersonListWidget.php
 
 namespace Chill\PersonBundle\Widget;
 
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
-use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
-use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\DBAL\Types\Type;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Twig_Environment;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\EntityManager;
 
 /**
  * add a widget with person list. 
@@ -29,33 +21,36 @@ use Twig_Environment;
  */
 class PersonListWidget implements WidgetInterface
 {
-    /**
-     * the authorization helper.
-     *
-     * @var AuthorizationHelper;
-     */
-    protected $authorizationHelper;
     
     /**
-     * The entity manager.
-     *
-     * @var EntityManager
-     */
-    protected $entityManager;
-
-    /**
-     * Repository for persons.
+     * Repository for persons
      * 
      * @var EntityRepository
      */
     protected $personRepository;
     
     /**
+     * The entity manager
+     *
+     * @var EntityManager
+     */
+    protected $entityManager;
+    
+    /**
+     * the authorization helper
+     * 
+     * @var AuthorizationHelper;
+     */
+    protected $authorizationHelper;
+    
+    /**
+     *
      * @var TokenStorage
      */
     protected $tokenStorage;
     
     /**
+     *
      * @var UserInterface
      */
     protected $user;
@@ -73,11 +68,13 @@ class PersonListWidget implements WidgetInterface
     }
 
     /**
-     * @param type $place
      * 
+     * @param type $place
+     * @param array $context
+     * @param array $config
      * @return string
      */
-    public function render(Twig_Environment $env, $place, array $context, array $config)
+    public function render(\Twig_Environment $env, $place, array $context, array $config)
     { 
         $qb = $this->personRepository
                 ->createQueryBuilder('person');
@@ -89,8 +86,9 @@ class PersonListWidget implements WidgetInterface
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
         
+
         // add the "only active" where clause
-        if (true === $config['only_active']) {
+        if ($config['only_active'] === true) {
             $qb->join('person.accompanyingPeriods', 'ap');
             $or = new Expr\Orx();
             // add the case where closingDate IS NULL
@@ -103,7 +101,7 @@ class PersonListWidget implements WidgetInterface
                     (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
                 );
             $and->add($or);
-            $qb->setParameter('now', new DateTime(), Type::DATE);
+            $qb->setParameter('now', new \DateTime(), Type::DATE);
         }
         
         // adding the where clause to the query
@@ -115,15 +113,17 @@ class PersonListWidget implements WidgetInterface
         
         return $env->render(
             'ChillPersonBundle:Widget:homepage_person_list.html.twig',
-            ['persons' => $persons]
+            array('persons' => $persons)
             );
     }
     
     /**
+     * 
      * @return UserInterface
      */
     private function getUser()
     {
         // return a user
     }
+
 }

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

@@ -1,46 +1,51 @@
 <?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.
- */
+# Chill/PersonBundle/DependencyInjection/ChillPersonExtension.php
 
 namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\MainBundle\DependencyInjection\MissingBundleException;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 
 /**
- * This is the class that loads and manages your bundle configuration.
+ * This is the class that loads and manages your bundle configuration
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * {@inheritDoc}
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
       // ...
     }
     
+    
     /**
-     * Add a widget "add a person" on the homepage, automatically.
+     * 
+     * Add a widget "add a person" on the homepage, automatically
      * 
      * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
      */
     public function prepend(ContainerBuilder $container) 
     {
-        $container->prependExtensionConfig('chill_main', [
-            'widgets' => [
-                'homepage' => [
-                    [
+        $container->prependExtensionConfig('chill_main', array(
+            'widgets' => array(
+                'homepage' => array(
+                    array(
                         'widget_alias' => 'add_person',
-                        'order' => 2,
-                    ],
-                ],
-            ],
-        ]);
+                        'order' => 2
+                    )
+                )
+            )
+        ));
     }
 }
+

docs/source/installation/index.rst

@@ -82,7 +82,7 @@ Chill will be available at ``http://localhost:8001.`` Currently, there isn't any
 
 .. code-block:: bash
 
-   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load
+   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate
 
 There are several users available:
 

grumphp.yml

@@ -1,9 +1,22 @@
 imports:
-  - { resource: vendor/drupol/php-conventions/config/php73/grumphp.yml }
+  - { resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml }
 
 parameters:
-  tasks.phpcsfixer.config: .php-cs-fixer.dist.php
   tasks.license.name: AGPL-3.0
   tasks.license.holder: Champs-Libres
-  tasks.license.date_from: 2001
-  tasks.phpcsfixer.allow_risky: false
+  tasks.phpstan.configuration: phpstan.neon
+  tasks.phpstan.ignore_patterns:
+    - /src\/Bundle\/(.*)\/migrations/
+    - /src\/Bundle\/(.*)\/Resources/
+    - /src\/Bundle\/(.*)\/Tests/
+    - /src\/Bundle\/(.*)\/Test/
+    - /src\/Bundle\/(.*)\/config/
+    - /src\/Bundle\/(.*)\/translations/
+    - /src\/Bundle\/(.*)\/DataFixtures/
+    - /^docs/
+    - /^tests/
+  skip_tasks:
+    - composer_require_checker
+    - phpcsfixer
+    - phpcs
+    - twigcs

phpstan.neon

@@ -0,0 +1,3 @@
+includes:
+	- phpstan-baseline.neon
+

phpunit.xml.dist

@@ -18,11 +18,19 @@
        <testsuite name="MainBundle">
          <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
        </testsuite>
-       <!--
        <testsuite name="PersonBundle">
          <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
+         <!-- test for export will be runned later -->
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Export/*</exclude>
+         <!-- we are rewriting accompanying periods... Work in progress -->
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php</exclude>
+         <!-- we are rewriting address, Work in progress -->
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php</exclude>
+         <!-- find a solution to create multiple configs -->
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php</exclude>
+         <!-- temporarily removed, the time to find a fix -->
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
-      -->
     </testsuites>
 
     <listeners>

psalm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="tests/" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

resource/header.txt

@@ -1,5 +0,0 @@
-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.
-

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -1,12 +1,5 @@
 <?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\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -1,41 +1,57 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Controller;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Form\ActivityType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
-use DateTime;
 use Psr\Log\LoggerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ActivityBundle\Form\ActivityType;
 
 /**
- * Class ActivityController.
+ * Class ActivityController
+ *
+ * @package Chill\ActivityBundle\Controller
  */
 class ActivityController extends AbstractController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
 
     /**
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
 
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
     /**
      * @var LoggerInterface
      */
@@ -43,6 +59,9 @@ class ActivityController extends AbstractController
 
     /**
      * ActivityController constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param AuthorizationHelper $authorizationHelper
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
@@ -54,17 +73,52 @@ class ActivityController extends AbstractController
         $this->logger = $logger;
     }
 
+    /**
+     * Lists all Activity entities.
+     *
+     */
+    public function listAction($person_id, Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+
+        if ($person === NULL) {
+            throw $this->createNotFoundException('Person not found');
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableScopes($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
+            $person->getCenter());
+
+        $activities = $em->getRepository('ChillActivityBundle:Activity')
+                ->findBy(
+                      array('person' => $person, 'scope' => $reachableScopes),
+                      array('date' => 'DESC')
+                      );
+
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'action' => 'list'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        return $this->render('ChillActivityBundle:Activity:list.html.twig', array(
+            'activities' => $activities,
+            'person'   => $person
+        ));
+    }
     /**
      * Creates a new Activity entity.
      *
-     * @param mixed $person_id
      */
     public function createAction($person_id, Request $request)
     {
         $em = $this->getDoctrine()->getManager();
         $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        if (null === $person) {
+        if ($person === NULL) {
             throw $this->createNotFoundException('person not found');
         }
 
@@ -78,115 +132,133 @@ class ActivityController extends AbstractController
         if ($form->isValid()) {
             $em = $this->getDoctrine()->getManager();
 
-            $this->denyAccessUnlessGranted(
-                'CHILL_ACTIVITY_CREATE',
-                $entity,
-                'creation of this activity not allowed'
-            );
+            $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity,
+                    'creation of this activity not allowed');
 
             $em->persist($entity);
             $em->flush();
 
             $this->get('session')
                 ->getFlashBag()
-                ->add(
-                    'success',
+                ->add('success',
                     $this->get('translator')
                         ->trans('Success : activity created!')
                 );
 
             return $this->redirect(
-                $this->generateUrl(
-                    'chill_activity_activity_show',
-                    ['id' => $entity->getId(), 'person_id' => $person_id]
-                )
-            );
+                $this->generateUrl('chill_activity_activity_show',
+                array('id' => $entity->getId(), 'person_id' => $person_id)));
         }
 
         $this->get('session')
-            ->getFlashBag()->add(
-                'danger',
+            ->getFlashBag()->add('danger',
                 $this->get('translator')
                     ->trans('The form is not valid. The activity has not been created !')
             );
 
-        return $this->render('ChillActivityBundle:Activity:new.html.twig', [
+        return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
             'entity' => $entity,
             'form'   => $form->createView(),
-            'person' => $person,
-        ]);
+            'person' => $person
+        ));
     }
 
     /**
-     * Deletes a Activity entity.
+     * Creates a form to create a Activity entity.
      *
-     * @param mixed $id
-     * @param mixed $person_id
+     * @param Activity $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
      */
-    public function deleteAction(Request $request, $id, $person_id)
+    private function createCreateForm(Activity $entity)
+    {
+        $form = $this->createForm(ActivityType::class, $entity,
+              array(
+                'action' => $this->generateUrl('chill_activity_activity_create', [
+                    'person_id' => $entity->getPerson()->getId(),
+                    ]),
+                'method' => 'POST',
+                'center' => $entity->getCenter(),
+                'role'   => new Role('CHILL_ACTIVITY_CREATE')
+            )
+        );
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new Activity entity.
+     *
+     */
+    public function newAction($person_id)
     {
         $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        /* @var $activity Activity */
-        $activity = $em->getRepository('ChillActivityBundle:Activity')
-            ->find($id);
-        $person = $activity->getPerson();
+        if ($person === NULL){
+            throw $this->createNotFoundException('Person not found');
+        }
 
-        if (!$activity) {
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $entity = new Activity();
+        $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
+        $entity->setPerson($person);
+        $entity->setDate(new \DateTime('now'));
+
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
+
+        $form   = $this->createCreateForm($entity, $person);
+
+        return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
+            'person'   => $person,
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a Activity entity.
+     *
+     */
+    public function showAction($person_id, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+
+        if (!$person) {
+            throw $this->createNotFoundException('person not found');
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
+
+        if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
 
-        $form = $this->createDeleteForm($id, $person);
+        $deleteForm = $this->createDeleteForm($id, $person);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-                $this->logger->notice('An activity has been removed', [
-                    'by_user' => $this->getUser()->getUsername(),
-                    'activity_id' => $activity->getId(),
-                    'person_id' => $activity->getPerson()->getId(),
-                    'comment' => $activity->getComment()->getComment(),
-                    'scope_id' => $activity->getScope()->getId(),
-                    'reasons_ids' => $activity->getReasons()
-                        ->map(function ($ar) {
-                            return $ar->getId();
-                        })
-                        ->toArray(),
-                    'type_id' => $activity->getType()->getId(),
-                    'duration' => $activity->getDurationTime()->format('U'),
-                    'date' => $activity->getDate()->format('Y-m-d'),
-                    'attendee' => $activity->getAttendee(),
-                ]);
-
-                $em->remove($activity);
-                $em->flush();
-
-                $this->addFlash('success', $this->get('translator')
-                    ->trans('The activity has been successfully removed.'));
-
-                return $this->redirect($this->generateUrl(
-                    'chill_activity_activity_list',
-                    [
-                        'person_id' => $person_id,
-                    ]
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'element_id' => $entity->getId(),
+            'action' => 'show'
         ));
-            }
-        }
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        return $this->render('ChillActivityBundle:Activity:confirm_delete.html.twig', [
-            'activity' => $activity,
-            'delete_form' => $form->createView(),
-        ]);
+        return $this->render('ChillActivityBundle:Activity:show.html.twig', array(
+            'person'      => $person,
+            'entity'      => $entity,
+            'delete_form' => $deleteForm->createView(),
+        ));
     }
 
     /**
      * Displays a form to edit an existing Activity entity.
      *
-     * @param mixed $person_id
-     * @param mixed $id
      */
     public function editAction($person_id, $id)
     {
@@ -210,140 +282,46 @@ class ActivityController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id, $person);
 
-        $event = new PrivacyEvent($person, [
+        $event = new PrivacyEvent($person, array(
             'element_class' => Activity::class,
             'element_id' => $entity->getId(),
-            'action' => 'edit',
-        ]);
+            'action' => 'edit'
+        ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        return $this->render('ChillActivityBundle:Activity:edit.html.twig', [
+        return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
-            'person' => $person,
-        ]);
+            'person' => $person
+        ));
     }
 
     /**
-     * Lists all Activity entities.
+    * Creates a form to edit a Activity entity.
     *
-     * @param mixed $person_id
-     */
-    public function listAction($person_id, Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-
-        if (null === $person) {
-            throw $this->createNotFoundException('Person not found');
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableScopes(
-                $this->getUser(),
-                new Role('CHILL_ACTIVITY_SEE'),
-                $person->getCenter()
-            );
-
-        $activities = $em->getRepository('ChillActivityBundle:Activity')
-            ->findBy(
-                ['person' => $person, 'scope' => $reachableScopes],
-                ['date' => 'DESC']
-            );
-
-        $event = new PrivacyEvent($person, [
-            'element_class' => Activity::class,
-            'action' => 'list',
-        ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        return $this->render('ChillActivityBundle:Activity:list.html.twig', [
-            'activities' => $activities,
-            'person' => $person,
-        ]);
-    }
-
-    /**
-     * Displays a form to create a new Activity entity.
+    * @param Activity $entity The entity
     *
-     * @param mixed $person_id
+    * @return \Symfony\Component\Form\Form The form
     */
-    public function newAction($person_id)
+    private function createEditForm(Activity $entity)
     {
-        $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        $form = $this->createForm(ActivityType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activity_update',
+                    array(
+                        'id' => $entity->getId(),
+                        'person_id' => $entity->getPerson()->getId()
+                )),
+            'method' => 'PUT',
+            'center' => $entity->getCenter(),
+            'role'   => new Role('CHILL_ACTIVITY_UPDATE')
+        ));
 
-        if (null === $person) {
-            throw $this->createNotFoundException('Person not found');
+        return $form;
     }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $entity = new Activity();
-        $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
-        $entity->setPerson($person);
-        $entity->setDate(new DateTime('now'));
-
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
-
-        $form = $this->createCreateForm($entity, $person);
-
-        return $this->render('ChillActivityBundle:Activity:new.html.twig', [
-            'person' => $person,
-            'entity' => $entity,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a Activity entity.
-     *
-     * @param mixed $person_id
-     * @param mixed $id
-     */
-    public function showAction($person_id, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-
-        if (!$person) {
-            throw $this->createNotFoundException('person not found');
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
-
-        $deleteForm = $this->createDeleteForm($id, $person);
-
-        $event = new PrivacyEvent($person, [
-            'element_class' => Activity::class,
-            'element_id' => $entity->getId(),
-            'action' => 'show',
-        ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        return $this->render('ChillActivityBundle:Activity:show.html.twig', [
-            'person' => $person,
-            'entity' => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ]);
-    }
-
     /**
      * Edits an existing Activity entity.
      *
-     * @param mixed $person_id
-     * @param mixed $id
      */
     public function updateAction(Request $request, $person_id, $id)
     {
@@ -362,11 +340,11 @@ class ActivityController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        $event = new PrivacyEvent($person, [
+        $event = new PrivacyEvent($person, array(
             'element_class' => Activity::class,
             'element_id' => $entity->getId(),
-            'action' => 'update',
-        ]);
+            'action' => 'update'
+        ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
         if ($editForm->isValid()) {
@@ -374,59 +352,95 @@ class ActivityController extends AbstractController
 
             $this->get('session')
                 ->getFlashBag()
-                ->add(
-                    'success',
+                ->add('success',
                     $this->get('translator')
                         ->trans('Success : activity updated!')
                 );
 
-            return $this->redirect($this->generateUrl('chill_activity_activity_show', ['id' => $id, 'person_id' => $person_id]));
+            return $this->redirect($this->generateUrl('chill_activity_activity_show', array('id' => $id, 'person_id' => $person_id)));
         }
 
         $this->get('session')
             ->getFlashBag()
-            ->add(
-                'error',
+            ->add('error',
                 $this->get('translator')
                     ->trans('This form contains errors')
             );
 
-        return $this->render('ChillActivityBundle:Activity:edit.html.twig', [
+        return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
             'person'      => $entity->getPerson(),
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
-        ]);
+        ));
     }
 
     /**
-     * Creates a form to create a Activity entity.
+     * Deletes a Activity entity.
      *
-     * @param Activity $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
      */
-    private function createCreateForm(Activity $entity)
+    public function deleteAction(Request $request, $id, $person_id)
     {
-        return $this->createForm(
-            ActivityType::class,
-            $entity,
-            [
-                'action' => $this->generateUrl('chill_activity_activity_create', [
-                    'person_id' => $entity->getPerson()->getId(),
-                ]),
-                'method' => 'POST',
-                'center' => $entity->getCenter(),
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            ]
-        );
+        $em = $this->getDoctrine()->getManager();
+
+        /* @var $activity Activity */
+        $activity = $em->getRepository('ChillActivityBundle:Activity')
+              ->find($id);
+        $person = $activity->getPerson();
+
+        if (!$activity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
+
+        $form = $this->createDeleteForm($id, $person);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+
+                $this->logger->notice("An activity has been removed", array(
+                   'by_user' => $this->getUser()->getUsername(),
+                   'activity_id' => $activity->getId(),
+                   'person_id' => $activity->getPerson()->getId(),
+                   'comment' => $activity->getComment()->getComment(),
+                   'scope_id' => $activity->getScope()->getId(),
+                   'reasons_ids' => $activity->getReasons()
+                      ->map(function ($ar) { return $ar->getId(); })
+                      ->toArray(),
+                   'type_id' => $activity->getType()->getId(),
+                   'duration' => $activity->getDurationTime()->format('U'),
+                   'date' => $activity->getDate()->format('Y-m-d'),
+                   'attendee' => $activity->getAttendee()
+                ));
+
+                $em->remove($activity);
+                $em->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                      ->trans("The activity has been successfully removed."));
+
+                return $this->redirect($this->generateUrl(
+                  'chill_activity_activity_list', array(
+                     'person_id' => $person_id
+                  )));
+            }
+        }
+
+        return $this->render('ChillActivityBundle:Activity:confirm_delete.html.twig', array(
+           'activity' => $activity,
+           'delete_form' => $form->createView()
+        ));
+
+
     }
 
     /**
      * Creates a form to delete a Activity entity by id.
      *
      * @param mixed $id The entity id
-     * @param mixed $person
      *
      * @return \Symfony\Component\Form\Form The form
      */
@@ -435,33 +449,10 @@ class ActivityController extends AbstractController
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
                 'chill_activity_activity_delete',
-                ['id' => $id, 'person_id' => $person->getId()]
-            ))
+                array('id' => $id, 'person_id' => $person->getId())))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm();
-    }
-
-    /**
-     * Creates a form to edit a Activity entity.
-     *
-     * @param Activity $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(Activity $entity)
-    {
-        return $this->createForm(ActivityType::class, $entity, [
-            'action' => $this->generateUrl(
-                'chill_activity_activity_update',
-                [
-                    'id' => $entity->getId(),
-                    'person_id' => $entity->getPerson()->getId(),
-                ]
-            ),
-            'method' => 'PUT',
-            'center' => $entity->getCenter(),
-            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
-        ]);
+            ->add('submit', SubmitType::class, array('label' => 'Delete'))
+            ->getForm()
+        ;
     }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -1,27 +1,38 @@
 <?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\ActivityBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Chill\ActivityBundle\Form\ActivityReasonCategoryType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * ActivityReasonCategory controller.
+ *
  */
 class ActivityReasonCategoryController extends AbstractController
 {
+
+    /**
+     * Lists all ActivityReasonCategory entities.
+     *
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', array(
+            'entities' => $entities,
+        ));
+    }
     /**
      * Creates a new ActivityReasonCategory entity.
+     *
      */
     public function createAction(Request $request)
     {
@@ -34,19 +45,71 @@ class ActivityReasonCategoryController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', array('id' => $entity->getId())));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
             'entity' => $entity,
             'form'   => $form->createView(),
-        ]);
+        ));
+    }
+
+    /**
+     * Creates a form to create a ActivityReasonCategory entity.
+     *
+     * @param ActivityReasonCategory $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReasonCategory $entity)
+    {
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
+            'method' => 'POST',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new ActivityReasonCategory entity.
+     *
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReasonCategory();
+        $form   = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a ActivityReasonCategory entity.
+     *
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', array(
+            'entity'      => $entity,
+        ));
     }
 
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
      *
-     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -60,64 +123,33 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
-        ]);
+        ));
     }
 
     /**
-     * Lists all ActivityReasonCategory entities.
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
-            'entities' => $entities,
-        ]);
-    }
-
-    /**
-     * Displays a form to create a new ActivityReasonCategory entity.
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReasonCategory();
-        $form = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
-            'entity' => $entity,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a ActivityReasonCategory entity.
+    * Creates a form to edit a ActivityReasonCategory entity.
     *
-     * @param mixed $id
+    * @param ActivityReasonCategory $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
     */
-    public function showAction($id)
+    private function createEditForm(ActivityReasonCategory $entity)
     {
-        $em = $this->getDoctrine()->getManager();
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', array('id' => $entity->getId())),
+            'method' => 'PUT',
+        ));
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
+        return $form;
     }
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReasonCategory entity.
      *
-     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -135,50 +167,12 @@ class ActivityReasonCategoryController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', array('id' => $id)));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
-        ]);
-    }
-
-    /**
-     * Creates a form to create a ActivityReasonCategory entity.
-     *
-     * @param ActivityReasonCategory $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReasonCategory $entity)
-    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
-            'method' => 'POST',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
-
-        return $form;
-    }
-
-    /**
-     * Creates a form to edit a ActivityReasonCategory entity.
-     *
-     * @param ActivityReasonCategory $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(ActivityReasonCategory $entity)
-    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Update']);
-
-        return $form;
+        ));
     }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -1,27 +1,38 @@
 <?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\ActivityBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Form\ActivityReasonType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * ActivityReason controller.
+ *
  */
 class ActivityReasonController extends AbstractController
 {
+
+    /**
+     * Lists all ActivityReason entities.
+     *
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
+
+        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', array(
+            'entities' => $entities,
+        ));
+    }
     /**
      * Creates a new ActivityReason entity.
+     *
      */
     public function createAction(Request $request)
     {
@@ -34,19 +45,71 @@ class ActivityReasonController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $entity->getId())));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
             'entity' => $entity,
             'form'   => $form->createView(),
-        ]);
+        ));
+    }
+
+    /**
+     * Creates a form to create a ActivityReason entity.
+     *
+     * @param ActivityReason $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReason $entity)
+    {
+        $form = $this->createForm(ActivityReasonType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreason_create'),
+            'method' => 'POST',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new ActivityReason entity.
+     *
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReason();
+        $form   = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a ActivityReason entity.
+     *
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', array(
+            'entity'      => $entity,
+        ));
     }
 
     /**
      * Displays a form to edit an existing ActivityReason entity.
      *
-     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -60,64 +123,33 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
             'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
+            'edit_form'   => $editForm->createView()
+        ));
     }
 
     /**
-     * Lists all ActivityReason entities.
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
-            'entities' => $entities,
-        ]);
-    }
-
-    /**
-     * Displays a form to create a new ActivityReason entity.
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReason();
-        $form = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
-            'entity' => $entity,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a ActivityReason entity.
+    * Creates a form to edit a ActivityReason entity.
     *
-     * @param mixed $id
+    * @param ActivityReason $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
     */
-    public function showAction($id)
+    private function createEditForm(ActivityReason $entity)
     {
-        $em = $this->getDoctrine()->getManager();
+        $form = $this->createForm(ActivityReasonType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreason_update', array('id' => $entity->getId())),
+            'method' => 'PUT',
+        ));
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
+        return $form;
     }
-
-        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReason entity.
      *
-     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -135,50 +167,12 @@ class ActivityReasonController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $id)));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
             'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
-    /**
-     * Creates a form to create a ActivityReason entity.
-     *
-     * @param ActivityReason $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReason $entity)
-    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreason_create'),
-            'method' => 'POST',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
-
-        return $form;
-    }
-
-    /**
-     * Creates a form to edit a ActivityReason entity.
-     *
-     * @param ActivityReason $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(ActivityReason $entity)
-    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Update']);
-
-        return $form;
+            'edit_form'   => $editForm->createView()
+        ));
     }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityTypeController.php

@@ -1,27 +1,38 @@
 <?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\ActivityBundle\Controller;
 
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Form\ActivityTypeType;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Request;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Form\ActivityTypeType;
 
 /**
- * Class ActivityTypeController.
+ * Class ActivityTypeController
+ *
+ * @package Chill\ActivityBundle\Controller
  */
 class ActivityTypeController extends AbstractController
 {
+
+    /**
+     * Lists all ActivityType entities.
+     *
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillActivityBundle:ActivityType')->findAll();
+
+        return $this->render('ChillActivityBundle:ActivityType:index.html.twig', array(
+            'entities' => $entities,
+        ));
+    }
     /**
      * Creates a new ActivityType entity.
+     *
      */
     public function createAction(Request $request)
     {
@@ -34,19 +45,71 @@ class ActivityTypeController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activitytype_show', ['id' => $entity->getId()]));
+            return $this->redirect($this->generateUrl('chill_activity_activitytype_show', array('id' => $entity->getId())));
         }
 
-        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', array(
             'entity' => $entity,
             'form'   => $form->createView(),
-        ]);
+        ));
+    }
+
+    /**
+     * Creates a form to create a ActivityType entity.
+     *
+     * @param ActivityType $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityType $entity)
+    {
+        $form = $this->createForm(ActivityTypeType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activitytype_create'),
+            'method' => 'POST',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new ActivityType entity.
+     *
+     */
+    public function newAction()
+    {
+        $entity = new ActivityType();
+        $form   = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a ActivityType entity.
+     *
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityType entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityType:show.html.twig', array(
+            'entity'      => $entity,
+        ));
     }
 
     /**
      * Displays a form to edit an existing ActivityType entity.
      *
-     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -60,64 +123,33 @@ class ActivityTypeController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', array(
             'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
+            'edit_form'   => $editForm->createView()
+        ));
     }
 
     /**
-     * Lists all ActivityType entities.
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityType')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityType:index.html.twig', [
-            'entities' => $entities,
-        ]);
-    }
-
-    /**
-     * Displays a form to create a new ActivityType entity.
-     */
-    public function newAction()
-    {
-        $entity = new ActivityType();
-        $form = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', [
-            'entity' => $entity,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a ActivityType entity.
+    * Creates a form to edit a ActivityType entity.
     *
-     * @param mixed $id
+    * @param ActivityType $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
     */
-    public function showAction($id)
+    private function createEditForm(ActivityType $entity)
     {
-        $em = $this->getDoctrine()->getManager();
+        $form = $this->createForm(ActivityTypeType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activitytype_update', array('id' => $entity->getId())),
+            'method' => 'PUT',
+        ));
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityType entity.');
+        return $form;
     }
-
-        return $this->render('ChillActivityBundle:ActivityType:show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityType entity.
      *
-     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -135,50 +167,12 @@ class ActivityTypeController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activitytype_edit', ['id' => $id]));
+            return $this->redirect($this->generateUrl('chill_activity_activitytype_edit', array('id' => $id)));
         }
 
-        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', array(
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
-        ]);
-    }
-
-    /**
-     * Creates a form to create a ActivityType entity.
-     *
-     * @param ActivityType $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityType $entity)
-    {
-        $form = $this->createForm(ActivityTypeType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activitytype_create'),
-            'method' => 'POST',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
-
-        return $form;
-    }
-
-    /**
-     * Creates a form to edit a ActivityType entity.
-     *
-     * @param ActivityType $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(ActivityType $entity)
-    {
-        $form = $this->createForm(ActivityTypeType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activitytype_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Update']);
-
-        return $form;
+        ));
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -1,18 +1,33 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
+ * Copyright (C) 2015 Champs Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Controller;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * Controller for activity configuration.
+ * Controller for activity configuration
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
  */
 class AdminController extends AbstractController
 {

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

@@ -1,25 +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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory as FakerFactory;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityReason;
+use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityType;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 /**
- * Load reports into DB.
+ * Load reports into DB
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
@@ -40,48 +57,30 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
         return 16400;
     }
 
-    public function load(ObjectManager $manager)
+    /**
+     * Return a random scope
+     *
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getRandomScope()
     {
-        $persons = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillPersonBundle:Person')
-            ->findAll();
-
-        foreach ($persons as $person) {
-            $activityNbr = rand(0, 3);
-
-            for ($i = 0; $i < $activityNbr; ++$i) {
-                echo 'Creating an activity type for  : ' . $person . "\n";
-                $activity = $this->newRandomActivity($person);
-                $manager->persist($activity);
-            }
-        }
-        $manager->flush();
-    }
-
-    public function newRandomActivity($person)
-    {
-        $activity = (new Activity())
-            ->setUser($this->getRandomUser())
-            ->setPerson($person)
-            ->setDate($this->faker->dateTimeThisYear())
-            ->setDurationTime($this->faker->dateTime(36000))
-            ->setType($this->getRandomActivityType())
-            ->setScope($this->getRandomScope())
-            ->setAttendee($this->faker->boolean());
-
-        $usedId = [];
-
-        for ($i = 0; rand(0, 4) > $i; ++$i) {
-            $reason = $this->getRandomActivityReason($usedId);
-            $usedId[] = $reason->getId();
-            $activity->addReason($reason);
-        }
-
-        return $activity;
+        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
+        return $this->getReference($scopeRef);
     }
 
     /**
-     * Return a random activityReason.
+     * Return a random activityType
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    private function getRandomActivityType()
+    {
+        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
+        return $this->getReference($typeRef);
+    }
+
+    /**
+     * Return a random activityReason
      *
      * @return \Chill\ActivityBundle\Entity\ActivityReason
      */
@@ -98,38 +97,52 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
     }
 
     /**
-     * Return a random activityType.
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    private function getRandomActivityType()
-    {
-        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
-
-        return $this->getReference($typeRef);
-    }
-
-    /**
-     * Return a random scope.
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getRandomScope()
-    {
-        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
-
-        return $this->getReference($scopeRef);
-    }
-
-    /**
-     * Return a random user.
+     * Return a random user
      *
      * @return \Chill\MainBundle\Entity\User
      */
     private function getRandomUser()
     {
         $userRef = array_rand(LoadUsers::$refs);
-
         return $this->getReference($userRef);
     }
+
+    public function newRandomActivity($person)
+    {
+        $activity = (new Activity())
+            ->setUser($this->getRandomUser())
+            ->setPerson($person)
+            ->setDate($this->faker->dateTimeThisYear())
+            ->setDurationTime($this->faker->dateTime(36000))
+            ->setType($this->getRandomActivityType())
+            ->setScope($this->getRandomScope())
+            ->setAttendee($this->faker->boolean())
+            ;
+
+        $usedId = array();
+        for ($i = 0; $i < rand(0, 4); $i++) {
+            $reason = $this->getRandomActivityReason($usedId);
+            $usedId[] = $reason->getId();
+            $activity->addReason($reason);
+        }
+
+        return $activity;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $persons = $this->container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillPersonBundle:Person')
+            ->findAll();
+
+        foreach($persons as $person) {
+            $activityNbr = rand(0,3);
+            for($i = 0; $i < $activityNbr; $i ++) {
+                print "Creating an activity type for  : ".$person."\n";
+                $activity = $this->newRandomActivity($person);
+                $manager->persist($activity);
+            }
+        }
+        $manager->flush();
+    }
 }

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

@@ -1,56 +1,71 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityReason;
 
 /**
- * Description of LoadActivityReason.
+ * Description of LoadActivityReason
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterface
 {
-    public static $references = [];
-
     public function getOrder()
     {
         return 16300;
     }
     
+    public static $references = array();
+    
     public function load(ObjectManager $manager)
     {
         $reasons = [
             [
                 'name' => ['fr' => 'Recherche logement', 'en' => 'Housing research', 'nl' => 'Woning zoektoch'],
-                'category' => 'cat_Housing', ],
+                'category' => 'cat_Housing'],
             [
                 'name' => ['fr' => 'Problème avec propriétaire', 'en' => 'Landlord problems', 'nl' => 'Huisbaas problemen'],
-                'category' => 'cat_Housing', ],
+                'category' => 'cat_Housing'],
             [
                 'name' => ['fr' => 'Retard de payement', 'en' => 'Payement problems', 'nl' => 'Betalings vertragingen'],
-                'category' => 'cat_Housing', ],
+                'category' => 'cat_Housing'],
             [
                 'name' => ['fr' => 'Explication législation', 'en' => 'Legislation explanation', 'nl' => 'Legislative uitleg'],
-                'category' => 'cat_Unemployment procedure', ],
+                'category' => 'cat_Unemployment procedure'],
             [
                 'name' => ['fr' => 'Coaching entretien d\'activation', 'en' => 'Interview coaching', 'nl' => 'Interview coaching'],
-                'category' => 'cat_Unemployment procedure', ],
+                'category' => 'cat_Unemployment procedure'],
             [
                 'name' => ['fr' => 'Récupération des allocations', 'en' => 'Allowance recovery', 'nl' => 'Terugwinning van de uitkeringen'],
-                'category' => 'cat_Unemployment procedure', ],
+                'category' => 'cat_Unemployment procedure']
         ];
         
         foreach ($reasons as $r) {
-            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
+            print "Creating activity reason : " . $r['name']['en'] . "\n";
             $activityReason = (new ActivityReason())
                 ->setName(($r['name']))
                 ->setActive(true)

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

@@ -1,21 +1,35 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 /**
- * Description of LoadActivityReasonCategory.
+ * Description of LoadActivityReasonCategory
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -27,20 +41,21 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
     public function load(ObjectManager $manager)
     {
         $categs = [
-            ['name' => ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
-            ['name' => ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
+            ['name' =>
+                ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
+            ['name' =>
+                ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
         ];
             
         foreach ($categs as $c) {
-            echo 'Creating activity reason category : ' . $c['name']['en'] . "\n";
+            print "Creating activity reason category : " . $c['name']['en'] . "\n";
             $activityReasonCategory = (new ActivityReasonCategory())
                 ->setName(($c['name']))
                 ->setActive(true);
             $manager->persist($activityReasonCategory);
             $this->addReference(
               'cat_'.$c['name']['en'],
-                $activityReasonCategory
-            );
+              $activityReasonCategory);
         }
         
         $manager->flush();

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

@@ -1,41 +1,59 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityType;
 
 /**
- * Description of LoadActivityType.
+ * Description of LoadActivityType
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityType extends AbstractFixture implements OrderedFixtureInterface
 {
-    public static $references = [];
-
     public function getOrder()
     {
         return 16100;
     }
     
+    public static $references = array();
+
     public function load(ObjectManager $manager)
     {
         $types = [
-            ['name' => ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel']],
-            ['name' => ['fr' => 'Entretien', 'en' => 'Interview', 'nl' => 'Vraaggesprek']],
-            ['name' => ['fr' => 'Inspection', 'en' => 'Inspection', 'nl' => 'Inspectie']],
+            [ 'name' =>
+                ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel']],
+            [ 'name' =>
+                ['fr' => 'Entretien', 'en' => 'Interview', 'nl' => 'Vraaggesprek']],
+            [ 'name' =>
+                ['fr' => 'Inspection', 'en' => 'Inspection', 'nl' => 'Inspectie']]
         ];
             
         foreach ($types as $t) {
-            echo 'Creating activity type : ' . $t['name']['en'] . "\n";
+            print "Creating activity type : " . $t['name']['en'] . "\n";
             $activityType = (new ActivityType())
                 ->setName(($t['name']));
             $manager->persist($activityType);

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

@@ -1,25 +1,37 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 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.
+ * 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\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 
 /**
  * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
- * and a role CHILL_ACTIVITY_SEE for administrative.
+ * and a role CHILL_ACTIVITY_SEE for administrative
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -28,11 +40,11 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
         return 16000;
     }
 
+    
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
-
             foreach (LoadScopes::$references as $scopeRef){
                 $scope = $this->getReference($scopeRef);
                 //create permission group
@@ -41,24 +53,18 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                         if ($scope->getName()['en'] === 'administrative') {
                             break 2; // we do not want any power on administrative
                         }
-
                         break;
-
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'])) {
+                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
                             break 2; // we do not want any power on social or administrative
                         }  
-
                         break;
                 }
                 
-                printf(
-                    'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
+                printf("Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s "
                         . "permission group, scope '%s' \n", 
-                    $permissionsGroup->getName(),
-                    $scope->getName()['en']
-                );
+                        $permissionsGroup->getName(), $scope->getName()['en']);
                 $roleScopeUpdate = (new RoleScope())
                             ->setRole('CHILL_ACTIVITY_UPDATE')
                             ->setScope($scope);
@@ -72,18 +78,22 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                             ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeDelete);
                 $roleScopeList = (new RoleScope())
-                    ->setRole(ActivityStatsVoter::LISTS);
+                            ->setRole(ActivityStatsVoter::LISTS)
+                            ;
                 $permissionsGroup->addRoleScope($roleScopeList);
                 $roleScopeStat = (new RoleScope())
-                    ->setRole(ActivityStatsVoter::STATS);
+                            ->setRole(ActivityStatsVoter::STATS)
+                            ;
                 $permissionsGroup->addRoleScope($roleScopeStat);
                 
                 $manager->persist($roleScopeUpdate);
                 $manager->persist($roleScopeCreate);
                 $manager->persist($roleScopeDelete);
             }
+            
         }
         
         $manager->flush();
     }
+
 }

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -1,28 +1,45 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\DependencyInjection;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 
 /**
- * This is the class that loads and manages your bundle configuration.
+ * This is the class that loads and manages your bundle configuration
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillActivityExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
@@ -35,7 +52,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
         $loader->load('services/fixtures.yaml');
-        $loader->load('services/menu.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');
@@ -47,30 +63,30 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $this->prependAuthorization($container);
     }
 
-    public function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', [
-            'role_hierarchy' => [
-                ActivityVoter::UPDATE => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::CREATE => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
-            ],
-        ]);
-    }
-
     /* (non-PHPdoc)
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container) 
     {
         //add routes for custom bundle
-        $container->prependExtensionConfig('chill_main', [
-            'routing' => [
-                'resources' => [
-                    '@ChillActivityBundle/config/routes.yaml',
-                ],
-            ],
-        ]);
+         $container->prependExtensionConfig('chill_main', array(
+           'routing' => array(
+              'resources' => array(
+                 '@ChillActivityBundle/config/routes.yaml'
+              )
+           )
+        ));
+    }
+    
+    public function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', array(
+           'role_hierarchy' => array(
+              ActivityVoter::UPDATE => array(ActivityVoter::SEE_DETAILS),
+              ActivityVoter::CREATE => array(ActivityVoter::SEE_DETAILS),
+              ActivityVoter::DELETE => array(ActivityVoter::SEE_DETAILS),
+              ActivityVoter::SEE_DETAILS => array(ActivityVoter::SEE)
+           )
+        ));
     }
 }

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -1,24 +1,20 @@
 <?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\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files.
+ * This is the class that validates and merges configuration from your app/config files
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_activity');
@@ -33,7 +29,7 @@ class Configuration implements ConfigurationInterface
                             ->isRequired()
                             ->requiresAtLeastOneElement()
                             ->defaultValue(
-                [
+                                    array(
                                         [ 'label' => '5 minutes',  'seconds' => 300], 
                                         [ 'label' => '10 minutes', 'seconds' => 600],
                                         [ 'label' => '15 minutes', 'seconds' => 900],
@@ -46,25 +42,27 @@ class Configuration implements ConfigurationInterface
                                         [ 'label' => '1 hour 30',  'seconds' => 5400],
                                         [ 'label' => '1 hour 45',  'seconds' => 6300],
                                         [ 'label' => '2 hours',    'seconds' => 7200],
-                ]
+                                        )
                                     )
                             ->info('The intervals of time to show in activity form')
+
                             ->prototype('array')
                                 ->children()
                                     ->scalarNode('seconds')
-            ->info('The number of seconds of this duration. Must be an integer.')
+                                        ->info("The number of seconds of this duration. Must be an integer.")
                                         ->cannotBeEmpty()
                                         ->validate()
                                             ->ifTrue(function($data) {
                                                 return !is_int($data);
-            })->thenInvalid('The value %s is not a valid integer')
+                                            })->thenInvalid("The value %s is not a valid integer")
                                         ->end()
                                     ->end()
                                     ->scalarNode('label')
                                         ->cannotBeEmpty()
-            ->info('The label to show into fields')
+                                        ->info("The label to show into fields")
                                     ->end()
                                 ->end()
+
                             ->end()
 //                            ->validate()
 //                            
@@ -88,6 +86,7 @@ class Configuration implements ConfigurationInterface
 //                            ->end()
                             ->end()
                         ->end()
+                
                     ->end()
                 ->end();
 

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -1,33 +1,46 @@
 <?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.
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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\ActivityBundle\Entity;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
+use Chill\MainBundle\Entity\Center;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use Doctrine\Common\Collections\ArrayCollection;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 
 /**
- * Class Activity.
+ * Class Activity
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
  * @ORM\Table(name="activity")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  * @UserCircleConsistency(
  *      "CHILL_ACTIVITY_SEE_DETAILS",
  *      getUserFunction="getUser",
@@ -36,30 +49,7 @@ use Doctrine\ORM\Mapping as ORM;
 class Activity implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
-     */
-    private $attendee;
-
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     */
-    private $comment;
-
-    /**
-     * @var DateTime
-     * @ORM\Column(type="datetime")
-     */
-    private $date;
-
-    /**
-     * @var DateTime
-     * @ORM\Column(type="time")
-     */
-    private $durationTime;
-
-    /**
-     * @var int
+     * @var integer
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -68,10 +58,28 @@ class Activity implements HasCenterInterface, HasScopeInterface
     private $id;
 
     /**
-     * @var Person
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @var User
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $person;
+    private $user;
+
+    /**
+     * @var \DateTime
+     * @ORM\Column(type="datetime")
+     */
+    private $date;
+
+    /**
+     * @var \DateTime
+     * @ORM\Column(type="time")
+     */
+    private $durationTime;
+
+    /**
+     * @var boolean
+     * @ORM\Column(type="boolean")
+     */
+    private $attendee;
 
     /**
      * @var ActivityReason
@@ -79,12 +87,6 @@ class Activity implements HasCenterInterface, HasScopeInterface
      */
     private $reasons;
 
-    /**
-     * @var Scope
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     */
-    private $scope;
-
     /**
      * @var ActivityType
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
@@ -92,10 +94,21 @@ class Activity implements HasCenterInterface, HasScopeInterface
     private $type;
 
     /**
-     * @var User
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @var Scope
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private $user;
+    private $scope;
+
+    /**
+     * @var Person
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     */
+    private $person;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     */
+    private $comment;
 
     /**
      * Activity constructor.
@@ -107,8 +120,111 @@ class Activity implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Add a reason.
+     * Get id
      *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set user
+     *
+     * @param User $user
+     * @return Activity
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    /**
+     * Get user
+     *
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * Set date
+     *
+     * @param \DateTime $date
+     * @return Activity
+     */
+    public function setDate($date)
+    {
+        $this->date = $date;
+
+        return $this;
+    }
+
+    /**
+     * Get date
+     *
+     * @return \DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+
+    /**
+     * Set durationTime
+     *
+     * @param \DateTime $durationTime
+     * @return Activity
+     */
+    public function setDurationTime($durationTime)
+    {
+        $this->durationTime = $durationTime;
+
+        return $this;
+    }
+
+    /**
+     * Get durationTime
+     *
+     * @return \DateTime
+     */
+    public function getDurationTime()
+    {
+        return $this->durationTime;
+    }
+
+    /**
+     * Set attendee
+     *
+     * @param boolean $attendee
+     * @return Activity
+     */
+    public function setAttendee($attendee)
+    {
+        $this->attendee = $attendee;
+
+        return $this;
+    }
+
+    /**
+     * Get attendee
+     *
+     * @return boolean
+     */
+    public function getAttendee()
+    {
+        return $this->attendee;
+    }
+
+    /**
+     * Add a reason
+     *
+     * @param ActivityReason $reason
      * @return Activity
      */
     public function addReason(ActivityReason $reason)
@@ -119,18 +235,95 @@ class Activity implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Get attendee.
-     *
-     * @return bool
+     * @param ActivityReason $reason
      */
-    public function getAttendee()
+    public function removeReason(ActivityReason $reason)
     {
-        return $this->attendee;
+        $this->reasons->removeElement($reason);
+    }
+
+    /**
+     * Get reasons
+     *
+     * @return Collection
+     */
+    public function getReasons()
+    {
+        return $this->reasons;
+    }
+
+    /**
+     * Set type
+     *
+     * @param ActivityType $type
+     * @return Activity
+     */
+    public function setType(ActivityType $type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get type
+     *
+     * @return ActivityType
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set scope
+     *
+     * @param Scope $scope
+     * @return Activity
+     */
+    public function setScope(Scope $scope)
+    {
+        $this->scope = $scope;
+
+        return $this;
+    }
+
+    /**
+     * Get scope
+     *
+     * @return Scope
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    /**
+     * Set person
+     *
+     * @param Person $person
+     * @return Activity
+     */
+    public function setPerson(Person $person)
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    /**
+     * Get person
+     *
+     * @return Person
+     */
+    public function getPerson()
+    {
+        return $this->person;
     }
 
     /**
      * get the center
-     * center is extracted from person.
+     * center is extracted from person
      *
      * @return Center
      */
@@ -147,105 +340,6 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->comment;
     }
 
-    /**
-     * Get date.
-     *
-     * @return DateTime
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * Get durationTime.
-     *
-     * @return DateTime
-     */
-    public function getDurationTime()
-    {
-        return $this->durationTime;
-    }
-
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get person.
-     *
-     * @return Person
-     */
-    public function getPerson()
-    {
-        return $this->person;
-    }
-
-    /**
-     * Get reasons.
-     *
-     * @return Collection
-     */
-    public function getReasons()
-    {
-        return $this->reasons;
-    }
-
-    /**
-     * Get scope.
-     *
-     * @return Scope
-     */
-    public function getScope()
-    {
-        return $this->scope;
-    }
-
-    /**
-     * Get type.
-     *
-     * @return ActivityType
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Get user.
-     *
-     * @return User
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    public function removeReason(ActivityReason $reason)
-    {
-        $this->reasons->removeElement($reason);
-    }
-
-    /**
-     * Set attendee.
-     *
-     * @param bool $attendee
-     *
-     * @return Activity
-     */
-    public function setAttendee($attendee)
-    {
-        $this->attendee = $attendee;
-
-        return $this;
-    }
-
     /**
      * @param \Chill\MainBundle\Entity\Embeddalbe\CommentEmbeddable $comment
      */
@@ -253,80 +347,5 @@ class Activity implements HasCenterInterface, HasScopeInterface
     {
         $this->comment = $comment;
     }
-
-    /**
-     * Set date.
-     *
-     * @param DateTime $date
-     *
-     * @return Activity
-     */
-    public function setDate($date)
-    {
-        $this->date = $date;
-
-        return $this;
 }
 
-    /**
-     * Set durationTime.
-     *
-     * @param DateTime $durationTime
-     *
-     * @return Activity
-     */
-    public function setDurationTime($durationTime)
-    {
-        $this->durationTime = $durationTime;
-
-        return $this;
-    }
-
-    /**
-     * Set person.
-     *
-     * @return Activity
-     */
-    public function setPerson(Person $person)
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    /**
-     * Set scope.
-     *
-     * @return Activity
-     */
-    public function setScope(Scope $scope)
-    {
-        $this->scope = $scope;
-
-        return $this;
-    }
-
-    /**
-     * Set type.
-     *
-     * @return Activity
-     */
-    public function setType(ActivityType $type)
-    {
-        $this->type = $type;
-
-        return $this;
-    }
-
-    /**
-     * Set user.
-     *
-     * @return Activity
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-}

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -1,41 +1,40 @@
 <?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.
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 
 /**
- * Class ActivityReason.
+ * Class ActivityReason
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activityreason")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityReason
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var ActivityReasonCategory
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
-     * inversedBy="reasons")
-     */
-    private $category;
-
-    /**
-     * @var int
+     * @var integer
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -50,17 +49,86 @@ class ActivityReason
     private $name;
 
     /**
-     * Get active.
-     *
-     * @return bool
+     * @var ActivityReasonCategory
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
+     *     inversedBy="reasons")
      */
-    public function getActive()
+    private $category;
+
+    /**
+     * @var boolean
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
     {
-        return $this->active;
+        return $this->id;
     }
 
     /**
-     * Get category.
+     * Set name
+     *
+     * @param array $name
+     * @return ActivityReason
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return array | string
+     */
+    public function getName($locale = null)
+    {
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            } else {
+                foreach ($this->name as $name) {
+                    if (!empty($name)) {
+                        return $name;
+                    }
+                }
+            }
+            return '';
+        } else {
+            return $this->name;
+        }
+    }
+    
+    /**
+     * Set category of the reason. If you set to the reason an inactive
+     * category, the reason will become inactive
+     *
+     * @param ActivityReasonCategory $category
+     * @return ActivityReason
+     */
+    public function setCategory(ActivityReasonCategory $category)
+    {
+        if($this->category !== $category && ! $category->getActive()) {
+            $this->setActive(False);
+        }
+        
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * Get category
      *
      * @return ActivityReasonCategory
      */
@@ -70,46 +138,9 @@ class ActivityReason
     }
 
     /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get name.
-     *
-     * @param mixed|null $locale
-     *
-     * @return array | string
-     */
-    public function getName($locale = null)
-    {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            }
-
-            foreach ($this->name as $name) {
-                if (!empty($name)) {
-                    return $name;
-                }
-            }
-
-            return '';
-        }
-
-        return $this->name;
-    }
-
-    /**
-     * Set active.
-     *
-     * @param bool $active
+     * Set active
      *
+     * @param boolean $active
      * @return ActivityReason
      */
     public function setActive($active)
@@ -120,33 +151,13 @@ class ActivityReason
     }
 
     /**
-     * Set category of the reason. If you set to the reason an inactive
-     * category, the reason will become inactive.
+     * Get active
      *
-     * @return ActivityReason
+     * @return boolean
      */
-    public function setCategory(ActivityReasonCategory $category)
+    public function getActive()
     {
-        if ($this->category !== $category && !$category->getActive()) {
-            $this->setActive(false);
-        }
-
-        $this->category = $category;
-
-        return $this;
-    }
-
-    /**
-     * Set name.
-     *
-     * @param array $name
-     *
-     * @return ActivityReason
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
+        return $this->active;
     }
 }
+

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -1,34 +1,39 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
  * 
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * Class ActivityReasonCategory.
+ * Class ActivityReasonCategory
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activityreasoncategory")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityReasonCategory
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var int
+     * @var integer
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -43,8 +48,13 @@ class ActivityReasonCategory
     private $name;
 
     /**
-     * Array of ActivityReason.
-     *
+     * @var boolean
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+    
+    /**
+     * Array of ActivityReason
      * @var ArrayCollection
      * @ORM\OneToMany(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
@@ -69,19 +79,9 @@ class ActivityReasonCategory
     }
 
     /**
-     * Get active.
+     * Get id
      *
-     * @return bool
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * Get id.
-     *
-     * @return int
+     * @return integer
      */
     public function getId()
     {
@@ -89,9 +89,20 @@ class ActivityReasonCategory
     }
 
     /**
-     * Get name.
+     * Set name
      *
-     * @param mixed|null $locale
+     * @param array $name
+     * @return ActivityReasonCategory
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
      *
      * @return array
      */
@@ -100,27 +111,25 @@ class ActivityReasonCategory
         if ($locale) {
             if (isset($this->name[$locale])) {
                 return $this->name[$locale];
-            }
-
+            } else {
                 foreach ($this->name as $name) {
                     if (!empty($name)) {
                         return $name;
                     }
                 }
-
-            return '';
             }
-
+            return '';
+        } else {
             return $this->name;
         }
+    }
 
     /**
      * Declare a category as active (or not). When a category is set
      * as unactive, all the reason have this entity as category is also
-     * set as unactive.
-     *
-     * @param bool $active
+     * set as unactive
      *
+     * @param boolean $active
      * @return ActivityReasonCategory
      */
     public function setActive($active)
@@ -137,16 +146,13 @@ class ActivityReasonCategory
     }
 
     /**
-     * Set name.
+     * Get active
      *
-     * @param array $name
-     *
-     * @return ActivityReasonCategory
+     * @return boolean
      */
-    public function setName($name)
+    public function getActive()
     {
-        $this->name = $name;
+        return $this->active;
+    }
+}
 
-        return $this;
-    }
-}

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -1,10 +1,21 @@
 <?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.
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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\ActivityBundle\Entity;
@@ -12,22 +23,17 @@ namespace Chill\ActivityBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class ActivityType.
+ * Class ActivityType
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activitytype")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityType
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var int
+     * @var integer
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -42,20 +48,16 @@ class ActivityType
     private $name;
     
     /**
-     * Get active
-     * return true if the type is active.
-     *
-     * @return bool
+     * @var bool
+     * @ORM\Column(type="boolean")
      */
-    public function getActive()
-    {
-        return $this->active;
-    }
+    private $active = true;
+
 
     /**
-     * Get id.
+     * Get id
      *
-     * @return int
+     * @return integer
      */
     public function getId()
     {
@@ -63,62 +65,9 @@ class ActivityType
     }
 
     /**
-     * Get name.
-     *
-     * @param mixed|null $locale
-     *
-     * @return array | string
-     */
-    public function getName($locale = null)
-    {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            }
-
-            foreach ($this->name as $name) {
-                if (!empty($name)) {
-                    return $name;
-                }
-            }
-
-            return '';
-        }
-
-        return $this->name;
-    }
-
-    /**
-     * Is active
-     * return true if the type is active.
-     *
-     * @return bool
-     */
-    public function isActive()
-    {
-        return $this->getActive();
-    }
-
-    /**
-     * Set active
-     * set to true if the type is active.
-     *
-     * @param bool $active
-     *
-     * @return ActivityType
-     */
-    public function setActive($active)
-    {
-        $this->active = $active;
-
-        return $this;
-    }
-
-    /**
-     * Set name.
+     * Set name
      *
      * @param array $name
-     *
      * @return ActivityType
      */
     public function setName($name)
@@ -127,4 +76,61 @@ class ActivityType
 
         return $this;
     }
+
+    /**
+     * Get name
+     *
+     * @return array | string
+     */
+    public function getName($locale = null)
+    {
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            } else {
+                foreach ($this->name as $name) {
+                    if (!empty($name)) {
+                        return $name;
                     }
+                }
+            }
+            return '';
+        } else {
+            return $this->name;
+        }
+    }
+    
+    /**
+     * Get active
+     * return true if the type is active.
+     * 
+     * @return boolean
+     */
+    public function getActive() {
+        return $this->active;
+    }
+    
+    /**
+     * Is active
+     * return true if the type is active
+     * 
+     * @return boolean
+     */
+    public function isActive() {
+        return $this->getActive();
+    }
+
+    /**
+     * Set active
+     * set to true if the type is active
+     * 
+     * @param boolean $active
+     * @return ActivityType
+     */
+    public function setActive($active) {
+        $this->active = $active;
+        return $this;
+    }
+
+}
+

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php

@@ -1,42 +1,58 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-class ActivityReasonAggregator implements
-    AggregatorInterface,
+/**
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class ActivityReasonAggregator implements AggregatorInterface,
     ExportElementValidatedInterface
 {
     /**
+     *
      * @var EntityRepository
      */
     protected $categoryRepository;
 
     /**
+     *
      * @var EntityRepository
      */
     protected $reasonRepository;
 
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $stringHelper;
@@ -51,46 +67,41 @@ class ActivityReasonAggregator implements
         $this->stringHelper       = $stringHelper;
     }
 
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
-        if ('reasons' === $data['level']) {
+        if ($data['level'] === 'reasons') {
             $elem = 'reasons.id';
             $alias = 'activity_reasons_id';
-        } elseif ('categories' === $data['level']) {
+        } elseif ($data['level'] === 'categories') {
             $elem = 'category.id';
             $alias = 'activity_categories_id';
         } else {
-            throw new RuntimeException('the data provided are not recognized');
+            throw new \RuntimeException('the data provided are not recognized');
         }
 
         $qb->addSelect($elem.' as '.$alias);
 
         // make a jointure only if needed
         $join = $qb->getDQLPart('join');
-
         if (
-            (
-                array_key_exists('activity', $join)
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            (array_key_exists('activity', $join)
+            &&
+            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            or (!array_key_exists('activity', $join))
+            OR
+            (! array_key_exists('activity', $join))
         ) {
             $qb->add(
                     'join',
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
-                ],
-                true
-            );
+                    array('activity' =>
+                        new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')
+                        ),
+                    true);
         }
 
         // join category if necessary
-        if ('activity_categories_id' === $alias) {
+        if ($alias === 'activity_categories_id') {
             // add join only if needed
             if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
                 $qb->join('reasons.category', 'category');
@@ -107,109 +118,12 @@ class ActivityReasonAggregator implements
         }
     }
 
-    public function applyOn()
-    {
-        return 'activity';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('level', ChoiceType::class, [
-            'choices' => [
-                'By reason' => 'reasons',
-                'By category of reason' => 'categories',
-            ],
-            'multiple' => false,
-            'expanded' => true,
-            'label' => 'Reason\'s level',
-        ]);
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        // for performance reason, we load data from db only once
-        switch ($data['level']) {
-            case 'reasons':
-                $this->reasonRepository->findBy(['id' => $values]);
-
-                break;
-
-            case 'categories':
-                $this->categoryRepository->findBy(['id' => $values]);
-
-                break;
-
-            default:
-                throw new RuntimeException(sprintf(
-                    "the level data '%s' is invalid",
-                    $data['level']
-                ));
-        }
-
-        return function ($value) use ($data) {
-            if ('_header' === $value) {
-                return 'reasons' === $data['level'] ?
-                        'Group by reasons'
-                        :
-                        'Group by categories of reason';
-            }
-
-            switch ($data['level']) {
-                case 'reasons':
-                    /* @var $r \Chill\ActivityBundle\Entity\ActivityReason */
-                    $r = $this->reasonRepository->find($value);
-
-                    return $this->stringHelper->localize($r->getCategory()->getName())
-                            . ' > '
-                            . $this->stringHelper->localize($r->getName());
-
-                    break;
-
-                case 'categories':
-                    $c = $this->categoryRepository->find($value);
-
-                    return $this->stringHelper->localize($c->getName());
-
-                    break;
-                // no need for a default : the default was already set above
-            }
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        // add select element
-        if ('reasons' === $data['level']) {
-            return ['activity_reasons_id'];
-        }
-
-        if ('categories' === $data['level']) {
-            return ['activity_categories_id'];
-        }
-
-        throw new RuntimeException('the data provided are not recognised');
-    }
-
-    public function getTitle()
-    {
-        return 'Aggregate by activity reason';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['level']) {
-            $context->buildViolation("The reasons's level should not be empty")
-                ->addViolation();
-        }
-    }
-
     /**
-     * Check if a join between Activity and another alias.
+     * Check if a join between Activity and another alias
      *
      * @param Join[] $joins
      * @param string $alias the alias to search for
-     *
-     * @return bool
+     * @return boolean
      */
     private function checkJoinAlreadyDefined(array $joins, $alias)
     {
@@ -221,4 +135,99 @@ class ActivityReasonAggregator implements
 
         return false;
     }
+
+    public function applyOn()
+    {
+        return 'activity';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('level', ChoiceType::class, array(
+            'choices' => array(
+                'By reason'             => 'reasons',
+                'By category of reason' => 'categories'
+            ),
+            'multiple' => false,
+            'expanded' => true,
+            'label' => 'Reason\'s level'
+        ));
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['level'] === null) {
+            $context->buildViolation("The reasons's level should not be empty")
+                ->addViolation();
+        }
+    }
+
+        public function getTitle()
+    {
+        return "Aggregate by activity reason";
+    }
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // for performance reason, we load data from db only once
+        switch ($data['level']) {
+            case 'reasons':
+                $this->reasonRepository->findBy(array('id' => $values));
+                break;
+            case 'categories':
+                $this->categoryRepository->findBy(array('id' => $values));
+                break;
+            default:
+                throw new \RuntimeException(sprintf("the level data '%s' is invalid",
+                            $data['level']));
+        }
+
+        return function($value) use ($data) {
+            if ($value === '_header') {
+                return $data['level'] === 'reasons' ?
+                        'Group by reasons'
+                        :
+                        'Group by categories of reason'
+                        ;
+            }
+
+            switch ($data['level']) {
+                case 'reasons':
+                    /* @var $r \Chill\ActivityBundle\Entity\ActivityReason */
+                    $r = $this->reasonRepository->find($value);
+
+                    return $this->stringHelper->localize($r->getCategory()->getName())
+                            ." > "
+                            . $this->stringHelper->localize($r->getName());
+                        ;
+                    break;
+                case 'categories':
+                    $c = $this->categoryRepository->find($value);
+
+                    return $this->stringHelper->localize($c->getName());
+                    break;
+                // no need for a default : the default was already set above
+            }
+        };
+
+    }
+
+    public function getQueryKeys($data)
+    {
+        // add select element
+        if ($data['level'] === 'reasons') {
+            return array('activity_reasons_id');
+        } elseif ($data['level'] === 'categories') {
+            return array ('activity_categories_id');
+        } else {
+            throw new \RuntimeException('the data provided are not recognised');
+        }
+
+    }
+
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -1,36 +1,54 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Symfony\Component\Security\Core\Role\Role;
-
-class ActivityTypeAggregator implements AggregatorInterface
-{
-    public const KEY = 'activity_type_aggregator';
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
 
 /**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class ActivityTypeAggregator implements AggregatorInterface
+{
+    
+    /**
+     *
+     * @var EntityRepository
+     */
+    protected $typeRepository;
+    
+    /**
+     *
      * @var TranslatableStringHelper
      */
     protected $stringHelper;
     
-    /**
-     * @var EntityRepository
-     */
-    protected $typeRepository;
+    const KEY = 'activity_type_aggregator';
     
     public function __construct(
             EntityRepository $typeRepository,
@@ -40,11 +58,6 @@ class ActivityTypeAggregator implements AggregatorInterface
         $this->stringHelper       = $stringHelper;
     }
     
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element    
@@ -54,6 +67,24 @@ class ActivityTypeAggregator implements AggregatorInterface
         $groupBy = $qb->addGroupBy(self::KEY);
     }
     
+    /**
+     * Check if a join between Activity and another alias
+     * 
+     * @param Join[] $joins
+     * @param string $alias the alias to search for
+     * @return boolean
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
     public function applyOn()
     {
         return 'activity';
@@ -64,13 +95,23 @@ class ActivityTypeAggregator implements AggregatorInterface
         // no form required for this aggregator
     }
 
+    public function getTitle()
+    {
+        return "Aggregate by activity type";
+    }
+    
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
     public function getLabels($key, array $values, $data)
     {
         // for performance reason, we load data from db only once
-        $this->typeRepository->findBy(['id' => $values]);
+        $this->typeRepository->findBy(array('id' => $values));
         
-        return function ($value) {
-            if ('_header' === $value) {
+        return function($value) use ($data) {
+            if ($value === '_header') {
                 return 'Activity type';
             }
 
@@ -79,34 +120,12 @@ class ActivityTypeAggregator implements AggregatorInterface
 
             return $this->stringHelper->localize($t->getName());
         };
+        
     }
 
     public function getQueryKeys($data)
     {
-        return [self::KEY];
+        return array(self::KEY);
     }
 
-    public function getTitle()
-    {
-        return 'Aggregate by activity type';
-    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -1,33 +1,47 @@
 <?php
-
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Symfony\Component\Security\Core\Role\Role;
-
-class ActivityUserAggregator implements AggregatorInterface
-{
-    public const KEY = 'activity_user_id';
+use Doctrine\ORM\Query\Expr\Join;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Chill\MainBundle\Entity\User;
 
 /**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class ActivityUserAggregator implements AggregatorInterface
+{
+    /**
+     *
      * @var EntityManagerInterface
      */
     protected $em;
     
-    public function __construct(EntityManagerInterface $em)
+    const KEY = 'activity_user_id';
+    
+    function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
@@ -56,7 +70,7 @@ class ActivityUserAggregator implements AggregatorInterface
         // nothing to add
     }
 
-    public function getLabels($key, $values, $data): Closure
+    public function getLabels($key, $values, $data): \Closure
     {
         // preload users at once
         $this->em->getRepository(User::class)
@@ -66,7 +80,6 @@ class ActivityUserAggregator implements AggregatorInterface
             switch ($value) {
                 case '_header':
                     return 'activity user';
-
                 default:
                     return $this->em->getRepository(User::class)->find($value)
                         ->getUsername();
@@ -81,6 +94,6 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Aggregate by activity user';
+        return "Aggregate by activity user";
     }
 }

src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php

@@ -1,75 +1,64 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Export;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
-use LogicException;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\Query;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class CountActivity implements ExportInterface
 {
     /**
+     *
      * @var EntityManagerInterface
      */
     protected $entityManager;
     
     public function __construct(
             EntityManagerInterface $em
-    ) {
+            )
+    {
         $this->entityManager = $em;
     }
     
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-    }
         
-    public function getAllowedFormattersTypes()
-    {
-        return [\Chill\MainBundle\Export\FormatterInterface::TYPE_TABULAR];
     }
 
     public function getDescription()
     {
-        return 'Count activities by various parameters.';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
-        }
-
-        return function ($value) {
-            return '_header' === $value ?
-                    'Number of activities'
-                    :
-                    $value;
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_activity'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return "Count activities by various parameters.";
     }
 
     public function getTitle()
     {
-        return 'Count activities';
+        return "Count activities";
     }
 
     public function getType()
@@ -77,30 +66,61 @@ class CountActivity implements ExportInterface
         return 'activity';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
     {
         $qb = $this->entityManager->createQueryBuilder();
-        $centers = array_map(function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
         
         $qb->select('COUNT(activity.id) as export_count_activity')
                 ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person');
+                ->join('activity.person', 'person')
+                ;
         
         $qb->where($qb->expr()->in('person.center', ':centers'))
-            ->setParameter('centers', $centers);
+            ->setParameter('centers', $centers)
+            ;
         
         return $qb;
     }
     
+    public function supportsModifiers()
+    {
+        return array('person', 'activity');
+    }
+    
     public function requiredRole()
     {
         return new Role(ActivityStatsVoter::STATS);
     }
 
-    public function supportsModifiers()
+    public function getAllowedFormattersTypes()
     {
-        return ['person', 'activity'];
+        return array(\Chill\MainBundle\Export\FormatterInterface::TYPE_TABULAR);
     }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ($key !== 'export_count_activity') {
+            throw new \LogicException("the key $key is not used by this export");
+        }
+        
+        return function($value) {
+            return $value === '_header' ? 
+                    'Number of activities'
+                    :
+                    $value
+                    ;
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return array('export_count_activity');
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
 }

src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php

@@ -1,42 +1,69 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Export;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\ListInterface;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Scope;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Doctrine\ORM\Query\Expr;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use DateTime;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
+use Doctrine\ORM\Query;
+use Chill\MainBundle\Export\FormatterInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function array_key_exists;
-
 /**
- * Create a list for all activities.
+ * Create a list for all activities
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ListActivity implements ListInterface
 {
+
     /**
+     *
      * @var EntityManagerInterface
      */
     protected $entityManager;
 
-    protected $fields = [
+    /**
+     *
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    protected $fields = array(
         'id',
         'date',
         'durationTime',
@@ -47,98 +74,91 @@ class ListActivity implements ListInterface
         'type_name',
         'person_firstname',
         'person_lastname',
-        'person_id',
-    ];
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+        'person_id'
+    );
 
     public function __construct(
             EntityManagerInterface $em,
             TranslatorInterface $translator,
             TranslatableStringHelper $translatableStringHelper
-    ) {
+            )
+    {
         $this->entityManager = $em;
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @param FormBuilderInterface $builder
+     */
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('fields', ChoiceType::class, [
+        $builder->add('fields', ChoiceType::class, array(
             'multiple' => true,
             'expanded' => true,
             'choices' => array_combine($this->fields, $this->fields),
             'label'    => 'Fields to include in export',
-            'constraints' => [new Callback([
+            'constraints' => [new Callback(array(
                 'callback' => function($selected, ExecutionContextInterface $context) {
                     if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
-                },
-            ])],
-        ]);
+                }
+            ))]
+        ));
+
     }
 
     /**
+     * {@inheritDoc}
+     *
      * @return type
      */
     public function getAllowedFormattersTypes()
     {
-        return [FormatterInterface::TYPE_LIST];
+        return array(FormatterInterface::TYPE_LIST);
     }
 
     public function getDescription()
     {
-        return 'List activities';
+        return "List activities";
     }
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
+        switch ($key)
+        {
             case 'date' :
                 return function($value) {
-                    if ('_header' === $value) {
-                        return 'date';
-                    }
+                    if ($value === '_header') return 'date';
 
-                    $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                    $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
 
                     return $date->format('d-m-Y');
                 };
-
             case 'attendee':
                 return function($value) {
-                    if ('_header' === $value) {
-                        return 'attendee';
-                    }
+                    if ($value === '_header') return 'attendee';
 
                     return $value ? 1 : 0;
                 };
-
             case 'list_reasons' :
                 /* @var $activityReasonsRepository EntityRepository */
                 $activityRepository = $this->entityManager
                     ->getRepository('ChillActivityBundle:Activity');
 
                 return function($value) use ($activityRepository) {
-                    if ('_header' === $value) {
-                        return 'activity reasons';
-                    }
+                    if ($value === '_header') return 'activity reasons';
 
                     $activity = $activityRepository
                             ->find($value);
 
-                    return implode(', ', array_map(function (ActivityReason $r) {
+                    return implode(", ", array_map(function(ActivityReason $r) {
+
                         return '"'.
                                 $this->translatableStringHelper->localize($r->getCategory()->getName())
                                 .' > '.
@@ -146,32 +166,23 @@ class ListActivity implements ListInterface
                                 .'"';
                     }, $activity->getReasons()->toArray()));
                 };
-
             case 'circle_name' :
                 return function($value) {
-                    if ('_header' === $value) {
-                        return 'circle';
-                    }
+                    if ($value === '_header') return 'circle';
 
                     return $this->translatableStringHelper
                             ->localize(json_decode($value, true));
                 };
-
             case 'type_name' :
                 return function($value) {
-                    if ('_header' === $value) {
-                        return 'activity type';
-                    }
+                    if ($value === '_header') return 'activity type';
 
                     return $this->translatableStringHelper
                             ->localize(json_decode($value, true));
                 };
-
             default:
                 return function($value) use ($key) {
-                    if ('_header' === $value) {
-                        return $key;
-                    }
+                    if ($value === '_header') return $key;
 
                     return $value;
                 };
@@ -198,16 +209,14 @@ class ListActivity implements ListInterface
         return 'activity';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = array())
     {
-        $centers = array_map(function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
-                . 'have been checked');
+        if (!\array_key_exists('fields', $data)) {
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException("any fields "
+                . "have been checked");
         }
 
         $qb = $this->entityManager->createQueryBuilder();
@@ -218,63 +227,50 @@ class ListActivity implements ListInterface
                 ->join('person.center', 'center')
                 ->andWhere('center IN (:authorized_centers)')
                 ->setParameter('authorized_centers', $centers);
+                ;
 
         foreach ($this->fields as $f) {
             if (in_array($f, $data['fields'])) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');
-
                         break;
-
                     case 'person_firstname':
                         $qb->addSelect('person.firstName AS person_firstname');
-
                         break;
-
                     case 'person_lastname':
                         $qb->addSelect('person.lastName AS person_lastname');
-
                         break;
-
                     case 'person_id':
                         $qb->addSelect('person.id AS person_id');
-
                         break;
-
                     case 'user_username':
                         $qb->join('activity.user', 'user');
                         $qb->addSelect('user.username AS user_username');
-
                         break;
-
                     case 'circle_name':
                         $qb->join('activity.scope', 'circle');
                         $qb->addSelect('circle.name AS circle_name');
-
                         break;
-
                     case 'type_name':
                         $qb->join('activity.type', 'type');
                         $qb->addSelect('type.name AS type_name');
-
                         break;
-
                     case 'list_reasons':
                         // this is a trick... The reasons is filled with the
                         // activity id which will be used to load reasons
                         $qb->addSelect('activity.id AS list_reasons');
-
                         break;
-
                     default:
                         $qb->addSelect(sprintf('activity.%s as %s', $f, $f));
-
                         break;
                 }
+
             }
         }
 
+
+
         return $qb;
     }
 
@@ -285,6 +281,7 @@ class ListActivity implements ListInterface
 
     public function supportsModifiers()
     {
-        return ['activity', 'person'];
+        return array('activity', 'person');
     }
+
 }

src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php

@@ -1,29 +1,48 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Export;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
-use LogicException;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\Query;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * This export allow to compute stats on activity duration.
  * 
  * The desired stat must be given in constructor.
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class StatActivityDuration implements ExportInterface
 {
-    public const SUM = 'sum';
+    /**
+     *
+     * @var EntityManagerInterface
+     */
+    protected $entityManager;
+    
+    const SUM = 'sum';
     
     /**
      * The action for this report.
@@ -33,73 +52,38 @@ class StatActivityDuration implements ExportInterface
     protected $action;
     
     /**
-     * @var EntityManagerInterface
-     */
-    protected $entityManager;
-
-    /**
-     * constructor.
+     * constructor
      * 
+     * @param EntityManagerInterface $em
      * @param string $action the stat to perform
      */
     public function __construct(
             EntityManagerInterface $em,
             $action = 'sum'
-    ) {
+            )
+    {
         $this->entityManager = $em;
         $this->action = $action;
     }
     
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-    }
         
-    public function getAllowedFormattersTypes()
-    {
-        return [\Chill\MainBundle\Export\FormatterInterface::TYPE_TABULAR];
     }
 
     public function getDescription()
     {
-        if (self::SUM === $this->action) {
-            return 'Sum activities duration by various parameters.';
+        if ($this->action === self::SUM) {
+            return "Sum activities duration by various parameters.";
         }
     }
 
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_stat_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
-        }
-
-        switch ($this->action) {
-            case self::SUM:
-                $header = 'Sum of activities  duration';
-        }
-
-        return function ($value) use ($header) {
-            return '_header' === $value ?
-                    $header
-                    :
-                    $value;
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_stat_activity'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
     public function getTitle()
     {
-        if (self::SUM === $this->action) {
-            return 'Sum activity duration';
+        if ($this->action === self::SUM) {
+            return "Sum activity duration";
         }
+        
     }
 
     public function getType()
@@ -107,15 +91,13 @@ class StatActivityDuration implements ExportInterface
         return 'activity';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
     {
-        $centers = array_map(function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
         $qb = $this->entityManager->createQueryBuilder();
         
-        if (self::SUM === $this->action) {
-            $select = 'SUM(activity.durationTime) AS export_stat_activity';
+        if ($this->action === self::SUM) {
+            $select = "SUM(activity.durationTime) AS export_stat_activity";
         }
         
         $qb->select($select)
@@ -123,18 +105,55 @@ class StatActivityDuration implements ExportInterface
                 ->join('activity.person',  'person')
                 ->join('person.center', 'center')
                 ->where($qb->expr()->in('center', ':centers'))
-            ->setParameter(':centers', $centers);
+                ->setParameter(':centers', $centers)
+                ;
         
         return $qb;
     }
     
+    public function supportsModifiers()
+    {
+        return array('person', 'activity');
+    }
+    
     public function requiredRole()
     {
         return new Role(ActivityStatsVoter::STATS);
     }
 
-    public function supportsModifiers()
+    public function getAllowedFormattersTypes()
     {
-        return ['person', 'activity'];
+        return array(\Chill\MainBundle\Export\FormatterInterface::TYPE_TABULAR);
     }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ($key !== 'export_stat_activity') {
+            throw new \LogicException("the key $key is not used by this export");
+        }
+        
+        switch ($this->action) {
+            case self::SUM:
+                $header = "Sum of activities  duration";
+        }
+        
+        return function($value) use ($header) {
+            return $value === '_header' ? 
+                    $header
+                    :
+                    $value
+                    ;
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return array('export_stat_activity');
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
 }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -1,36 +1,52 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use DateTime;
-use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormError;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Translation\TranslatorInterface;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class ActivityDateFilter implements FilterInterface
 {
     /**
+     *
      * @var TranslatorInterface
      */
     protected $translator;
     
-    public function __construct(TranslatorInterface $translator)
+    function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
 
+    
     public function addRole()
     {
         return null;
@@ -39,11 +55,8 @@ class ActivityDateFilter implements FilterInterface
     public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between(
-            'activity.date',
-            ':date_from',
-            ':date_to'
-        );
+        $clause = $qb->expr()->between('activity.date', ':date_from', 
+            ':date_to');
 
         if ($where instanceof Expr\Andx) {
             $where->add($clause);
@@ -63,58 +76,55 @@ class ActivityDateFilter implements FilterInterface
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, [
-            'label' => 'Activities after this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
+        $builder->add('date_from', DateType::class, array(
+            'label' => "Activities after this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
             'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
-        $builder->add('date_to', DateType::class, [
-            'label' => 'Activities before this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
+        $builder->add('date_to', DateType::class, array(
+            'label' => "Activities before this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
             'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
         $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             /* @var $filterForm \Symfony\Component\Form\FormInterface */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
             
-            if (true === $enabled) {
+            if ($enabled === true) {
                 // if the filter is enabled, add some validation
                 $form      = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
                 $date_to   = $form->get('date_to')->getData();
                 
                 // check that fields are not empty
-                if (null === $date_from) {
+                if ($date_from === null) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
-                    ));
+                        . 'should not be empty')));
                 }
-
-                if (null === $date_to) {
+                if ($date_to   === null) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
-                    ));
+                        . 'should not be empty')));
                 } 
                 
                 // check that date_from is before date_to
                 if (
-                    (null !== $date_from && null !== $date_to)
-                    && $date_from >= $date_to
+                    ($date_from !== null && $date_to !== null)
+                    &&
+                    $date_from >= $date_to
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date should be after '
                             . 'the date given in "Implied in an activity after '
-                            . 'this date" field')
-                    ));
+                            . 'this date" field')));
                 }
             }
         });
@@ -122,16 +132,17 @@ class ActivityDateFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string')
     {
-        return [
-            'Filtered by date of activity: only between %date_from% and %date_to%',
-            [
-                '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y'),
-            ], ];
+        return array(
+            "Filtered by date of activity: only between %date_from% and %date_to%",
+            array(
+                "%date_from%" => $data['date_from']->format('d-m-Y'),
+                '%date_to%'   => $data['date_to']->format('d-m-Y')
+            ));
     }
 
     public function getTitle()
     {
-        return 'Filtered by date activity';
+        return "Filtered by date activity";
     }
+
 }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php

@@ -1,44 +1,59 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\Expr\Join;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
-class ActivityReasonFilter implements
-    FilterInterface,
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class ActivityReasonFilter implements FilterInterface,
    ExportElementValidatedInterface
 {
     /**
-     * The repository for activity reasons.
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+    
+    /**
+     * The repository for activity reasons
      *
      * @var EntityRepository
      */
     protected $reasonRepository;
     
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
     public function __construct(
             TranslatableStringHelper $helper,
             EntityRepository $reasonRepository
@@ -47,10 +62,6 @@ class ActivityReasonFilter implements
         $this->reasonRepository         = $reasonRepository;
     }
     
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
     
     public function alterQuery(QueryBuilder $qb, $data)
     {
@@ -60,15 +71,16 @@ class ActivityReasonFilter implements
         //dump($join);
         // add a join to reasons only if needed
         if (
-            (
-                array_key_exists('activity', $join)
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            (array_key_exists('activity', $join)
+            &&
+            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            or (!array_key_exists('activity', $join))
+            OR
+            (! array_key_exists('activity', $join))
         ) {
             $qb->add(
                     'join', 
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
+                    array('activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')), 
                     true
                     );
         }
@@ -83,63 +95,11 @@ class ActivityReasonFilter implements
         $qb->setParameter('selected_activity_reasons', $data['reasons']);
     }
     
-    public function applyOn()
-    {
-        return 'activity';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        //create a local copy of translatableStringHelper
-        $helper = $this->translatableStringHelper;
-
-        $builder->add('reasons', EntityType::class, [
-            'class' => 'ChillActivityBundle:ActivityReason',
-            'choice_label' => function (ActivityReason $reason) use ($helper) {
-                return $helper->localize($reason->getName());
-            },
-            'group_by' => function (ActivityReason $reason) use ($helper) {
-                return $helper->localize($reason->getCategory()->getName());
-            },
-            'multiple' => true,
-            'expanded' => false,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        // collect all the reasons'name used in this filter in one array
-        $reasonsNames = array_map(
-            function (ActivityReason $r) {
-                return '"' . $this->translatableStringHelper->localize($r->getName()) . '"';
-            },
-            $this->reasonRepository->findBy(['id' => $data['reasons']->toArray()])
-        );
-
-        return ['Filtered by reasons: only %list%',
-            ['%list%' => implode(', ', $reasonsNames)], ];
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by reason';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
-            $context->buildViolation('At least one reason must be choosen')
-                ->addViolation();
-        }
-    }
-
     /**
-     * Check if a join between Activity and Reason is already defined.
+     * Check if a join between Activity and Reason is already defined
      * 
      * @param Join[] $joins
-     * @param mixed $alias
-     *
-     * @return bool
+     * @return boolean
      */
     private function checkJoinAlreadyDefined(array $joins, $alias)
     {
@@ -151,4 +111,59 @@ class ActivityReasonFilter implements
         
         return false;
     }
+
+    public function applyOn()
+    {
+        return 'activity';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        //create a local copy of translatableStringHelper
+        $helper = $this->translatableStringHelper;
+        
+        $builder->add('reasons', EntityType::class, array(
+            'class' => 'ChillActivityBundle:ActivityReason',
+            'choice_label' => function (ActivityReason $reason) use ($helper) {
+                return $helper->localize($reason->getName());
+            },
+            'group_by' => function(ActivityReason $reason) use ($helper) {
+                return $helper->localize($reason->getCategory()->getName());
+            },
+            'multiple' => true,
+            'expanded' => false
+        ));
+    }
+    
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['reasons'] === null || count($data['reasons']) === 0) {
+            $context->buildViolation("At least one reason must be choosen")
+                ->addViolation();
+        }
+    }
+
+        public function getTitle()
+    {
+        return 'Filter by reason';
+    }
+    
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+    
+    public function describeAction($data, $format = 'string')
+    {
+        // collect all the reasons'name used in this filter in one array
+        $reasonsNames = array_map(
+                function(ActivityReason $r) {
+                    return "\"".$this->translatableStringHelper->localize($r->getName())."\"";
+                },
+                $this->reasonRepository->findBy(array('id' => $data['reasons']->toArray()))
+                );
+        
+        return array("Filtered by reasons: only %list%", 
+            ["%list%" => implode(", ", $reasonsNames)]);
+    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -1,39 +1,53 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\Expr\Join;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\ActivityBundle\Entity\ActivityType;
 
-class ActivityTypeFilter implements
-    FilterInterface,
+/**
+ * 
+ *
+ */
+class ActivityTypeFilter implements FilterInterface,
    ExportElementValidatedInterface
 {
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
     
     /**
-     * The repository for activity reasons.
+     * The repository for activity reasons
      *
      * @var EntityRepository
      */
@@ -47,10 +61,6 @@ class ActivityTypeFilter implements
         $this->typeRepository = $typeRepository;
     }
     
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
     
     public function alterQuery(QueryBuilder $qb, $data)
     {
@@ -67,60 +77,11 @@ class ActivityTypeFilter implements
         $qb->setParameter('selected_activity_types', $data['types']);
     }
     
-    public function applyOn()
-    {
-        return 'activity';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        //create a local copy of translatableStringHelper
-        $helper = $this->translatableStringHelper;
-
-        $builder->add('types', EntityType::class, [
-            'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $type) use ($helper) {
-                return $helper->localize($type->getName());
-            },
-            'multiple' => true,
-            'expanded' => false,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        // collect all the reasons'name used in this filter in one array
-        $reasonsNames = array_map(
-            function (ActivityType $t) {
-                return '"' . $this->translatableStringHelper->localize($t->getName()) . '"';
-            },
-            $this->typeRepository->findBy(['id' => $data['types']->toArray()])
-        );
-
-        return ['Filtered by activity type: only %list%',
-            ['%list%' => implode(', ', $reasonsNames)], ];
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by activity type';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['types'] || count($data['types']) === 0) {
-            $context->buildViolation('At least one type must be choosen')
-                ->addViolation();
-        }
-    }
-
     /**
-     * Check if a join between Activity and Reason is already defined.
+     * Check if a join between Activity and Reason is already defined
      * 
      * @param Join[] $joins
-     * @param mixed $alias
-     *
-     * @return bool
+     * @return boolean
      */
     private function checkJoinAlreadyDefined(array $joins, $alias)
     {
@@ -132,4 +93,56 @@ class ActivityTypeFilter implements
         
         return false;
     }
+
+    public function applyOn()
+    {
+        return 'activity';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        //create a local copy of translatableStringHelper
+        $helper = $this->translatableStringHelper;
+        
+        $builder->add('types', EntityType::class, array(
+            'class' => ActivityType::class,
+            'choice_label' => function (ActivityType $type) use ($helper) {
+                return $helper->localize($type->getName());
+            },
+            'multiple' => true,
+            'expanded' => false
+        ));
+    }
+    
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['types'] === null || count($data['types']) === 0) {
+            $context->buildViolation("At least one type must be choosen")
+                ->addViolation();
+        }
+    }
+
+        public function getTitle()
+    {
+        return 'Filter by activity type';
+    }
+    
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+    
+    public function describeAction($data, $format = 'string')
+    {
+        // collect all the reasons'name used in this filter in one array
+        $reasonsNames = array_map(
+                function(ActivityType $t) {
+                    return "\"".$this->translatableStringHelper->localize($t->getName())."\"";
+                },
+                $this->typeRepository->findBy(array('id' => $data['types']->toArray()))
+                );
+        
+        return array("Filtered by activity type: only %list%", 
+            ["%list%" => implode(", ", $reasonsNames)]);
+    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php

@@ -1,46 +1,64 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Export\Declarations;
-use DateTime;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormError;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Doctrine\ORM\Query\Expr;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\EntityManager;
+use Chill\PersonBundle\Export\Declarations;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
-class PersonHavingActivityBetweenDateFilter implements
-    FilterInterface,
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class PersonHavingActivityBetweenDateFilter implements FilterInterface, 
     ExportElementValidatedInterface
 {
-    /**
-     * @var EntityRepository
-     */
-    protected $activityReasonRepository;
     
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
     
     /**
+     *
+     * @var EntityRepository
+     */
+    protected $activityReasonRepository;
+    
+    /**
+     *
      * @var TranslatorInterface 
      */
     protected $translator;
@@ -55,6 +73,7 @@ class PersonHavingActivityBetweenDateFilter implements
         $this->translator               = $translator;
     }
 
+
     public function addRole()
     {
         return null;
@@ -64,24 +83,22 @@ class PersonHavingActivityBetweenDateFilter implements
     {
         // create a query for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
-        $sqb->select('person_person_having_activity.id')
-            ->from('ChillActivityBundle:Activity', 'activity_person_having_activity')
-            ->join('activity_person_having_activity.person', 'person_person_having_activity');
+        $sqb->select("person_person_having_activity.id")
+                ->from("ChillActivityBundle:Activity", "activity_person_having_activity")
+                ->join("activity_person_having_activity.person", "person_person_having_activity")
+                ;
         // add clause between date
-        $sqb->where('activity_person_having_activity.date BETWEEN '
-                . ':person_having_activity_between_date_from'
-                . ' AND '
-                . ':person_having_activity_between_date_to');
+        $sqb->where("activity_person_having_activity.date BETWEEN "
+                . ":person_having_activity_between_date_from"
+                . " AND "
+                . ":person_having_activity_between_date_to");
         // add clause activity reason
-        $sqb->join(
-            'activity_person_having_activity.reasons',
-            'reasons_person_having_activity'
-        );
+        $sqb->join('activity_person_having_activity.reasons', 
+                'reasons_person_having_activity');
         $sqb->andWhere(
                 $sqb->expr()->in(
                     'reasons_person_having_activity',
-                ':person_having_activity_reasons'
-            )
+                    ":person_having_activity_reasons")
                 );
         
         $where = $qb->getDQLPart('where');
@@ -94,14 +111,10 @@ class PersonHavingActivityBetweenDateFilter implements
         }
         
         $qb->add('where', $where);
-        $qb->setParameter(
-            'person_having_activity_between_date_from',
-            $data['date_from']
-        );
-        $qb->setParameter(
-            'person_having_activity_between_date_to',
-            $data['date_to']
-        );
+        $qb->setParameter('person_having_activity_between_date_from', 
+                $data['date_from']);
+        $qb->setParameter('person_having_activity_between_date_to', 
+                $data['date_to']);
         $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
@@ -112,23 +125,23 @@ class PersonHavingActivityBetweenDateFilter implements
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, [
-            'label' => 'Implied in an activity after this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
+        $builder->add('date_from', DateType::class, array(
+            'label' => "Implied in an activity after this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
             'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
-        $builder->add('date_to', DateType::class, [
-            'label' => 'Implied in an activity before this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
+        $builder->add('date_to', DateType::class, array(
+            'label' => "Implied in an activity before this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
             'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
-        $builder->add('reasons', EntityType::class, [
+        $builder->add('reasons', EntityType::class, array(
             'class' => 'ChillActivityBundle:ActivityReason',
             'choice_label' => function (ActivityReason $reason) {
                 return $this->translatableStringHelper
@@ -141,78 +154,75 @@ class PersonHavingActivityBetweenDateFilter implements
             'data' => $this->activityReasonRepository->findAll(),
             'multiple' => true,
             'expanded' => false,
-            'label' => 'Activity reasons for those activities',
-        ]);
+            'label'    => "Activity reasons for those activities"
+        ));
         
         $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             /* @var $filterForm \Symfony\Component\Form\FormInterface */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
             
-            if (true === $enabled) {
+            if ($enabled === true) {
                 // if the filter is enabled, add some validation
                 $form      = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
                 $date_to   = $form->get('date_to')->getData();
                 
                 // check that fields are not empty
-                if (null === $date_from) {
+                if ($date_from === null) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
-                    ));
+                        . 'should not be empty')));
                 }
-
-                if (null === $date_to) {
+                if ($date_to   === null) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
-                    ));
+                        . 'should not be empty')));
                 } 
                 
                 // check that date_from is before date_to
                 if (
-                    (null !== $date_from && null !== $date_to)
-                    && $date_from >= $date_to
+                    ($date_from !== null && $date_to !== null)
+                    &&
+                    $date_from >= $date_to
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date '
                         . 'should be after the date given in "Implied in an '
-                        . 'activity after this date" field')
-                    ));
+                        . 'activity after this date" field')));
                 }
             }
         });
     }
     
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['reasons'] === null || count($data['reasons']) === 0) {
+            $context->buildViolation("At least one reason must be choosen")
+                ->addViolation();
+        }
+    }
+
     public function describeAction($data, $format = 'string')
     {
-        return [
-            'Filtered by person having an activity between %date_from% and '
-            . '%date_to% with reasons %reasons_name%',
-            [
-                '%date_from%' => $data['date_from']->format('d-m-Y'),
+        return array(
+            "Filtered by person having an activity between %date_from% and "
+            . "%date_to% with reasons %reasons_name%",
+            array(
+                "%date_from%" => $data['date_from']->format('d-m-Y'),
                 '%date_to%'   => $data['date_to']->format('d-m-Y'),
-                '%reasons_name%' => implode(', ', array_map(
+                "%reasons_name%"  => implode(", ", array_map(
                         function (ActivityReason $r) {
                             return '"'.$this->translatableStringHelper->
                                     localize($r->getName()).'"';
                         },
-                    $data['reasons']
-                )),
-            ], ];
+                        $data['reasons']))
+            ));
     }
 
     public function getTitle()
     {
-        return 'Filtered by person having an activity in a period';
+        return "Filtered by person having an activity in a period";
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
-            $context->buildViolation('At least one reason must be choosen')
-                ->addViolation();
-        }
-    }
 }

src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php

@@ -1,27 +1,25 @@
 <?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\ActivityBundle\Form;
 
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityReasonCategoryType extends AbstractType
 {
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, ['required' => false]);
+            ->add('active', CheckboxType::class, array('required' => false))
+        ;
     }
 
     /**
@@ -29,9 +27,9 @@ class ActivityReasonCategoryType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
-        ]);
+        $resolver->setDefaults(array(
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
+        ));
     }
 
     /**

src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php

@@ -1,36 +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.
- */
-
 namespace Chill\ActivityBundle\Form;
 
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
 
 class ActivityReasonType extends AbstractType
 {
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, ['required' => false])
-            ->add('category', TranslatableActivityReasonCategory::class);
+            ->add('active', CheckboxType::class, array('required' => false))
+            ->add('category', TranslatableActivityReasonCategory::class)
+        ;
     }
 
+    /**
+     * @param OptionsResolver $resolver
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason',
-        ]);
+        $resolver->setDefaults(array(
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason'
+        ));
     }
 
     /**

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -1,72 +1,65 @@
 <?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\ActivityBundle\Form;
 
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
-use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use DateInterval;
-use DateTime;
-use DateTimeZone;
-use Doctrine\Persistence\ObjectManager;
-use RuntimeException;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\Persistence\ObjectManager;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
+use Chill\MainBundle\Form\Type\UserPickerType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 
 class ActivityType extends AbstractType
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
 
     /**
-     * @var ObjectManager
-     */
-    protected $om;
-
-    protected $timeChoices;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * the user running this form.
+     * the user running this form
      *
      * @var User
      */
     protected $user;
 
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
+    /**
+     *
+     * @var ObjectManager
+     */
+    protected $om;
+
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    protected $timeChoices;
+
     public function __construct(
             TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
-        ObjectManager $om,
+            AuthorizationHelper $authorizationHelper, ObjectManager $om,
             TranslatableStringHelper $translatableStringHelper,
             array $timeChoices
-    ) {
+            )
+    {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
-            throw new RuntimeException('you should have a valid user');
+            throw new \RuntimeException("you should have a valid user");
         }
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;
@@ -75,57 +68,63 @@ class ActivityType extends AbstractType
         $this->timeChoices = $timeChoices;
     }
 
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // handle times choices
-        $timeChoices = [];
+        $timeChoices = array();
 
         foreach ($this->timeChoices as $e) {
             $timeChoices[$e['label']] = $e['seconds'];
-        }
+        };
 
         $durationTimeTransformer = new DateTimeToTimestampTransformer('GMT', 'GMT');
-        $durationTimeOptions = [
+        $durationTimeOptions = array(
                 'choices' => $timeChoices,
                 'placeholder' => 'Choose the duration',
-        ];
+        );
 
         $builder
-            ->add('date', ChillDateType::class, [
-                'required' => true,
-            ])
+            ->add('date', ChillDateType::class, array(
+               'required' => true
+            ))
             ->add('durationTime', ChoiceType::class, $durationTimeOptions)
-            ->add('attendee', ChoiceType::class, [
+            ->add('attendee', ChoiceType::class, array(
                'expanded' => true,
                'required' => false,
-                'choices' => [
+               'choices' => array(
                   'present' => true,
-                    'not present' => false,
-                ],
-            ])
+                  'not present' => false
+               )
+            ))
             ->add('user', UserPickerType::class, [
                 'center' => $options['center'],
-                'role' => $options['role'],
+                'role'   => $options['role']
             ])
             ->add('scope', ScopePickerType::class, [
                 'center' => $options['center'],
-                'role' => $options['role'],
+                'role'   => $options['role']
             ])
-            ->add('reasons', TranslatableActivityReason::class, [
+            ->add('reasons', TranslatableActivityReason::class, array(
                 'multiple' => true,
                 'required' => false,
-            ])
-            ->add('type', TranslatableActivityType::class, [
+            ))
+            ->add('type', TranslatableActivityType::class, array(
                 'placeholder' => 'Choose a type',
-                'active_only' => true,
-            ])
+                'active_only' => true
+            ))
             ->add('comment', CommentType::class, [
                 'required' => false,
-            ]);
+            ])
+        ;
 
         $builder->get('durationTime')
                 ->addModelTransformer($durationTimeTransformer);
 
+
         $builder->get('durationTime')
                 ->addEventListener(
                         FormEvents::PRE_SET_DATA,
@@ -134,17 +133,18 @@ class ActivityType extends AbstractType
                                 $builder,
                                 $durationTimeTransformer,
                                 $durationTimeOptions
-                ) {
+                                )
+                        {
                             // set the timezone to GMT, and fix the difference between current and GMT
                             // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new DateTimeZone('GMT');
+                            $timezoneUTC = new \DateTimeZone('GMT');
                             /* @var $data \DateTime */
-                    $data = $formEvent->getData() === null ?
-                                    DateTime::createFromFormat('U', 300) :
+                            $data = $formEvent->getData() === NULL ?
+                                    \DateTime::createFromFormat('U', 300) :
                                     $formEvent->getData();
                             $seconds = $data->getTimezone()->getOffset($data);
                             $data->setTimeZone($timezoneUTC);
-                    $data->add(new DateInterval('PT' . $seconds . 'S'));
+                            $data->add(new \DateInterval('PT'.$seconds.'S'));
 
                             // test if the timestamp is in the choices.
                             // If not, recreate the field with the new timestamp
@@ -156,17 +156,15 @@ class ActivityType extends AbstractType
                                         ChoiceType::class,
                                         array_merge(
                                                 $durationTimeOptions,
-                                [
+                                                array(
                                                     'choices' => $timeChoices,
-                                    'auto_initialize' => false,
-                                ]
+                                                    'auto_initialize' => false
                                                 )
-                        );
+                                                ));
                                 $form->addModelTransformer($durationTimeTransformer);
                                 $formEvent->getForm()->getParent()->add($form->getForm());
                             }
-                }
-            );
+                        });
     }
 
     /**
@@ -174,14 +172,15 @@ class ActivityType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => 'Chill\ActivityBundle\Entity\Activity',
-        ]);
+        $resolver->setDefaults(array(
+            'data_class' => 'Chill\ActivityBundle\Entity\Activity'
+        ));
 
         $resolver
-            ->setRequired(['center', 'role'])
+              ->setRequired(array('center', 'role'))
               ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role');
+              ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+              ;
     }
 
     /**

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -1,33 +1,30 @@
 <?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\ActivityBundle\Form;
 
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeType extends AbstractType
 {
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, [
-                'choices' => [
+            ->add('active', ChoiceType::class, array(
+                'choices' => array(
                     'Yes' => true,
-                    'No' => false,
-                ],
-                'expanded' => true,
-            ]);
+                    'No'  => false
+                ),
+                'expanded' => true
+            ));
     }
 
     /**
@@ -35,9 +32,9 @@ class ActivityTypeType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityType',
-        ]);
+        $resolver->setDefaults(array(
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityType'
+        ));
     }
 
     /**

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php

@@ -1,37 +1,54 @@
 <?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.
+ * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Form\Type;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
 
 /**
- * FormType to choose amongst activity reasons.
+ * FormType to choose amongst activity reasons
+ * 
  */
 class TranslatableActivityReason extends AbstractType
 {
-    /**
-     * @var ActivityReasonRender
-     */
-    protected $reasonRender;
 
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
     
+    /**
+     *
+     * @var ActivityReasonRender
+     */
+    protected $reasonRender;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
         ActivityReasonRender $reasonRender
@@ -40,10 +57,20 @@ class TranslatableActivityReason extends AbstractType
         $this->reasonRender = $reasonRender;
     }
 
+    public function getBlockPrefix()
+    {
+        return 'translatable_activity_reason';
+    }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+    
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
-            [
+            array(
                 'class' => 'ChillActivityBundle:ActivityReason',
                 'choice_label' => function(ActivityReason $choice)  {
                     return $this->reasonRender->renderString($choice, []);
@@ -59,18 +86,8 @@ class TranslatableActivityReason extends AbstractType
                     return $er->createQueryBuilder('r')
                         ->where('r.active = true');
                 },
-                'attr' => ['class' => ' select2 '],
-            ]
+                'attr' => [ 'class' => ' select2 ']
+            )
         );
     }
-
-    public function getBlockPrefix()
-    {
-        return 'translatable_activity_reason';
-    }
-
-    public function getParent()
-    {
-        return EntityType::class;
-    }
 }

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php

@@ -1,23 +1,40 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Form\Type;
 
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Doctrine\ORM\EntityRepository;
 
 /**
- * Description of TranslatableActivityReasonCategory.
+ * Description of TranslatableActivityReasonCategory
+ *
+ * @author Champs-Libres Coop
  */
+
+
 class TranslatableActivityReasonCategory extends AbstractType
 {
     /**
@@ -30,21 +47,6 @@ class TranslatableActivityReasonCategory extends AbstractType
         $this->requestStack = $requestStack;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
-        $resolver->setDefaults(
-            [
-                'class' => 'ChillActivityBundle:ActivityReasonCategory',
-                'choice_label' => 'name[' . $locale . ']',
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.active = true');
-                },
-            ]
-        );
-    }
-
     public function getBlockPrefix()
     {
         return 'translatable_activity_reason_category';
@@ -54,4 +56,19 @@ class TranslatableActivityReasonCategory extends AbstractType
     {
         return EntityType::class;
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $locale = $this->requestStack->getCurrentRequest()->getLocale();
+        $resolver->setDefaults(
+            array(
+                'class' => 'ChillActivityBundle:ActivityReasonCategory',
+                'choice_label' => 'name['.$locale.']',
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.active = true');
+                }
+            )
+        );
+    }
 }

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php

@@ -1,67 +1,60 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Form\Type;
 
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Chill\ActivityBundle\Entity\ActivityType;
 
 /**
- * Description of TranslatableActivityType.
+ * Description of TranslatableActivityType
+ *
+ * @author Champs-Libres Coop
  */
 class TranslatableActivityType extends AbstractType
 {
-    protected $activityTypeRepository;
 
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
+    protected $activityTypeRepository;
+
     public function __construct(
             TranslatableStringHelper $helper,
             EntityRepository $activityTypeRepository
-    ) {
+            )
+    {
         $this->translatableStringHelper = $helper;
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, array $options)
-    {
-        /* @var $qb \Doctrine\ORM\QueryBuilder */
-        $qb = $options['query_builder'];
-
-        if (true === $options['active_only']) {
-            $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Type::BOOLEAN);
-        }
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            [
-                'class' => 'ChillActivityBundle:ActivityType',
-                'active_only' => true,
-                'query_builder' => $this->activityTypeRepository
-                    ->createQueryBuilder('at'),
-                'choice_label' => function (ActivityType $type) {
-                    return $this->translatableStringHelper->localize($type->getName());
-                },
-            ]
-        );
-    }
-
     public function getBlockPrefix()
     {
         return 'translatable_activity_type';
@@ -71,4 +64,30 @@ class TranslatableActivityType extends AbstractType
     {
         return EntityType::class;
     }
+
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, array $options) {
+        /* @var $qb \Doctrine\ORM\QueryBuilder */
+        $qb = $options['query_builder'];
+
+        if ($options['active_only'] === true) {
+            $qb->where($qb->expr()->eq('at.active', ':active'));
+            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Type::BOOLEAN);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+
+        $resolver->setDefaults(
+            array(
+                'class' => 'ChillActivityBundle:ActivityType',
+                'active_only' => true,
+                'query_builder' => $this->activityTypeRepository
+                    ->createQueryBuilder('at'),
+                'choice_label' => function (ActivityType $type) {
+                    return $this->translatableStringHelper->localize($type->getName());
+                }
+            )
+        );
+    }
 }

src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php

@@ -1,39 +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\ActivityBundle\Menu;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Translation\TranslatorInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class MenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-
-    /**
+     *
      * @var TokenStorageInterface
      */
     protected $tokenStorage;
     
     /**
+     *
      * @var TranslatorInterface
      */
     protected $translator;
     
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+    
     public function __construct(
         TokenStorageInterface $tokenStorage, 
         TranslatorInterface $translator, 
@@ -44,6 +47,7 @@ class MenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationHelper = $authorizationHelper;
     }
 
+    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         /* @var $person \Chill\PersonBundle\Entity\Person */
@@ -56,11 +60,11 @@ class MenuBuilder implements LocalMenuBuilderInterface
             $menu->addChild($this->translator->trans('Activity list'), [
                     'route' => 'chill_activity_activity_list',
                     'routeParameters' => [
-                    'person_id' => $person->getId(),
-                ],
+                        'person_id' => $person->getId()
+                    ]
                 ])
                 ->setExtras([
-                    'order' => 201,
+                    'order' => 201
                 ]);
         }
         
@@ -68,11 +72,11 @@ class MenuBuilder implements LocalMenuBuilderInterface
             $menu->addChild($this->translator->trans('Add a new activity'), [
                     'route' => 'chill_activity_activity_new',
                     'routeParameters' => [
-                    'person_id' => $person->getId(),
-                ],
+                        'person_id' => $person->getId()
+                    ]
                 ])
                 ->setExtras([
-                    'order' => 200,
+                    'order' => 200
                 ]);
         }
     }

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -1,40 +1,56 @@
 <?php
-
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2018 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.
+ * 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\ActivityBundle\Menu;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
-
-    /**
+     *
      * @var TranslatorInterface
      */
     protected $translator;
     
+    /**
+     *
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+    
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator
-    ) {
+        TranslatorInterface $translator)
+    {
         $this->translator = $translator;
         $this->authorizationChecker = $authorizationChecker;
     }
 
+    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         /* @var $person \Chill\PersonBundle\Entity\Person */
@@ -42,24 +58,21 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         
         if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
             $menu->addChild(
-                $this->translator->trans('Activity list'),
-                [
+                $this->translator->trans('Activity list'), [
                     'route' => 'chill_activity_activity_list',
                     'routeParameters' => [ 'person_id' => $person->getId() ],
-                ]
-            )
-                ->setExtra('order', 201);
+                ])
+                ->setExtra('order', 201)
+                ;
         }
-
         if ($this->authorizationChecker->isGranted(ActivityVoter::CREATE, $person)) {
             $menu->addChild(
-                $this->translator->trans('Add a new activity'),
-                [
+                $this->translator->trans('Add a new activity'), [
                     'route' => 'chill_activity_activity_new',
                     'routeParameters' => [ 'person_id' => $person->getId() ],
-                ]
-            )
-                ->setExtra('order', 200);
+                ])
+                ->setExtra('order', 200)
+                ;
         }
     }
 

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Entity\Scope;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\Query\Expr\Orx;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\EntityManagerInterface;
+
+
+final class ActivityACLAwareRepository 
+{
+    private AuthorizationHelper $authorizationHelper;
+
+    private TokenStorageInterface $tokenStorage;
+
+    private ActivityRepository $repository;
+
+    private EntityManagerInterface $em;
+
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        TokenStorageInterface $tokenStorage,
+        ActivityRepository $repository,
+        EntityManagerInterface $em
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->tokenStorage = $tokenStorage;
+        $this->repository = $repository;
+        $this->em = $em;
+    }
+
+    public function queryTimelineIndexer(string $context, array $args = []): array
+    {
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+
+        $from = $this->getFromClauseCenter($args);
+        [$where, $parameters] = $this->getWhereClause($context, $args);
+
+        return [
+           'id' => $metadataActivity->getTableName()
+                .'.'.$metadataActivity->getColumnName('id'),
+           'type' => 'activity',
+           'date' => $metadataActivity->getTableName()
+                .'.'.$metadataActivity->getColumnName('date'),
+           'FROM' => $from,
+           'WHERE' => $where,
+           'parameters' => $parameters
+       ];
+    }
+
+    private function getFromClauseCenter(array $args): string
+    {
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+        $metadataPerson = $this->em->getClassMetadata(Person::class);
+        $associationMapping = $metadataActivity->getAssociationMapping('person');
+        
+        return $metadataActivity->getTableName().' JOIN '
+            .$metadataPerson->getTableName().' ON '
+            .$metadataPerson->getTableName().'.'.
+                $associationMapping['joinColumns'][0]['referencedColumnName']
+            .' = '
+            .$associationMapping['joinColumns'][0]['name']
+            ;
+    }
+
+    private function getWhereClause(string $context, array $args): array
+    {
+        $where = '';
+        $parameters = [];
+        
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+        $metadataPerson = $this->em->getClassMetadata(Person::class);
+        $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
+        $activityToScope  = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
+        $personToCenter = $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'];
+
+
+        // acls:
+        $role = new Role(ActivityVoter::SEE);
+        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(), 
+                $role);
+        
+        if (count($reachableCenters) === 0) {
+            // insert a dummy condition
+            return 'FALSE = TRUE';
+        }
+
+        if ($context === 'person') { 
+            // we start with activities having the person_id linked to person 
+            $where .= sprintf('%s = ? AND ', $activityToPerson);
+            $parameters[] = $person->getId();
+        }
+        
+        // we add acl (reachable center and scopes)
+        $where .= '('; // first loop for the for centers
+        $centersI = 0; // like centers#i
+        foreach ($reachableCenters as $center) {
+            // we pass if not in centers
+            if (!\in_array($center, $args['centers'])) {
+                continue;
+            }
+            // we get all the reachable scopes for this center
+            $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
+            // we get the ids for those scopes
+            $reachablesScopesId = array_map(
+                function(Scope $scope) { return $scope->getId(); }, 
+                $reachableScopes
+            );
+
+            // if not the first center
+            if ($centersI > 0) {
+                $where .= ') OR (';
+            }
+
+            // condition for the center
+            $where .= sprintf(' %s.%s = ? ', $metadataPerson->getTableName(), $personToCenter);
+            $parameters[] = $center->getId();
+
+            // begin loop for scopes
+            $where .= ' AND (';
+            $scopesI = 0; //like scope#i
+
+            foreach ($reachablesScopesId as $scopeId) {
+                if ($scopesI > 0) {
+                    $where .= ' OR ';
+                }
+                $where .= sprintf(' %s.%s = ? ', $metadataActivity->getTableName(), $activityToScope);
+                $parameters[] = $scopeId;
+                $scopesI ++;
+            }
+            // close loop for scopes
+            $where .= ') ';
+            $centersI++;
+        }
+        // close loop for centers
+        $where .= ')';
+        
+        return [$where, $parameters];
+    }
+
+}

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method AccompanyingPeriodParticipation|null find($id, $lockMode = null, $lockVersion = null)
+ * @method AccompanyingPeriodParticipation|null findOneBy(array $criteria, array $orderBy = null)
+ * @method AccompanyingPeriodParticipation[]    findAll()
+ * @method AccompanyingPeriodParticipation[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ActivityRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Activity::class);
+    }
+    
+}

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php

@@ -1,17 +1,34 @@
 <?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.
- */
-
-use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
 
 class AppKernel extends Kernel
 {
+    public function registerBundles()
+    {
+        return array(
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Chill\PersonBundle\ChillPersonBundle(),
+            new Chill\MainBundle\ChillMainBundle(),
+            new Chill\ActivityBundle\ChillActivityBundle(),
+            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            #add here all the required bundle (some bundle are not required)
+        );
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+    }
+
     /**
      * @return string
      */
@@ -27,28 +44,4 @@ class AppKernel extends Kernel
     {
         return sys_get_temp_dir().'/ActivityBundle/logs';
     }
-
-    public function registerBundles()
-    {
-        return [
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
-            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
-            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Chill\PersonBundle\ChillPersonBundle(),
-            new Chill\MainBundle\ChillMainBundle(),
-            new Chill\ActivityBundle\ChillActivityBundle(),
-            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
-            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
-            new Symfony\Bundle\MonologBundle\MonologBundle(),
-            //add here all the required bundle (some bundle are not required)
-        ];
-    }
-
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
-    }
 }

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php

@@ -1,18 +1,11 @@
 <?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.
- */
-
-use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
 
 /** @var ClassLoader $loader */
 $loader = require __DIR__.'/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 
 return $loader;

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php

@@ -1,14 +1,7 @@
 <?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.
- */
-
-use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Debug\Debug;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
@@ -16,13 +9,11 @@ use Symfony\Component\HttpFoundation\Request;
 
 // This check prevents access to debug front controllers that are deployed by accident to production servers.
 // Feel free to remove this, extend it, or make something more sophisticated.
-if (
-    isset($_SERVER['HTTP_CLIENT_IP'])
+if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
-
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
 

src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig

@@ -1,11 +1,11 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 <div>
-    <h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span></h3>
+  <h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span>{% if 'person' != context %} / {{ activity.person|chill_entity_render_box({'addLink': true}) }}{% endif %}</h3>
     <div class="statement">
         <span class="statement">{{ '%user% has done an %activity_type%'|trans(
            {
-             '%user%' : user,
+             '%user%' : activity.user,
              '%activity_type%': activity.type.name|localize_translatable_string,
              '%date%' : activity.date|format_date('long') }
         ) }}</span>
@@ -29,13 +29,13 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activity_show', { 'person_id': person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
+            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
                 {{ 'Show the activity'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
         <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'person_id': person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
                 {{ 'Edit the activity'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php

@@ -1,28 +1,41 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Security\Authorization;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-
-use function in_array;
-
-class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
-{
-    public const LISTS = 'CHILL_ACTIVITY_LIST';
-
-    public const STATS = 'CHILL_ACTIVITY_STATS';
+use Chill\MainBundle\Entity\Center;
 
 /**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
+{
+    const STATS = 'CHILL_ACTIVITY_STATS';
+    const LISTS  = 'CHILL_ACTIVITY_LIST';
+    
+    /**
+     *
      * @var AuthorizationHelper
      */
     protected $helper;
@@ -32,24 +45,25 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
         $this->helper = $helper;
     }
 
-    public function getRoles()
+    private function getAttributes()
     {
-        return $this->getAttributes();
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return ['Activity' => $this->getRoles()];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return $this->getAttributes();
+        return array(self::STATS, self::LISTS);
     }
 
     protected function getSupportedClasses()
     {
-        return [Center::class];
+        return array(Center::class);
+    }
+    
+    protected function supports($attribute, $subject)
+    {
+        if ($subject instanceof Center 
+            && \in_array($attribute, $this->getAttributes())) {
+            
+            return true;
+        }
+        
+        return false;
     }
 
     protected function isGranted($attribute, $object, $user = null)
@@ -61,20 +75,18 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
         return $this->helper->userHasAccess($user, $object, $attribute);
     }
 
-    protected function supports($attribute, $subject)
+    public function getRoles()
     {
-        if (
-            $subject instanceof Center
-            && in_array($attribute, $this->getAttributes())
-        ) {
-            return true;
+        return $this->getAttributes();
     }
 
-        return false;
+    public function getRolesWithoutScope()
+    {
+        return $this->getAttributes();
     }
 
-    private function getAttributes()
+    public function getRolesWithHierarchy()
     {
-        return [self::STATS, self::LISTS];
+        return [ 'Activity' => $this->getRoles() ];
     }
 }

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php

@@ -1,38 +1,49 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 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.
+ * 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\ActivityBundle\Security\Authorization;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Entity\User;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
-use function in_array;
-
+/**
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_ACTIVITY_CREATE';
-
-    public const DELETE = 'CHILL_ACTIVITY_DELETE';
-
-    public const SEE = 'CHILL_ACTIVITY_SEE';
-
-    public const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
-
-    public const UPDATE = 'CHILL_ACTIVITY_UPDATE';
+    const CREATE = 'CHILL_ACTIVITY_CREATE';
+    const SEE    = 'CHILL_ACTIVITY_SEE';
+    const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
+    const UPDATE = 'CHILL_ACTIVITY_UPDATE';
+    const DELETE = 'CHILL_ACTIVITY_DELETE';
 
     /**
+     *
      * @var AuthorizationHelper
      */
     protected $helper;
@@ -42,34 +53,19 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         $this->helper = $helper;
     }
 
-    public function getRoles()
-    {
-        return $this->getAttributes();
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return ['Activity' => $this->getRoles()];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return [];
-    }
 
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof Activity) {
-            return in_array($attribute, $this->getAttributes());
-        }
-
-        if ($subject instanceof Person) {
-            return self::SEE === $attribute
-                || self::CREATE === $attribute;
-        }
-
+            return \in_array($attribute, $this->getAttributes());
+        } elseif ($subject instanceof Person) {
+            return $attribute === self::SEE 
+                ||
+                $attribute === self::CREATE;
+        } else {
             return false;
         }
+    }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
@@ -80,7 +76,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         if ($subject instanceof Person) {
             $centers = $this->helper->getReachableCenters($token->getUser(), new Role($attribute));
             
-            return in_array($subject->getCenter(), $centers);
+            return \in_array($subject->getCenter(), $centers);
         }
         
         /* @var $subject Activity */
@@ -90,6 +86,24 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
     private function getAttributes()
     {
         return [ self::CREATE, self::SEE, self::UPDATE, self::DELETE,
-            self::SEE_DETAILS, ];
+                  self::SEE_DETAILS ];
     }
+
+
+    public function getRoles()
+    {
+        return $this->getAttributes();
+    }
+
+    public function getRolesWithoutScope()
+    {
+        return array();
+    }
+
+
+    public function getRolesWithHierarchy()
+    {
+        return [ 'Activity' => $this->getRoles() ];
+    }
+
 }

src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php

@@ -1,24 +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.
+ * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <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\ActivityBundle\Templating\Entity;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
+use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 
 /**
- * Render activity reason.
+ * Render activity reason
+ *
  */
 class ActivityReasonRender extends AbstractChillEntityRender
 {
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
@@ -28,6 +41,7 @@ class ActivityReasonRender extends AbstractChillEntityRender
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    
     public function renderBox($entity, array $options): string
     {
         return
@@ -44,11 +58,15 @@ class ActivityReasonRender extends AbstractChillEntityRender
                 $entity->getName()
             ).
             '</span>'.
-            $this->getDefaultClosingBox();
+            $this->getDefaultClosingBox()
+            ;
     }
 
     /**
+     * 
      * @param ActivityReason $entity
+     * @param array $options
+     * @return string
      */
     public function renderString($entity, array $options): string
     {
@@ -56,8 +74,7 @@ class ActivityReasonRender extends AbstractChillEntityRender
         
         if (null !== $entity->getCategory()) {
             $category = $this->translatableStringHelper->localize(
-                $entity->getCategory()->getName()
-            ) . ' > ';
+                $entity->getCategory()->getName()). ' > ';
         }
         
         return $category .

src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 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.
+ * 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\ActivityBundle\Test;
@@ -14,19 +24,26 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
 
 /**
- * Prepare entities useful in tests.
+ * Prepare entities useful in tests
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 trait PrepareActivityTrait
 {
     /**
-     * Return an activity with a scope and a person inside.
+     * Return an activity with a scope and a person inside
      * 
+     * @param Scope $scope
+     * @param Person $person
      * @return Activity
      */
     public function prepareActivity(Scope $scope, Person $person)
     {
         return (new Activity())
             ->setScope($scope)
-            ->setPerson($person);
+            ->setPerson($person)
+                ;
     }
+    
 }

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -1,78 +1,16 @@
 <?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\ActivityBundle\Tests\Controller;
 
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @internal
- * @coversNothing
- */
 class ActivityControllerTest extends WebTestCase
 {
-    public function getSecuredPagesAuthenticated()
-    {
-        static::bootKernel();
-
-        $person = $this->getPersonFromFixtures();
-        $activities = $this->getActivitiesForPerson($person);
-
-        $user = $this->createFakeUser();
-
-        return [
-            [
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/', $person->getId()),
-            ],
-            [
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/new', $person->getId()),
-            ],
-            [
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId()),
-            ],
-            [
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId()),
-            ],
-            [
-                $this->getAuthenticatedClient($user->getUsername()),
-                sprintf('fr/person/%d/activity/new', $person->getId()),
-            ],
-        ];
-    }
-
-    /**
-     * Provide a client unauthenticated and.
-     */
-    public function getSecuredPagesUnauthenticated()
-    {
-        static::bootKernel();
-        $person = $this->getPersonFromFixtures();
-        $activities = $this->getActivitiesForPerson($person);
-
-        return [
-            [sprintf('fr/person/%d/activity/', $person->getId())],
-            [sprintf('fr/person/%d/activity/new', $person->getId())],
-            [sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())],
-            [sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())],
-        ];
-    }
 
     /**
      * @dataProvider getSecuredPagesUnauthenticated
-     *
-     * @param mixed $url
      */
     public function testAccessIsDeniedForUnauthenticated($url)
     {
@@ -81,15 +19,13 @@ class ActivityControllerTest extends WebTestCase
         $client->request('GET', $url);
 
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertTrue(
-            $client->getResponse()->isRedirect('http://localhost/login'),
-            sprintf('the page "%s" does not redirect to http://localhost/login', $url)
-        );
+        $this->assertTrue($client->getResponse()->isRedirect('http://localhost/login'),
+              sprintf('the page "%s" does not redirect to http://localhost/login', $url));
     }
 
     /**
-     * @dataProvider getSecuredPagesAuthenticated
      *
+     * @dataProvider getSecuredPagesAuthenticated
      * @param type $client
      * @param type $url
      */
@@ -100,6 +36,63 @@ class ActivityControllerTest extends WebTestCase
         $this->assertEquals(403, $client->getResponse()->getStatusCode());
     }
 
+    public function getSecuredPagesAuthenticated()
+    {
+        static::bootKernel();
+
+        $person = $this->getPersonFromFixtures();
+        $activities = $this->getActivitiesForPerson($person);
+
+
+        $user = $this->createFakeUser();
+
+
+
+        return array(
+            array(
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/', $person->getId())
+            ),
+            array(
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/new', $person->getId())
+            ),
+            array(
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())
+            ),
+            array(
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())
+            ),
+            array(
+                $this->getAuthenticatedClient($user->getUsername()),
+                sprintf('fr/person/%d/activity/new', $person->getId())
+            )
+        );
+    }
+
+
+
+    /**
+     * Provide a client unauthenticated and
+     *
+     */
+    public function getSecuredPagesUnauthenticated()
+    {
+        static::bootKernel();
+        $person = $this->getPersonFromFixtures();
+        $activities = $this->getActivitiesForPerson($person);
+
+        return array(
+            [ sprintf('fr/person/%d/activity/', $person->getId()) ],
+            [ sprintf('fr/person/%d/activity/new', $person->getId()) ],
+            [ sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId()) ],
+            [ sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId()) ],
+        );
+    }
+
+
     public function testCompleteScenario()
     {
         // Create a new client to browse the application
@@ -107,32 +100,27 @@ class ActivityControllerTest extends WebTestCase
         $person = $this->getPersonFromFixtures();
 
         // Create a new entry in the database
-        $crawler = $client->request('GET', sprintf(
-            'en/person/%d/activity/',
-            $person->getId()
-        ));
-        $this->assertEquals(
-            200,
-            $client->getResponse()->getStatusCode(),
-            'Unexpected HTTP status code for GET /activity/'
-        );
+        $crawler = $client->request('GET', sprintf('en/person/%d/activity/',
+              $person->getId()));
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(),
+              "Unexpected HTTP status code for GET /activity/");
         $crawler = $client->click($crawler->selectLink('Ajouter une nouvelle activité')
               ->link());
 
         $reason1 = $this->getRandomActivityReason();
-        $reason2 = $this->getRandomActivityReason([$reason1->getId()]);
+        $reason2 = $this->getRandomActivityReason(array($reason1->getId()));
 
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Ajouter une nouvelle activité')->form([
-            'chill_activitybundle_activity' => [
+        $form = $crawler->selectButton('Ajouter une nouvelle activité')->form(array(
+            'chill_activitybundle_activity'=> array(
                'date' => '15-01-2015',
                'durationTime' => 600,
             //   'remark' => 'blabla',
                'scope' => $this->getRandomScope('center a_social', 'Center A')->getId(),
-                'type' => $this->getRandomActivityType()->getId(),
-            ],
-        ]);
-        $form['chill_activitybundle_activity[reasons]']->select([$reason1->getId(), $reason2->getId()]);
+               'type'   => $this->getRandomActivityType()->getId()
+            )
+        ));
+        $form['chill_activitybundle_activity[reasons]']->select(array ($reason1->getId(), $reason2->getId()));
 
         $client->submit($form);
 
@@ -140,21 +128,18 @@ class ActivityControllerTest extends WebTestCase
         $crawler = $client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(
-            0,
-            $crawler->filter('dd:contains("January 15, 2015")')->count(),
-            'Missing element dd:contains("January 15, 2015")'
-        );
+        $this->assertGreaterThan(0, $crawler->filter('dd:contains("January 15, 2015")')->count(),
+              'Missing element dd:contains("January 15, 2015")');
 
         // Edit the entity
         $crawler = $client->click($crawler->selectLink("Modifier l'activité")->link());
 
-        $form = $crawler->selectButton("Sauver l'activité")->form([
-            'chill_activitybundle_activity' => [
+        $form = $crawler->selectButton("Sauver l'activité")->form(array(
+            'chill_activitybundle_activity'  => array(
                'date' => '25-01-2015',
              //  'remark' => 'Foo'
-            ],
-        ]);
+            )
+        ));
 
         $client->submit($form);
 
@@ -163,33 +148,164 @@ class ActivityControllerTest extends WebTestCase
         $crawler = $client->followRedirect();
 
         // check that new data are present
-        $this->assertGreaterThan(
-            0,
+        $this->assertGreaterThan(0,
               $crawler->filter('dd:contains("January 25, 2015")')->count(),
-            'Missing element dd:contains("January 25, 2015")'
-        );
-        $this->assertGreaterThan(
-            0,
+              'Missing element dd:contains("January 25, 2015")');
+        $this->assertGreaterThan(0,
               $crawler->filter('dd:contains("Foo")')->count(),
-            'Missing element dd:contains("Foo")'
-        );
+              'Missing element dd:contains("Foo")');
 
         // delete the actvity
-        $crawler = $client->click($crawler->selectLink('Supprimer')->link());
+       $crawler = $client->click($crawler->selectLink("Supprimer")->link());
 
        $button = $crawler->selectButton('Supprimer');
 
        $form = $button->form();
 
        $client->submit($form);
-        $this->assertTrue($client->getResponse()->isRedirect(sprintf(
-            '/en/person/%d/activity/',
-            $person->getId()
-        )));
+       $this->assertTrue($client->getResponse()->isRedirect(sprintf('/en/person/%d/activity/',
+              $person->getId())));
 
        $crawler = $client->followRedirect();
 
        $this->assertNotContains('January 25, 2015', $crawler->text());
+
+    }
+
+    /**
+     *
+     * @return \Symfony\Component\BrowserKit\Client
+     */
+    private function getAuthenticatedClient($username = 'center a_social')
+    {
+        return static::createClient(array(), array(
+           'PHP_AUTH_USER' => $username,
+           'PHP_AUTH_PW'   => 'password',
+        ));
+    }
+
+    /**
+     *
+     * @return \Chill\PersonBundle\Entity\Person
+     */
+    private function getPersonFromFixtures()
+    {
+        $em = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager');
+
+        $person = $em->getRepository('ChillPersonBundle:Person')
+              ->findOneBy(array(
+                 'firstName' => 'Depardieu',
+                 'lastName' => 'Gérard'
+              ));
+
+        if ($person === NULL) {
+            throw new \RuntimeException("We need a person with firstname Gérard and"
+                  . " lastname Depardieu. Did you add fixtures ?");
+        }
+
+        return $person;
+    }
+
+    private function getActivitiesForPerson(\Chill\PersonBundle\Entity\Person $person)
+    {
+        $em = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager');
+
+        $activities = $em->getRepository('ChillActivityBundle:Activity')
+                ->findBy(array('person' => $person));
+
+        if (count($activities) === 0) {
+            throw new \RuntimeException("We need activities associated with this "
+                    . "person. Did you forget to add fixtures ?");
+        }
+
+        return $activities;
+    }
+
+    /**
+     *
+     * @param string $username
+     * @param string $centerName
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getRandomScope($username, $centerName)
+    {
+        $user = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager')
+              ->getRepository('ChillMainBundle:User')
+              ->findOneByUsername($username);
+
+        if ($user === NULL) {
+            throw new \RuntimeException("The user with username $username "
+                  . "does not exists in database. Did you add fixtures ?");
+        }
+
+        $center = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager')
+              ->getRepository('ChillMainBundle:Center')
+              ->findOneByName($centerName);
+
+        // get scope reachable by both role UPDATE and DELETE
+        $reachableScopesUpdate = static::$kernel->getContainer()
+              ->get('chill.main.security.authorization.helper')
+              ->getReachableScopes($user, new Role('CHILL_ACTIVITY_UPDATE'),
+                    $center);
+        $reachableScopesDelete = static::$kernel->getContainer()
+              ->get('chill.main.security.authorization.helper')
+              ->getReachableScopes($user, new Role('CHILL_ACTIVITY_DELETE'),
+                    $center);
+        $reachableScopesId = array_intersect(
+              array_map(function ($s) { return $s->getId(); }, $reachableScopesDelete),
+              array_map(function ($s) { return $s->getId(); }, $reachableScopesUpdate)
+              );
+        if (count($reachableScopesId) === 0) {
+            throw new \RuntimeException("there are not scope reachable for "
+                  . "both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE");
+        }
+
+        foreach($reachableScopesUpdate as $scope) {
+            if (in_array($scope->getId(), $reachableScopesId)) {
+                $reachableScopes[] = $scope;
+            }
+        }
+
+        return $reachableScopes[array_rand($reachableScopes)];
+    }
+
+    /**
+     *
+     * @param int[] $excludeIds An array of id to exclude
+     * @return \Chill\ActivityBundle\Entity\ActivityReason
+     */
+    private function getRandomActivityReason(array $excludeIds = array())
+    {
+        $reasons = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager')
+              ->getRepository('ChillActivityBundle:ActivityReason')
+              ->findAll();
+
+        $reason = $reasons[array_rand($reasons)];
+
+        if (in_array($reason->getId(), $excludeIds)) {
+            return $this->getRandomActivityReason($excludeIds);
+        }
+
+        return $reason;
+    }
+
+    /**
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    private function getRandomActivityType()
+    {
+        $types = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager')
+              ->getRepository('ChillActivityBundle:ActivityType')
+              ->findAll();
+
+        return $types[array_rand($types)];
     }
 
     /**
@@ -218,7 +334,7 @@ class ActivityControllerTest extends WebTestCase
         //create groupCenter
         $groupCenter = new \Chill\MainBundle\Entity\GroupCenter();
         $groupCenter->setCenter($em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(['name' => 'Center A']))
+                ->findOneBy(array('name' => 'Center A')))
                 ->setPermissionsGroup($withoutActivityPermissionGroup);
         $em->persist($withoutActivityPermissionGroup);
         $em->persist($groupCenter);
@@ -239,146 +355,4 @@ class ActivityControllerTest extends WebTestCase
 
         return $user;
     }
-
-    private function getActivitiesForPerson(\Chill\PersonBundle\Entity\Person $person)
-    {
-        $em = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        $activities = $em->getRepository('ChillActivityBundle:Activity')
-            ->findBy(['person' => $person]);
-
-        if (count($activities) === 0) {
-            throw new RuntimeException('We need activities associated with this '
-                    . 'person. Did you forget to add fixtures ?');
-        }
-
-        return $activities;
-    }
-
-    /**
-     * @param mixed $username
-     *
-     * @return \Symfony\Component\BrowserKit\Client
-     */
-    private function getAuthenticatedClient($username = 'center a_social')
-    {
-        return static::createClient([], [
-            'PHP_AUTH_USER' => $username,
-            'PHP_AUTH_PW' => 'password',
-        ]);
-    }
-
-    /**
-     * @return \Chill\PersonBundle\Entity\Person
-     */
-    private function getPersonFromFixtures()
-    {
-        $em = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        $person = $em->getRepository('ChillPersonBundle:Person')
-            ->findOneBy([
-                'firstName' => 'Depardieu',
-                'lastName' => 'Gérard',
-            ]);
-
-        if (null === $person) {
-            throw new RuntimeException('We need a person with firstname Gérard and'
-                  . ' lastname Depardieu. Did you add fixtures ?');
-        }
-
-        return $person;
-    }
-
-    /**
-     * @param int[] $excludeIds An array of id to exclude
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityReason
-     */
-    private function getRandomActivityReason(array $excludeIds = [])
-    {
-        $reasons = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillActivityBundle:ActivityReason')
-            ->findAll();
-
-        $reason = $reasons[array_rand($reasons)];
-
-        if (in_array($reason->getId(), $excludeIds)) {
-            return $this->getRandomActivityReason($excludeIds);
-        }
-
-        return $reason;
-    }
-
-    /**
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    private function getRandomActivityType()
-    {
-        $types = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillActivityBundle:ActivityType')
-            ->findAll();
-
-        return $types[array_rand($types)];
-    }
-
-    /**
-     * @param string $username
-     * @param string $centerName
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getRandomScope($username, $centerName)
-    {
-        $user = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:User')
-            ->findOneByUsername($username);
-
-        if (null === $user) {
-            throw new RuntimeException("The user with username {$username} "
-                  . 'does not exists in database. Did you add fixtures ?');
-        }
-
-        $center = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:Center')
-            ->findOneByName($centerName);
-
-        // get scope reachable by both role UPDATE and DELETE
-        $reachableScopesUpdate = static::$kernel->getContainer()
-            ->get('chill.main.security.authorization.helper')
-            ->getReachableScopes(
-                $user,
-                new Role('CHILL_ACTIVITY_UPDATE'),
-                $center
-            );
-        $reachableScopesDelete = static::$kernel->getContainer()
-            ->get('chill.main.security.authorization.helper')
-            ->getReachableScopes(
-                $user,
-                new Role('CHILL_ACTIVITY_DELETE'),
-                $center
-            );
-        $reachableScopesId = array_intersect(
-            array_map(function ($s) { return $s->getId(); }, $reachableScopesDelete),
-            array_map(function ($s) { return $s->getId(); }, $reachableScopesUpdate)
-        );
-
-        if (count($reachableScopesId) === 0) {
-            throw new RuntimeException('there are not scope reachable for '
-                  . 'both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE');
-        }
-
-        foreach ($reachableScopesUpdate as $scope) {
-            if (in_array($scope->getId(), $reachableScopesId)) {
-                $reachableScopes[] = $scope;
-            }
-        }
-
-        return $reachableScopes[array_rand($reachableScopes)];
-    }
 }

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php

@@ -1,27 +1,15 @@
 <?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\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class ActivityReasonCategoryControllerTest extends WebTestCase
 {
     public function testToWrite()
     {
         $this->markTestSkipped();
     }
-
     /*
     public function testCompleteScenario()
     {

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php

@@ -1,27 +1,15 @@
 <?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\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class ActivityReasonControllerTest extends WebTestCase
 {
     public function testToWrite()
     {
         $this->markTestSkipped();
     }
-
     /*
     public function testCompleteScenario()
     {

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php

@@ -1,27 +1,15 @@
 <?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\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class ActivityTypeControllerTest extends WebTestCase
 {
     public function testToWrite()
     {
         $this->markTestSkipped();
     }
-
     /*
     public function testCompleteScenario()
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Aggregator;
@@ -12,14 +22,14 @@ namespace Chill\ActivityBundle\Tests\Aggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * Add tests for ActivityReasonAggregator.
+ * Add tests for ActivityReasonAggregator
  *
- * @internal
- * @coversNothing
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
      */
     private $aggregator;
@@ -33,7 +43,7 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         $this->aggregator = $container->get('chill.activity.export.reason_aggregator');   
         
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
@@ -49,22 +59,22 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
     
     public function getFormData()
     {
-        return [
-            ['level' => 'reasons'],
-            ['level' => 'categories'],
-        ];
+        return array(
+            array('level' => 'reasons'),
+            array('level' => 'categories')
+        );
     }
     
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (static::$kernel === null) {
             static::bootKernel();
         }
         
         $em = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
         
-        return [
+        return array(
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -76,7 +86,8 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
-        ];
+                ->join('reasons.category', 'category')
+        );
     }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Aggregator;
@@ -12,14 +22,14 @@ namespace Chill\ActivityBundle\Tests\Aggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * Add tests for ActivityTypeAggregator.
+ * Add tests for ActivityTypeAggregator
  *
- * @internal
- * @coversNothing
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
      */
     private $aggregator;
@@ -33,7 +43,7 @@ class ActivityTypeAggregatorTest extends AbstractAggregatorTest
         $this->aggregator = $container->get('chill.activity.export.type_aggregator');   
         
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
@@ -49,21 +59,21 @@ class ActivityTypeAggregatorTest extends AbstractAggregatorTest
     
     public function getFormData()
     {
-        return [
-            [],
-        ];
+        return array(
+            array()
+        );
     }
     
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (static::$kernel === null) {
             static::bootKernel();
         }
         
         $em = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
         
-        return [
+        return array(
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -75,7 +85,8 @@ class ActivityTypeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
-        ];
+                ->join('reasons.category', 'category')
+        );
     }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Aggregator;
@@ -12,14 +22,13 @@ namespace Chill\ActivityBundle\Tests\Aggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * Add tests for ActivityUsernAggregator.
+ * Add tests for ActivityUsernAggregator
  *
- * @internal
- * @coversNothing
  */
 class ActivityUserAggregatorTest extends AbstractAggregatorTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
      */
     private $aggregator;
@@ -33,7 +42,7 @@ class ActivityUserAggregatorTest extends AbstractAggregatorTest
         $this->aggregator = $container->get('chill.activity.export.user_aggregator');   
         
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
@@ -49,21 +58,21 @@ class ActivityUserAggregatorTest extends AbstractAggregatorTest
     
     public function getFormData()
     {
-        return [
-            [],
-        ];
+        return array(
+            array()
+        );
     }
     
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (static::$kernel === null) {
             static::bootKernel();
         }
         
         $em = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
         
-        return [
+        return array(
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -75,7 +84,8 @@ class ActivityUserAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
-        ];
+                ->join('reasons.category', 'category')
+        );
     }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php

@@ -1,23 +1,18 @@
 <?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\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class CountActivityTest extends AbstractExportTest
 {
     /**
+     *
      * @var 
      */
     private $export;
@@ -39,16 +34,17 @@ class CountActivityTest extends AbstractExportTest
 
     public function getFormData()
     {
-        return [
-            [],
-        ];
+        return array(
+            array()
+        );
     }
 
     public function getModifiersCombination()
     {
-        return [
-            ['activity'],
-            ['activity', 'person'],
-        ];
+        return array(
+            array('activity'),
+            array('activity', 'person')
+        );
     }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Export\Export;
@@ -12,12 +22,14 @@ namespace Chill\ActivityBundle\Tests\Export\Export;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ListActivityTest extends AbstractExportTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Export\ListActivity
      */
     private $export;
@@ -32,7 +44,7 @@ class ListActivityTest extends AbstractExportTest
         $this->export = $container->get('chill.activity.export.list_activity');
         
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
@@ -41,15 +53,12 @@ class ListActivityTest extends AbstractExportTest
                 ->push($request->reveal());
     }
     
-    public function getExport()
-    {
-        return $this->export;
-    }
+    
 
     public function getFormData()
     {
-        return [
-            ['fields' => [
+        return array(
+            array('fields' => array(
                 'id',  
                 'date', 
                 'durationTime', 
@@ -59,20 +68,26 @@ class ListActivityTest extends AbstractExportTest
                 'type_name', 
                 'person_firstname',
                 'person_lastname',
-                'person_id',
-            ]],
-            ['fields' => [
+                'person_id'
+            )),
+            array('fields' => array(
                 'id',  
-                'list_reasons',
-            ]],
-        ];
+                'list_reasons'
+            )),
+        );
     }
 
     public function getModifiersCombination()
     {
-        return [
-            ['activity'],
-            ['activity', 'person'],
-        ];
+        return array(
+            array('activity'),
+            array('activity', 'person')
+        );
     }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php

@@ -1,25 +1,18 @@
 <?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\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * Test the "sum" part of StatActivityDuration.
+ * Test the "sum" part of StatActivityDuration
  *
- * @internal
- * @coversNothing
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class StatActivityDurationSumTest extends AbstractExportTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Export\StatActivityDuration
      */
     private $export;
@@ -41,16 +34,17 @@ class StatActivityDurationSumTest extends AbstractExportTest
 
     public function getFormData()
     {
-        return [
-            [],
-        ];
+        return array(
+            array()
+        );
     }
 
     public function getModifiersCombination()
     {
-        return [
-            ['activity'],
-            ['activity', 'person'],
-        ];
+        return array(
+            array('activity'),
+            array('activity', 'person')
+        );
     }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Filter;
@@ -13,12 +23,14 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ActivityReasonFilterTest extends AbstractFilterTest
 {
     /**
+     *
      * @var \Chill\PersonBundle\Export\Filter\GenderFilter
      */
     private $filter;
@@ -32,7 +44,7 @@ class ActivityReasonFilterTest extends AbstractFilterTest
         $this->filter = $container->get('chill.activity.export.reason_filter');
         
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
@@ -41,6 +53,7 @@ class ActivityReasonFilterTest extends AbstractFilterTest
                 ->push($request->reveal());
     }
     
+    
     public function getFilter()
     {
         return $this->filter;
@@ -48,20 +61,21 @@ class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        if (null === static::$kernel) {
+        if (static::$kernel === null) {
             static::bootKernel();
         }
         
         $em = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+                ->get('doctrine.orm.entity_manager')
+                ;
         
-        $reasons = $em->createQuery('SELECT reason '
-                . 'FROM ChillActivityBundle:ActivityReason reason')
+        $reasons = $em->createQuery("SELECT reason "
+                . "FROM ChillActivityBundle:ActivityReason reason")
                 ->getResult();
         
         // generate an array of 5 different combination of results
-        for ($i = 0; 5 > $i; ++$i) {
-            $r[] = ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))];
+        for ($i=0; $i < 5; $i++) {
+            $r[] = array('reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1)));
         }
         
         return $r;
@@ -69,14 +83,14 @@ class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (static::$kernel === null) {
             static::bootKernel();
         }
         
         $em = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
         
-        return [
+        return array(
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -88,7 +102,8 @@ class ActivityReasonFilterTest extends AbstractFilterTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
-        ];
+                ->join('reasons.category', 'category')
+        );
     }
+
 }

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php

@@ -1,24 +1,33 @@
 <?php
-
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 {
     /**
+     *
      * @var \Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
      */
     private $filter;
@@ -33,7 +42,7 @@ class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
             . 'person_having_an_activity_between_date_filter');
         
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
@@ -49,33 +58,49 @@ class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        $date_from = DateTime::createFromFormat('Y-m-d', '2015-01-15');
-        $date_to = new DateTime(); // today
+        $date_from = \DateTime::createFromFormat('Y-m-d', '2015-01-15');
+        $date_to   = new \DateTime(); // today
         $reasons = $this->getActivityReasons();
 
-        $data = [];
         
-        for ($i = 0; 4 > $i; ++$i) {
-            $data[] = [
+        $data = array();
+        for ($i = 0; $i < 4; $i++) {
+            $data[] = array(
                 'date_from' => $date_from,
                 'date_to'   => $date_to,
-                'reasons' => array_slice($reasons, 0, 1 + $i),
-            ];
+                'reasons'   => array_slice($reasons, 0, 1 + $i)
+            );
         }
         
         return $data;
     }
     
+    /**
+     * Return all activity reasons
+     * 
+     * @return \Chill\ActivityBundle\Entity\ActivityReason[]
+     */
+    private function getActivityReasons() 
+    {
+        if (static::$kernel === null) {
+            static::bootKernel();
+        }
+        
+        return static::$kernel->getContainer()
+            ->get('chill_activity.repository.reason')
+            ->findAll();
+    }
+
     public function getQueryBuilders()
     {
-        if (null === static::$kernel) {
+        if (static::$kernel === null) {
             static::bootKernel();
         }
         
         $em = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
         
-        return [
+        return array(
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from('ChillPersonBundle:Person', 'person')
@@ -87,22 +112,6 @@ class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
                 ->join('activity.person', 'person')
                 // add a fake where clause
                 ->where('person.id > 0'),
-        ];
-    }
-
-    /**
-     * Return all activity reasons.
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityReason[]
-     */
-    private function getActivityReasons()
-    {
-        if (null === static::$kernel) {
-            static::bootKernel();
-        }
-
-        return static::$kernel->getContainer()
-            ->get('chill_activity.repository.reason')
-            ->findAll();
+        );
     }
 }

src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php

@@ -1,62 +1,77 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Form;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Form\ActivityType;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Chill\ActivityBundle\Form\ActivityType;
+use Chill\ActivityBundle\Entity\Activity;
 use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 
 /**
- * @internal
- * @coversNothing
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ActivityTypeTest extends KernelTestCase
 {
     /**
-     * @var \Chill\MainBundle\Entity\Center
-     */
-    protected $center;
-
-    /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
-     */
-    protected $container;
-
-    /**
+     *
      * @var \Symfony\Component\Form\FormBuilderInterface
      */
     protected $formBuilder;
 
     /**
+     *
+     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     */
+    protected $container;
+
+    /**
+     *
      * @var \Symfony\Component\Security\Core\User\UserInterface
      */
     protected $user;
 
+    /**
+     *
+     * @var \Chill\MainBundle\Entity\Center
+     */
+    protected $center;
+
     public function setUp()
     {
         self::bootKernel();
 
         $this->container = self::$kernel->getContainer();
 
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new \Prophecy\Prophet;
+
 
         $this->formBuilder = $this->container
                 ->get('form.factory')
-            ->createBuilder(FormType::class, null, [
+                ->createBuilder(FormType::class, null, array(
                     'csrf_protection' => false,
-                'csrf_field_name' => '_token',
-            ]);
+                    'csrf_field_name' => '_token'
+                ));
 
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
@@ -67,104 +82,102 @@ class ActivityTypeTest extends KernelTestCase
 
         $this->user = $this->container->get('doctrine.orm.entity_manager')
                 ->getRepository('ChillMainBundle:User')
-            ->findOneBy(['username' => 'center a_social']);
+                ->findOneBy(array('username' => 'center a_social'));
         $this->center = $this->container->get('doctrine.orm.entity_manager')
                 ->getRepository('ChillMainBundle:Center')
-            ->findOneBy(['name' => 'Center A']);
+                ->findOneBy(array('name' => 'Center A'));
         $token = $prophet->prophesize();
         $token->willExtend(AbstractToken::class);
         $token->getUser()->willReturn($this->user);
         $this->container->get('security.token_storage')
                 ->setToken($token->reveal());
+
     }
 
     public function testForm()
     {
         $form = $this->formBuilder
-            ->add('activity', ActivityType::class, [
+                ->add('activity', ActivityType::class, array(
                     'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            ])
+                    'role' => new Role('CHILL_ACTIVITY_CREATE')
+                ))
                 ->getForm();
 
-        $form->submit([]);
+        $form->submit(array());
 
         $this->assertTrue($form->isSynchronized());
         $this->assertTrue($form->isValid());
         $this->assertInstanceOf(Activity::class, $form->getData()['activity']);
+
     }
 
     public function testFormSubmitting()
     {
         $form = $this->formBuilder
-            ->add('activity', ActivityType::class, [
+                ->add('activity', ActivityType::class, array(
                     'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            ])
+                    'role' => new Role('CHILL_ACTIVITY_CREATE')
+                ))
                 ->getForm();
 
-        $form->submit(['activity' => [
+        $form->submit(array( 'activity' => array(
             'date' => '9-3-2015',
             'durationTime' => 300,
           //  'remark' => 'blabla',
-            'attendee' => true,
-        ]]);
+            'attendee' => true
+        )));
 
 //        var_dump($form->getErrors()->count()); var_dump($form->isValid());
 //        foreach($form->getErrors() as $e) { fwrite(STDOUT, var_dump($e->getMessage())); }
 //        var_dump($form->getErrors());
 
-        $this->assertTrue($form->isSynchronized(), 'Test the form is synchronized');
-        $this->assertTrue($form->isValid(), 'test the form is valid');
+        $this->assertTrue($form->isSynchronized(), "Test the form is synchronized");
+        $this->assertTrue($form->isValid(), "test the form is valid");
         $this->assertInstanceOf(Activity::class, $form->getData()['activity']);
 
         // test the activity
         /* @var $activity Activity */
         $activity = $form->getData()['activity'];
 
-        $this->assertEquals(
-            '09-03-2015',
-            $activity->getDate()->format('d-m-Y'),
-            'Test the date is correct'
-        );
-        $this->assertEquals(
-            '00:05',
-            $activity->getDurationTime()->format('H:i'),
-            'Test the formatted hour is correct'
-        );
+        $this->assertEquals('09-03-2015', $activity->getDate()->format('d-m-Y'),
+                "Test the date is correct");
+        $this->assertEquals('00:05', $activity->getDurationTime()->format('H:i'),
+                "Test the formatted hour is correct");
         $this->assertEquals(true, $activity->getAttendee());
      //   $this->assertEquals('blabla', $activity->getRemark());
+
     }
 
     /**
      * Test that the form correctly build even with a durationTime which is not in
-     * the listed in the possible durationTime.
+     * the listed in the possible durationTime
      */
     public function testFormWithActivityHavingDifferentTime()
     {
         $activity = new Activity();
-        $activity->setDurationTime(DateTime::createFromFormat('U', 60));
+        $activity->setDurationTime(\DateTime::createFromFormat('U', 60));
 
         $builder = $this->container
                 ->get('form.factory')
-            ->createBuilder(FormType::class, ['activity' => $activity], [
+                ->createBuilder(FormType::class, array('activity' => $activity), array(
                     'csrf_protection' => false,
-                'csrf_field_name' => '_token',
-            ]);
+                    'csrf_field_name' => '_token'
+                ));
 
         $form = $builder
-            ->add('activity', ActivityType::class, [
+                ->add('activity', ActivityType::class, array(
                     'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            ])
+                    'role' => new Role('CHILL_ACTIVITY_CREATE')
+                ))
                 ->getForm();
 
-        $form->submit(['activity' => [
+
+        $form->submit(array( 'activity' => array(
             'date' => '9-3-2015',
             'durationTime' => 60,
           //  'remark' => 'blabla',
-            'attendee' => true,
-        ]]);
+            'attendee' => true
+        )));
 
         $this->assertTrue($form->isSynchronized());
         $this->assertTrue($form->isValid());
@@ -173,11 +186,8 @@ class ActivityTypeTest extends KernelTestCase
         /* @var $activity Activity */
         $activity = $form->getData()['activity'];
 
-        $this->assertEquals(
-            '00:01',
-            $activity->getDurationTime()->format('H:i'),
-            'Test the formatted hour is correct'
-        );
+        $this->assertEquals('00:01', $activity->getDurationTime()->format('H:i'),
+                "Test the formatted hour is correct");
 
         // test the view : we want to be sure that the entry with 60 seconds exists
         $view = $form->createView();
@@ -185,11 +195,11 @@ class ActivityTypeTest extends KernelTestCase
         $this->assertTrue(isset($view['activity']['durationTime']));
 
         // map all the values in an array
-        $values = array_map(
-            function ($choice) { return $choice->value; },
-            $view['activity']['durationTime']->vars['choices']
-        );
+        $values = array_map(function($choice) { return $choice->value; },
+                $view['activity']['durationTime']->vars['choices']);
 
         $this->assertContains(60, $values);
+
     }
+
 }

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

@@ -1,28 +1,40 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
+ * Copyright (C) 2015 Champs Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Form\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Form\PreloadedExtension;
-use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * Test translatableActivityReason.
+ * Test translatableActivityReason
  *
- * @internal
- * @coversNothing
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
  */
 class TranslatableActivityReasonTest extends TypeTestCase
 {
     /**
+     *
      * @var Prophecy\Prophet 
      */
     private static $prophet;
@@ -30,49 +42,39 @@ class TranslatableActivityReasonTest extends TypeTestCase
     public function setUp()
     {
         parent::setUp();
+        
+        
     }
     
+    protected function getExtensions()
+    {
+        $entityType = $this->getEntityType();
+        
+        return array(new PreloadedExtension(array(
+           'entity' => $entityType
+        ), array()));
+    }
+    
+    
     public function testSimple()
     {
         $translatableActivityReasonType = new TranslatableActivityReason(
               $this->getTranslatableStringHelper()
               );
         
-        $this->markTestSkipped('See issue 651');
-    }
-
-    /**
-     * @return \Symfony\Bridge\Doctrine\Form\Type\EntityType
-     */
-    protected function getEntityType()
-    {
-        $managerRegistry = (new \Prophecy\Prophet())->prophesize();
-
-        $managerRegistry->willImplement('Doctrine\Common\Persistence\ManagerRegistry');
-
-        return new \Symfony\Bridge\Doctrine\Form\Type\EntityType($managerRegistry->reveal());
-    }
-
-    protected function getExtensions()
-    {
-        $entityType = $this->getEntityType();
-
-        return [new PreloadedExtension([
-            'entity' => $entityType,
-        ], [])];
+        $this->markTestSkipped("See issue 651");
     }
     
     /**
+     * 
      * @param string $locale
      * @param string $fallbackLocale
-     *
      * @return TranslatableStringHelper
      */
-    protected function getTranslatableStringHelper(
-        $locale = 'en',
-        $fallbackLocale = 'en'
-    ) {
-        $prophet = new \Prophecy\Prophet();
+    protected function getTranslatableStringHelper($locale = 'en', 
+          $fallbackLocale = 'en')
+    {
+        $prophet = new \Prophecy\Prophet;
         $requestStack = $prophet->prophesize();
         $request = $prophet->prophesize();
         $translator = $prophet->prophesize();
@@ -88,9 +90,21 @@ class TranslatableActivityReasonTest extends TypeTestCase
         $translator->willExtend('Symfony\Component\Translation\Translator');
         $translator->getFallbackLocales()->willReturn($locale);
         
-        return new TranslatableStringHelper(
-            $requestStack->reveal(),
-            $translator->reveal()
-        );
+        return new TranslatableStringHelper($requestStack->reveal(), 
+              $translator->reveal());
+        
+    }
+    
+    /**
+     * 
+     * @return \Symfony\Bridge\Doctrine\Form\Type\EntityType
+     */
+    protected function getEntityType()
+    {
+        $managerRegistry = (new \Prophecy\Prophet())->prophesize();
+        
+        $managerRegistry->willImplement('Doctrine\Common\Persistence\ManagerRegistry');
+        
+        return new \Symfony\Bridge\Doctrine\Form\Type\EntityType($managerRegistry->reveal());
     }
 }

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

@@ -1,30 +1,44 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Tests\Form\Type;
 
-use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class TranslatableActivityTypeTest extends KernelTestCase
 {
+    
     /**
+     *
      * @var \Symfony\Component\Form\FormBuilderInterface
      */
     protected $builder;
     
     /**
+     *
      * @var \Symfony\Component\DependencyInjection\ContainerInterface
      */
     protected $container;
@@ -37,10 +51,10 @@ class TranslatableActivityTypeTest extends KernelTestCase
         
         $this->builder = $this->container
                 ->get('form.factory')
-            ->createBuilder(FormType::class, null, [
+                ->createBuilder(FormType::class, null, array(
                     'csrf_protection' => false,
-                'csrf_field_name' => '_token',
-            ]);
+                    'csrf_field_name' => '_token'
+                ));
         
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
@@ -49,22 +63,33 @@ class TranslatableActivityTypeTest extends KernelTestCase
                 ->push($request);
     }
     
+    /**
+     * 
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    protected function getRandomType($active = true)
+    {
+        $types = $this->container->get('doctrine.orm.entity_manager')
+                ->getRepository('ChillActivityBundle:ActivityType')
+                ->findBy(array('active' => $active));
+        
+        return $types[array_rand($types)];
+    }
+    
     public function testForm()
     {
         $type = $this->getRandomType();
         $form = $this->builder->add('type', TranslatableActivityType::class)
                 ->getForm();
         
-        $form->submit([
-            'type' => $type->getId(),
-        ]);
+        $form->submit(array(
+            'type' => $type->getId()
+        ));
         
         $this->assertTrue($form->isSynchronized());
-        $this->assertInstanceOf(
-            \Chill\ActivityBundle\Entity\ActivityType::class,
+        $this->assertInstanceOf(\Chill\ActivityBundle\Entity\ActivityType::class, 
                 $form->getData()['type'], 
-            'The data is an instance of Chill\\ActivityBundle\\Entity\\ActivityType'
-        );
+                "The data is an instance of Chill\ActivityBundle\Entity\ActivityType");
         $this->assertEquals($type->getId(), $form->getData()['type']->getId());
         
         // test the ordering of the types in the form
@@ -83,19 +108,9 @@ class TranslatableActivityTypeTest extends KernelTestCase
                 $previous = $choice->label;
             }
         }*/
+        
     }
     
-    /**
-     * @param mixed $active
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    protected function getRandomType($active = true)
-    {
-        $types = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillActivityBundle:ActivityType')
-            ->findBy(['active' => $active]);
     
-        return $types[array_rand($types)];
-    }
+    
 }

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

@@ -1,47 +1,57 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 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.
+ * 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\ActivityBundle\Tests\Security\Authorization;
 
-use Chill\ActivityBundle\Test\PrepareActivityTrait;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Test\PrepareCenterTrait;
-use Chill\MainBundle\Test\PrepareScopeTrait;
-use Chill\MainBundle\Test\PrepareUserTrait;
-use Chill\PersonBundle\Test\PreparePersonTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Test\PrepareUserTrait;
+use Chill\MainBundle\Test\PrepareCenterTrait;
+use Chill\MainBundle\Test\PrepareScopeTrait;
+use Chill\PersonBundle\Test\PreparePersonTrait;
+use Chill\ActivityBundle\Test\PrepareActivityTrait;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ActivityVoterTest extends KernelTestCase
 {
-    use PrepareActivityTrait;
-    use PrepareCenterTrait;
-    use PreparePersonTrait;
-    use PrepareScopeTrait;
-    use PrepareUserTrait;
-
-    /**
-     * @var \Prophecy\Prophet
-     */
-    protected $prophet;
+    use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait, 
+            PreparePersonTrait, PrepareActivityTrait;
     
     /**
+     *
      * @var \Chill\PersonBundle\Security\Authorization\PersonVoter
      */
     protected $voter;
     
+    /**
+     *
+     * @var \Prophecy\Prophet
+     */
+    protected $prophet;
+    
     public function setUp()
     {
         static::bootKernel();
@@ -50,59 +60,6 @@ class ActivityVoterTest extends KernelTestCase
         $this->prophet = new \Prophecy\Prophet();
     }
     
-    public function dataProvider_testVoteAction()
-    {
-        $centerA = $this->prepareCenter(1, 'center A');
-        $centerB = $this->prepareCenter(2, 'center B');
-        $scopeA = $this->prepareScope(1, 'scope default');
-        $scopeB = $this->prepareScope(2, 'scope B');
-        $scopeC = $this->prepareScope(3, 'scope C');
-
-        $userA = $this->prepareUser([
-            [
-                'center' => $centerA,
-                'permissionsGroup' => [
-                    ['scope' => $scopeB, 'role' => 'CHILL_ACTIVITY_CREATE'],
-                    ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_SEE'],
-                ],
-            ],
-            [
-                'center' => $centerB,
-                'permissionsGroup' => [
-                    ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_CREATE'],
-                    ['scope' => $scopeC, 'role' => 'CHILL_ACTIVITY_CREATE'],
-                ],
-            ],
-        ]);
-
-        return [
-            [
-                VoterInterface::ACCESS_GRANTED,
-                $userA,
-                $scopeB,
-                $centerA,
-                'CHILL_ACTIVITY_CREATE',
-                'assert that a user granted with same rights',
-            ],
-            [
-                VoterInterface::ACCESS_GRANTED,
-                $userA,
-                $scopeB,
-                $centerA,
-                'CHILL_ACTIVITY_SEE',
-                'assert that a user granted with inheritance rights',
-            ],
-            [
-                VoterInterface::ACCESS_DENIED,
-                $userA,
-                $scopeC,
-                $centerA,
-                'CHILL_ACTIVITY_SEE',
-                'assert that a suer is denied if he is not granted right on this center',
-            ],
-        ];
-    }
-
     public function testNullUser()
     {
         $token = $this->prepareToken();
@@ -113,50 +70,102 @@ class ActivityVoterTest extends KernelTestCase
         
         $this->assertEquals(
                 VoterInterface::ACCESS_DENIED,
-            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
-            'assert that a null user is not allowed to see'
+                $this->voter->vote($token, $activity, array('CHILL_ACTIVITY_SEE')), 
+                "assert that a null user is not allowed to see"
                 );
     }
     
     /**
-     * @dataProvider dataProvider_testVoteAction
      * 
+     * @dataProvider dataProvider_testVoteAction
      * @param type $expectedResult
+     * @param User $user
+     * @param Scope $scope
+     * @param Center $center
      * @param string $attribute
      * @param string $message
      */
-    public function testVoteAction(
-        $expectedResult,
-        User $user,
-        Scope $scope,
-        Center $center,
-        $attribute,
-        $message
-    ) {
+    public function testVoteAction($expectedResult, User $user, Scope $scope, 
+            Center $center, $attribute, $message)
+    {
         $token = $this->prepareToken($user);
         $activity = $this->prepareActivity($scope, $this->preparePerson($center));
         
         $this->assertEquals(
                 $expectedResult,
-            $this->voter->vote($token, $activity, [$attribute]),
+                $this->voter->vote($token, $activity, array($attribute)),
                 $message
             );
     }
     
+    public function dataProvider_testVoteAction()
+    {
+        $centerA = $this->prepareCenter(1, 'center A');
+        $centerB = $this->prepareCenter(2, 'center B');
+        $scopeA = $this->prepareScope(1, 'scope default');
+        $scopeB = $this->prepareScope(2, 'scope B');
+        $scopeC = $this->prepareScope(3, 'scope C');
+        
+        $userA = $this->prepareUser(array(
+            array(
+                'center' => $centerA, 
+                'permissionsGroup' => array(
+                    ['scope' => $scopeB, 'role' => 'CHILL_ACTIVITY_CREATE'],
+                    ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_SEE']
+                )
+            ),
+            array(
+               'center' => $centerB,
+               'permissionsGroup' => array(
+                     ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_CREATE'],
+                     ['scope' => $scopeC, 'role' => 'CHILL_ACTIVITY_CREATE']
+               )
+            )
+            
+        ));
+        
+        return array(
+            array(
+                VoterInterface::ACCESS_GRANTED,
+                $userA,
+                $scopeB,
+                $centerA,
+                'CHILL_ACTIVITY_CREATE',
+                'assert that a user granted with same rights'
+            ),
+            array(
+                VoterInterface::ACCESS_GRANTED,
+                $userA,
+                $scopeB,
+                $centerA,
+                'CHILL_ACTIVITY_SEE',
+                'assert that a user granted with inheritance rights'
+            ),
+            array(
+                VoterInterface::ACCESS_DENIED,
+                $userA,
+                $scopeC,
+                $centerA,
+                'CHILL_ACTIVITY_SEE',
+                'assert that a suer is denied if he is not granted right on this center'
+                
+            )
+        );
+    }
+    
     /**
-     * prepare a token interface with correct rights.
+     * prepare a token interface with correct rights
      * 
      * if $permissions = null, user will be null (no user associated with token
      * 
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(?User $user = null)
+    protected function prepareToken(User $user = null)
     {        
         $token = $this->prophet->prophesize();
         $token
             ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
-
-        if (null === $user) {
+        if ($user === NULL) {
             $token->getUser()->willReturn(null);
         } else {
             $token->getUser()->willReturn($user);

src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php

@@ -1,10 +1,20 @@
 <?php
 
-/**
- * Chill is a software for social workers
+/*
+ * Copyright (C) 2015 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.
+ * 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\ActivityBundle\Tests\Timeline;
@@ -12,13 +22,15 @@ namespace Chill\ActivityBundle\Tests\Timeline;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * @internal
- * @coversNothing
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class TimelineProviderTest extends WebTestCase
 {
     public function testAnActivityIsShownOnTimeline()
     {
-        $this->markTestSkipped('we have to write fixtures before writing this tests');
+        $this->markTestSkipped("we have to write fixtures before writing this tests");
     }
+    
 }

src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php

@@ -1,92 +1,182 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
+ * Copyright (C) 2015 Champs Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
+ * 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\ActivityBundle\Timeline;
 
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Chill\PersonBundle\Entity\Person;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use LogicException;
-use RuntimeException;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Chill\PersonBundle\Entity\Person;
+use Chill\MainBundle\Entity\Scope;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Timeline\TimelineSingleQuery;
 
 /**
- * Provide activity for inclusion in timeline.
+ * Provide activity for inclusion in timeline
+ *
 */
 class TimelineActivityProvider implements TimelineProviderInterface
 {
+    
     /**
+     *
      * @var EntityManager
      */
     protected $em;
     
     /**
+     *
      * @var AuthorizationHelper
      */
     protected $helper;
     
     /**
+     *
      * @var \Chill\MainBundle\Entity\User 
      */
     protected $user;
 
+    protected ActivityACLAwareRepository $aclAwareRepository;
+
+    private const SUPPORTED_CONTEXTS = [ 'center', 'person'];
+    
     /**
      * TimelineActivityProvider constructor.
+     *
+     * @param EntityManager $em
+     * @param AuthorizationHelper $helper
+     * @param TokenStorageInterface $storage
      */
     public function __construct(
         EntityManager $em,
         AuthorizationHelper $helper,
-        TokenStorageInterface $storage
-    ) {
+        TokenStorageInterface $storage,
+        ActivityACLAwareRepository $aclAwareRepository
+    )
+    {
         $this->em = $em;
         $this->helper = $helper;
+        $this->aclAwareRepository = $aclAwareRepository;
         
-        if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User) {
-            throw new RuntimeException('A user should be authenticated !');
+        if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User)
+        {
+            throw new \RuntimeException('A user should be authenticated !');
         }
         
         $this->user = $storage->getToken()->getUser();
     }
     
+    /**
+     * 
+     * {@inheritDoc}
+     */
     public function fetchQuery($context, array $args)
     {
-        $this->checkContext($context);
+        if ('center' === $context) {
+            return TimelineSingleQuery::fromArray($this->aclAwareRepository
+                ->queryTimelineIndexer($context, $args));
+        }
         
-        $metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity');
-        $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
 
-        return [
+        [$where, $parameters] =  $this->getWhereClauseForPerson($args['person']);
+        
+        return TimelineSingleQuery::fromArray([
            'id' => $metadataActivity->getTableName()
                 .'.'.$metadataActivity->getColumnName('id'),
            'type' => 'activity',
            'date' => $metadataActivity->getTableName()
                 .'.'.$metadataActivity->getColumnName('date'),
-            'FROM' => $this->getFromClause($metadataActivity, $metadataPerson),
-            'WHERE' => $this->getWhereClause(
-                $metadataActivity,
-                $metadataPerson,
-                $args['person']
+           'FROM' => $this->getFromClausePerson($args['person']),
+           'WHERE' => $where,
+           'parameters' => $parameters
+       ]);
+    }
+    
+    private function getWhereClauseForPerson(Person $person)
+    {
+        $parameters = [];
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+        $associationMapping = $metadataActivity->getAssociationMapping('person');
+        $role = new Role('CHILL_ACTIVITY_SEE');
+        $reachableScopes =  $this->helper->getReachableScopes($this->user,
+            $role, $person->getCenter());
+        $whereClause = sprintf(' {activity.person_id} = ? AND {activity.scope_id} IN ({scopes_ids}) ');
+        $scopes_ids = [];
+
+        // first parameter: activity.person_id 
+        $parameters[] = $person->getId();
+
+        // loop on reachable scopes 
+        foreach ($reachableScopes as $scope) {
+            if (\in_array($scope->getId(), $scopes_ids)) {
+                continue;
+            }
+            $scopes_ids[] = '?'; 
+            $parameters[] = $scope->getId();
+        }
+
+        return [
+            \strtr(
+                $whereClause,
+                [
+                    '{activity.person_id}' => $associationMapping['joinColumns'][0]['name'],
+                    '{activity.scope_id}' => $metadataActivity->getTableName().'.'.
+                        $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'],
+                    '{scopes_ids}' => \implode(", ", $scopes_ids)
+,
+                ]
             ),
+            $parameters
         ];
     }
     
+    private function getFromClausePerson()
+    {
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+        $metadataPerson = $this->em->getClassMetadata(Person::class);
+        $associationMapping = $metadataActivity->getAssociationMapping('person');
+        
+        return $metadataActivity->getTableName().' JOIN '
+            .$metadataPerson->getTableName().' ON '
+            .$metadataPerson->getTableName().'.'.
+                $associationMapping['joinColumns'][0]['referencedColumnName']
+            .' = '
+            .$associationMapping['joinColumns'][0]['name']
+            ;
+    }
+    
+    /**
+     * 
+     * {@inheritDoc}
+     */
     public function getEntities(array $ids)
     {
-        $activities = $this->em->getRepository('ChillActivityBundle:Activity')
-            ->findBy(['id' => $ids]);
-
-        $result = [];
+        $activities = $this->em->getRepository(Activity::class)
+              ->findBy(array('id' => $ids));
         
+        $result = array();
         foreach($activities as $activity) {
             $result[$activity->getId()] = $activity;
         }
@@ -94,6 +184,10 @@ class TimelineActivityProvider implements TimelineProviderInterface
         return $result;
     }
 
+    /**
+     * 
+     * {@inheritDoc}
+     */
     public function getEntityTemplate($entity, $context, array $args)
     {
         $this->checkContext($context);
@@ -102,97 +196,32 @@ class TimelineActivityProvider implements TimelineProviderInterface
            'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
            'template_data' => [
               'activity' => $entity,
-                'person' => $args['person'],
-                'user' => $entity->getUser(),
-            ],
+              'context' => $context
+            ]
         ];
     }
 
+    /**
+     * 
+     * {@inheritDoc}
+     */
     public function supportsType($type)
     {
-        return 'activity' === $type;
+        return $type === 'activity';
     }
     
     /**
-     * check if the context is supported.
+     * check if the context is supported
      * 
      * @param string $context
-     *
-     * @throws LogicException if the context is not supported
+     * @throws \LogicException if the context is not supported
      */
     private function checkContext($context)
     {
-        if ('person' !== $context) {
-            throw new LogicException("The context '{$context}' is not "
+        if (FALSE === \in_array($context, self::SUPPORTED_CONTEXTS)) {
+            throw new \LogicException("The context '$context' is not "
                   . "supported. Currently only 'person' is supported");
         }
     }
 
-    private function getFromClause(
-        ClassMetadata $metadataActivity,
-        ClassMetadata $metadataPerson
-    ) {
-        $associationMapping = $metadataActivity->getAssociationMapping('person');
-
-        return $metadataActivity->getTableName() . ' JOIN '
-            . $metadataPerson->getTableName() . ' ON '
-            . $metadataPerson->getTableName() . '.' .
-                $associationMapping['joinColumns'][0]['referencedColumnName']
-            . ' = '
-            . $associationMapping['joinColumns'][0]['name'];
-    }
-
-    private function getWhereClause(
-        ClassMetadata $metadataActivity,
-        ClassMetadata $metadataPerson,
-        Person $person
-    ) {
-        $role = new Role('CHILL_ACTIVITY_SEE');
-        $reachableCenters = $this->helper->getReachableCenters(
-            $this->user,
-            $role
-        );
-        $associationMapping = $metadataActivity->getAssociationMapping('person');
-
-        if (count($reachableCenters) === 0) {
-            return 'FALSE = TRUE';
-        }
-
-        // we start with activities having the person_id linked to person
-        // (currently only context "person" is supported)
-        $whereClause = sprintf(
-            '%s = %d',
-            $associationMapping['joinColumns'][0]['name'],
-            $person->getId()
-        );
-
-        // we add acl (reachable center and scopes)
-        $centerAndScopeLines = [];
-
-        foreach ($reachableCenters as $center) {
-            $reachablesScopesId = array_map(
-                function (Scope $scope) {
-                    return $scope->getId();
-                },
-                $this->helper->getReachableScopes(
-                    $this->user,
-                    $role,
-                    $person->getCenter()
-                )
-            );
-
-            $centerAndScopeLines[] = sprintf(
-                '(%s = %d AND %s IN (%s))',
-                $metadataPerson->getTableName() . '.' .
-                        $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'],
-                $center->getId(),
-                $metadataActivity->getTableName() . '.' .
-                        $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'],
-                implode(',', $reachablesScopesId)
-            );
-        }
-        $whereClause .= ' AND (' . implode(' OR ', $centerAndScopeLines) . ')';
-
-        return $whereClause;
-    }
 }

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -22,6 +22,14 @@ services:
             - '@doctrine.orm.entity_manager'
             - '@chill.main.security.authorization.helper'
             - '@security.token_storage'
+            - '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
         public: true
         tags:
             - { name: chill.timeline, context: 'person' }
+            - { name: chill.timeline, context: 'center' }
+
+    Chill\ActivityBundle\Menu\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Menu/'
+        tags: ['chill.menu_builder']

src/Bundle/ChillActivityBundle/config/services/menu.yaml

@@ -1,8 +0,0 @@
-services:
-    Chill\ActivityBundle\Menu\MenuBuilder:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }

src/Bundle/ChillActivityBundle/config/services/repositories.yaml

@@ -1,3 +1,4 @@
+---
 services:
     chill_activity.repository.activity_type:
         class: Doctrine\ORM\EntityRepository
@@ -16,3 +17,16 @@ services:
         factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments:
             - 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
+
+    Chill\ActivityBundle\Repository\ActivityRepository:
+        tags: [doctrine.repository_service]
+        arguments:
+            - '@Doctrine\Persistence\ManagerRegistry'
+
+    Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
+        arguments:
+            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
+            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+            $repository: '@Chill\ActivityBundle\Repository\ActivityRepository'
+            $em: '@Doctrine\ORM\EntityManagerInterface'
+

src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php

@@ -1,40 +1,38 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\Migrations\Activity;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20150701091248 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0C59BB1592');
-        $this->addSql('ALTER TABLE ActivityReason DROP CONSTRAINT FK_654A2FCD12469DE2');
-        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0CC54C8C93');
-        $this->addSql('DROP SEQUENCE Activity_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE ActivityReason_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE ActivityReasonCategory_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE ActivityType_id_seq CASCADE');
-        $this->addSql('DROP TABLE Activity');
-        $this->addSql('DROP TABLE ActivityReason');
-        $this->addSql('DROP TABLE ActivityReasonCategory');
-        $this->addSql('DROP TABLE ActivityType');
-    }
-
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
@@ -61,4 +59,25 @@ class Version20150701091248 extends AbstractMigration
         $this->addSql('ALTER TABLE Activity ADD CONSTRAINT FK_55026B0C217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE ActivityReason ADD CONSTRAINT FK_654A2FCD12469DE2 FOREIGN KEY (category_id) REFERENCES ActivityReasonCategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0C59BB1592');
+        $this->addSql('ALTER TABLE ActivityReason DROP CONSTRAINT FK_654A2FCD12469DE2');
+        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0CC54C8C93');
+        $this->addSql('DROP SEQUENCE Activity_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE ActivityReason_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE ActivityReasonCategory_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE ActivityType_id_seq CASCADE');
+        $this->addSql('DROP TABLE Activity');
+        $this->addSql('DROP TABLE ActivityReason');
+        $this->addSql('DROP TABLE ActivityReasonCategory');
+        $this->addSql('DROP TABLE ActivityType');
+    }
 }

src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php

@@ -1,35 +1,38 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\Migrations\Activity;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20150702093317 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN name;');
-        $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN label VARCHAR(255) NOT NULL;');
-        $this->addSql('ALTER TABLE ActivityReason DROP COLUMN name;');
-        $this->addSql('ALTER TABLE ActivityReason ADD COLUMN label VARCHAR(255) NOT NULL;');
-        $this->addSql('ALTER TABLE ActivityType DROP COLUMN name;');
-        $this->addSql('ALTER TABLE ActivityType ADD COLUMN name VARCHAR(255) NOT NULL;');
-    }
-
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
@@ -42,4 +45,20 @@ class Version20150702093317 extends AbstractMigration
         $this->addSql('ALTER TABLE ActivityType DROP COLUMN name;');
         $this->addSql('ALTER TABLE ActivityType ADD COLUMN name JSON;');
     }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN name;');
+        $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN label VARCHAR(255) NOT NULL;');
+        $this->addSql('ALTER TABLE ActivityReason DROP COLUMN name;');
+        $this->addSql('ALTER TABLE ActivityReason ADD COLUMN label VARCHAR(255) NOT NULL;');
+        $this->addSql('ALTER TABLE ActivityType DROP COLUMN name;');
+        $this->addSql('ALTER TABLE ActivityType ADD COLUMN name VARCHAR(255) NOT NULL;');
+    }
 }

src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php

@@ -1,31 +1,39 @@
 <?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.
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * <http://www.champs-libres.coop>, <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\Migrations\Activity;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
 
 /**
- * Db Migration.
+ * Db Migration
+ *
  */
 class Version20150704091347 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE Activity ALTER COLUMN remark SET NOT NULL;');
-        $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
-    }
-
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
@@ -34,4 +42,16 @@ class Version20150704091347 extends AbstractMigration
         $this->addSql('ALTER TABLE Activity ALTER COLUMN remark DROP NOT NULL;');
         $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
     }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE Activity ALTER COLUMN remark SET NOT NULL;');
+        $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
+    }
 }

src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php

@@ -1,16 +1,9 @@
 <?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\Migrations\Activity;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
 
 /**
  * Migrate schema to allow multiple or empty reasons on an activity. 
@@ -20,43 +13,17 @@ use Doctrine\Migrations\AbstractMigration;
  */
 class Version20160222103457 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.'
-        );
-
-        $this->addSql('ALTER TABLE Activity ADD reason_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE Activity ADD CONSTRAINT '
-                . 'fk_55026b0c59bb1592 FOREIGN KEY (reason_id) '
-                . 'REFERENCES activityreason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX idx_55026b0c59bb1592 ON Activity (reason_id)');
-
-        // try to keep at least on activity reason...
-        $this->addSql(
-            'UPDATE activity 
-            SET reason_id=rid
-            FROM (
-                    SELECT activity_id AS aid, MIN(activityreason_id) AS rid
-                    FROM activity_activityreason
-                    GROUP BY activity_id ) AS sb
-            WHERE sb.aid = activity.id'
-        );
-
-        $this->addSql('DROP TABLE activity_activityreason');
-    }
-
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema): void
     {
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.'
-        );
+        
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
+                'Migration can only be executed safely on \'postgresql\'.');
 
         // create the new table activity reason
-        $this->addSql(
-            'CREATE TABLE activity_activityreason ('
+        $this->addSql('CREATE TABLE activity_activityreason ('
                 . 'activity_id INT NOT NULL, '
                 . 'activityreason_id INT NOT NULL, '
                 . 'PRIMARY KEY(activity_id, activityreason_id))'
@@ -74,9 +41,39 @@ class Version20160222103457 extends AbstractMigration
         $this->addSql('INSERT INTO activity_activityreason (activity_id, activityreason_id) '
                 . 'SELECT id, reason_id FROM activity WHERE reason_id IS NOT NULL');
         
+
         // remove old column
         $this->addSql('ALTER TABLE activity DROP CONSTRAINT fk_55026b0c59bb1592');
         $this->addSql('DROP INDEX idx_55026b0c59bb1592');
         $this->addSql('ALTER TABLE activity DROP reason_id');
     }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
+                'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE Activity ADD reason_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE Activity ADD CONSTRAINT '
+                . 'fk_55026b0c59bb1592 FOREIGN KEY (reason_id) '
+                . 'REFERENCES activityreason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX idx_55026b0c59bb1592 ON Activity (reason_id)');
+
+        // try to keep at least on activity reason...
+        $this->addSql('UPDATE activity 
+            SET reason_id=rid
+            FROM (
+                    SELECT activity_id AS aid, MIN(activityreason_id) AS rid
+                    FROM activity_activityreason
+                    GROUP BY activity_id ) AS sb
+            WHERE sb.aid = activity.id'
+                );
+        
+        
+        $this->addSql('DROP TABLE activity_activityreason');
+        
+    }
 }

src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php

@@ -1,29 +1,29 @@
 <?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\Migrations\Activity;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
 
 /**
- * Add an "active" column on activitytype table.
+ * Add an "active" column on activitytype table
  */
 class Version20161114085659 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE ActivityType DROP active');
-    }
-
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE activitytype ADD active BOOLEAN NOT NULL DEFAULT \'t\'');
     }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE ActivityType DROP active');
+    }
 }

src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php

@@ -1,12 +1,5 @@
 <?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\Migrations\Activity;
@@ -19,15 +12,6 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210304154629 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-
-        $this->addSql('ALTER TABLE activity DROP comment_comment');
-        $this->addSql('ALTER TABLE activity DROP comment_userId');
-        $this->addSql('ALTER TABLE activity DROP comment_date');
-    }
-
     public function getDescription() : string
     {
         return '';
@@ -40,4 +24,13 @@ final class Version20210304154629 extends AbstractMigration
         $this->addSql('ALTER TABLE activity ADD comment_userId INT DEFAULT NULL');
         $this->addSql('ALTER TABLE activity ADD comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
     }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+
+        $this->addSql('ALTER TABLE activity DROP comment_comment');
+        $this->addSql('ALTER TABLE activity DROP comment_userId');
+        $this->addSql('ALTER TABLE activity DROP comment_date');
+    }
 }

src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php

@@ -1,12 +1,5 @@
 <?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\Migrations\Activity;
@@ -19,11 +12,6 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210311114250 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-    }
-
     public function getDescription() : string
     {
         return '';
@@ -35,4 +23,10 @@ final class Version20210311114250 extends AbstractMigration
         $this->addSql('UPDATE activity SET comment_comment = remark');
         $this->addSql('ALTER TABLE activity DROP remark');
     }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+
+    }
 }

src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php

@@ -1,19 +1,19 @@
 <?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\Calculator;
 
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
 
+/**
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 interface CalculatorInterface
 {
     /**
+     * 
      * @param AbstractElement[] $elements
      */
     public function calculate(array $elements) : ?CalculatorResult;

src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php

@@ -1,24 +1,19 @@
 <?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\Calculator;
 
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-use OutOfBoundsException;
-
-use function array_key_exists;
-use function array_keys;
-use function implode;
-
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class CalculatorManager
 {
     /**
+     *
      * @var CalculatorInterface[]
      */
     protected $calculators = [];
@@ -35,8 +30,23 @@ class CalculatorManager
     }
     
     /**
-     * @param AbstractElement[] $elements
      * 
+     * @param string $alias
+     * @return CalculatorInterface
+     */
+    public function getCalculator($alias)
+    {
+        if (FALSE === \array_key_exists($alias, $this->calculators)) {
+            throw new \OutOfBoundsException("The calculator with alias '$alias' does "
+                . "not exists. Possible values are ". \implode(", ", \array_keys($this->calculators)));
+        }
+        
+        return $this->calculators[$alias];
+    }
+    
+    /**
+     * 
+     * @param AbstractElement[] $elements
      * @return CalculatorResult[]
      */
     public function calculateDefault(array $elements)
@@ -47,26 +57,11 @@ class CalculatorManager
             $calculator = $this->calculators[$alias];
             $result = $calculator->calculate($elements);
             
-            if (null !== $result) {
+            if ($result !== null) {
                 $results[$calculator::getAlias()] = $result;
             }
         }
         
         return $results;
     }
-
-    /**
-     * @param string $alias
-     *
-     * @return CalculatorInterface
-     */
-    public function getCalculator($alias)
-    {
-        if (false === array_key_exists($alias, $this->calculators)) {
-            throw new OutOfBoundsException("The calculator with alias '{$alias}' does "
-                . 'not exists. Possible values are ' . implode(', ', array_keys($this->calculators)));
-        }
-
-        return $this->calculators[$alias];
-    }
 }

src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php

@@ -1,25 +1,23 @@
 <?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\Calculator;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class CalculatorResult
 {
-    public const TYPE_CURRENCY = 'currency';
+    const TYPE_RATE = 'rate';
+    const TYPE_CURRENCY = 'currency';
+    const TYPE_PERCENTAGE = 'percentage';
     
-    public const TYPE_PERCENTAGE = 'percentage';
-
-    public const TYPE_RATE = 'rate';
-
-    public $label;
+    public $type;
     
     public $result;
     
-    public $type;
+    public $label;
 }