Display data for Usagers concernés & Resources

139 Demandeur

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

.gitlab-ci.yml

@@ -18,7 +18,7 @@ before_script:
 # 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

.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);

LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

composer.json

@@ -64,7 +64,6 @@
         "symfony/symfony": "*"
     },
     "require-dev": {
-        "drupol/php-conventions": "5.*",
         "fakerphp/faker": "^1.13",
         "phpunit/phpunit": "^7.0",
         "symfony/dotenv": "^5.1",
@@ -74,7 +73,8 @@
         "symfony/web-profiler-bundle": "^5.0",
         "symfony/var-dumper": "4.*",
         "symfony/debug-bundle": "^5.1",
-        "symfony/phpunit-bridge": "^5.2"
+        "symfony/phpunit-bridge": "^5.2",    
+        "nelmio/alice": "^3.8"
     },
     "scripts": {
         "auto-scripts": {
@@ -83,6 +83,7 @@
         }
     },
     "config": {
+      "vendor-dir": "tests/app/vendor",
       "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(
+        $clause = $qb->expr()->between('person.birthdate', ':date_from', 
-            'person.birthdate',
+            ':date_to');
-            ':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: '
+        return array('Filtered by person\'s birtdate: '
-            . 'between %date_from% and %date_to%', [
+            . '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,107 +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.
- */
 
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\QueryBuilder;
-use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
 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
+            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()
     {
-        // we gather all center the user choose.
+        return "Count peoples by various parameters.";
-        $centers = array_map(function ($el) {
+    }
-            return $el['center'];
-        }, $acl);
     
-        $qb = $this->entityManager->createQueryBuilder();
+    public function getTitle()
-
+    {
-        $qb->select('COUNT(person.id) AS export_result')
+        return "Count peoples";
-            ->from('ChillPersonBundle:Person', 'person')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
-            ->setParameter('authorized_centers', $centers);
-
-        return $qb;
     }
     
     public function requiredRole()
@@ -109,9 +53,66 @@ class CountPerson implements ExportInterface
         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);
+        
+        $qb = $this->entityManager->createQueryBuilder();
+        
+        $qb->select('COUNT(person.id) AS export_result')
+                ->from('ChillPersonBundle:Person', 'person')
+                ->join('person.center', 'center')
+                ->andWhere('center IN (:authorized_centers)')
+                ->setParameter('authorized_centers', $centers);
+                ;
+        
+        
+        return $qb;
+    }
+    
+    public function getResult($qb, $data)
+    {
+        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,25 +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\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();
+             ->getSingleScalarResult();
        
         // get the PaginatorFactory
         $paginatorFactory = $this->get('chill_main.paginator_factory');
@@ -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
+        return $this->render('ChillMyBundle:Item:list.html.twig', array(
-            ->render(
+                'items' => $items,
-                'ChillMyBundle:Item:list.html.twig',
+                'paginator' => $paginator
-                [
+                );
-                    'items' => $items,
+            
-                    'paginator' => $paginator,
-                ]
-            );
     }
+
 }
+

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) {
+        if ($person === null) {
-            throw $this->createNotFoundException('The person is not found');
+            throw $this->createNotFoundException("The person is not found");
         }
         
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
@@ -43,7 +35,7 @@ class ConsultationController extends Controller
             $this->getUser(), 
             new Role(ConsultationVoter::SEE), 
             $person->getCenter()
-        );
+            );
         
         // create a query which take circles into account        
         $consultations = $this->getDoctrine()->getManager()
@@ -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,
+                'person' => $person,
-            'consultations' => $consultations,
+                'consultations' => $consultations
-        ]);
+            ));    
     }
 }
+

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

@@ -1,60 +1,64 @@
 <?php
+   # Chill\MainBundle\DependencyInjection\Configuration.php
   
-/**
+   namespace Chill\MainBundle\DependencyInjection;
- * 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\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
+   class Configuration implements ConfigurationInterface
-{
+   {
-    use AddWidgetConfigurationTrait;
        
-    /**
+       use AddWidgetConfigurationTrait;
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
        
-    public function __construct(
+       /**
-        array $widgetFactories = [],
+	*
-        ContainerBuilder $containerBuilder
+	* @var ContainerBuilder
-    ) {
+	*/
-        // we register here widget factories (see below)
+       private $containerBuilder;
-        $this->setWidgetFactories($widgetFactories);
-        // we will need the container builder later...
-        $this->containerBuilder = $containerBuilder;
-    }
 
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('chill_main');
        
-        $rootNode
+       public function __construct(array $widgetFactories = array(), 
-            ->children()
+	       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();
+	   $rootNode = $treeBuilder->root('chill_main');
+
+	   $rootNode
+	       ->children()
+
+                   // ...
+
+		   ->arrayNode('widgets')
+		       ->canBeDisabled()
+		       ->children()
+                            // we declare here all configuration for homepage place
+			    ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
+		       ->end() // end of widgets/children
+		   ->end() // end of widgets
+		  ->end() // end of root/children
+	       ->end() // end of root
+	   ;
+
+	   
+	   return $treeBuilder;
+       }
+   }
 
-                // ...
-            ->arrayNode('widgets')
-            ->canBeDisabled()
-            ->children()
-                         // we declare here all configuration for homepage place
-            ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
-            ->end() // end of widgets/children
-            ->end() // end of widgets
-            ->end() // end of root/children
-            ->end(); // end of root
 
-        return $treeBuilder;
-    }
-}

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

@@ -1,17 +1,16 @@
 <?php
 
-/**
+#Chill\MainBundle\DependencyInjection\ChillMainExtension.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\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(
+        $container->setParameter('chill_main.widgets', 
-            'chill_main.widgets',
+            array('homepage' => $config['widgets']['homepage']));
-            ['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,49 +1,55 @@
 <?php
 
-/**
+# Chill/PersonBundle/Widget/PersonListWidgetFactory
- * 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\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.
  */
 class PersonListWidgetFactory extends AbstractWidgetFactory
 {
-    /*
+   /*
-     * append the option to the configuration
+    * append the option to the configuration
-     * see http://symfony.com/doc/current/components/config/definition.html
+    * see http://symfony.com/doc/current/components/config/definition.html
-     *
+    *
-     */
+    */
     public function configureOptions($place, NodeBuilder $node)
     {
         $node->booleanNode('only_active')
-            ->defaultTrue()
+                ->defaultTrue()
-            ->end();
+                ->end();
         $node->integerNode('number_of_items')
             ->defaultValue(50)
             ->end();
         $node->scalarNode('filtering_class')
-            ->defaultNull()
+                ->defaultNull()
-            ->end();
+                ->end();
+            
     }
      
-    /*
+   /*
-     * return an array with the allowed places where the widget can be rendered
+    * return an array with the allowed places where the widget can be rendered
-     *
+    *
-     * @return string[]
+    * @return string[]
-     */
+    */   
     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/PersonBundle/Widget/PersonListWidget.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\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 Doctrine\DBAL\Types\Type;
-use Symfony\Component\Security\Core\Role\Role;
+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,43 +21,46 @@ use Twig_Environment;
  */
 class PersonListWidget implements WidgetInterface
 {
-    /**
-     * the authorization helper.
-     *
-     * @var AuthorizationHelper;
-     */
-    protected $authorizationHelper;
     
     /**
-     * The entity manager.
+     * Repository for persons
-     *
-     * @var EntityManager
-     */
-    protected $entityManager;
-
-    /**
-     * 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;
     
     public function __construct(
-        EntityRepository $personRepostory,
+            EntityRepository $personRepostory,
-        EntityManager $em,
+            EntityManager $em,
-        AuthorizationHelper $authorizationHelper,
+            AuthorizationHelper $authorizationHelper,
-        TokenStorage $tokenStorage
+            TokenStorage $tokenStorage
-    ) {
+            ) {
         $this->personRepository = $personRepostory;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
@@ -73,24 +68,27 @@ 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');
+                ->createQueryBuilder('person');
         
         // show only the person from the authorized centers
         $and = $qb->expr()->andX();
         $centers = $this->authorizationHelper
-            ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
+                ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
         $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
@@ -100,10 +98,10 @@ class PersonListWidget implements WidgetInterface
             $or->add($andWhenClosingDateIsNull);
             // add the case when now is between opening date and closing date
             $or->add(
-                (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
+                    (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/PersonBundle/DependencyInjection/ChillPersonExtension.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\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', [
+        $container->prependExtensionConfig('chill_main', array(
-            'widgets' => [
+            'widgets' => array(
-                'homepage' => [
+                '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 +0,0 @@
-imports:
-  - { resource: 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

phpunit.xml.dist

@@ -18,11 +18,10 @@
        <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>
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Export/*</exclude>
         </testsuite>
-      -->
       </testsuites>
 
     <listeners>

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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <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(
+            $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity,
-                'CHILL_ACTIVITY_CREATE',
+                    'creation of this activity not allowed');
-                $entity,
-                'creation of this activity not allowed'
-            );
 
             $em->persist($entity);
             $em->flush();
 
             $this->get('session')
                 ->getFlashBag()
-                ->add(
+                ->add('success',
-                    'success',
                     $this->get('translator')
                         ->trans('Success : activity created!')
                 );
 
             return $this->redirect(
-                $this->generateUrl(
+                $this->generateUrl('chill_activity_activity_show',
-                    'chill_activity_activity_show',
+                array('id' => $entity->getId(), 'person_id' => $person_id)));
-                    ['id' => $entity->getId(), 'person_id' => $person_id]
-                )
-            );
         }
 
         $this->get('session')
-            ->getFlashBag()->add(
+            ->getFlashBag()->add('danger',
-                '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(),
+            'form'   => $form->createView(),
-            'person' => $person,
+            'person' => $person
-        ]);
+        ));
     }
 
     /**
-     * Deletes a Activity entity.
+     * Creates a form to create a Activity entity.
      *
-     * @param mixed $id
+     * @param Activity $entity The entity
-     * @param mixed $person_id
+     *
+     * @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 */
+        if ($person === NULL){
-        $activity = $em->getRepository('ChillActivityBundle:Activity')
+            throw $this->createNotFoundException('Person not found');
-            ->find($id);
+        }
-        $person = $activity->getPerson();
 
-        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) {
+        $event = new PrivacyEvent($person, array(
-            $form->handleRequest($request);
+            'element_class' => Activity::class,
+            'element_id' => $entity->getId(),
+            'action' => 'show'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-            if ($form->isValid()) {
+        return $this->render('ChillActivityBundle:Activity:show.html.twig', array(
-                $this->logger->notice('An activity has been removed', [
+            'person'      => $person,
-                    'by_user' => $this->getUser()->getUsername(),
+            'entity'      => $entity,
-                    'activity_id' => $activity->getId(),
+            'delete_form' => $deleteForm->createView(),
-                    '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,
-                    ]
-                ));
-            }
-        }
-
-        return $this->render('ChillActivityBundle:Activity:confirm_delete.html.twig', [
-            'activity' => $activity,
-            'delete_form' => $form->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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            '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
+    * @param Activity $entity The entity
-     */
+    *
-    public function listAction($person_id, Request $request)
+    * @return \Symfony\Component\Form\Form The form
+    */
+    private function createEditForm(Activity $entity)
     {
-        $em = $this->getDoctrine()->getManager();
+        $form = $this->createForm(ActivityType::class, $entity, array(
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+            '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) {
+        return $form;
-            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 mixed $person_id
-     */
-    public function newAction($person_id)
-    {
-        $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);
-
-        $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(
+                ->add('success',
-                    '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(
+            ->add('error',
-                '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(),
+            'person'      => $entity->getPerson(),
-            'entity' => $entity,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            '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(
+        $em = $this->getDoctrine()->getManager();
-            ActivityType::class,
+
-            $entity,
+        /* @var $activity Activity */
-            [
+        $activity = $em->getRepository('ChillActivityBundle:Activity')
-                'action' => $this->generateUrl('chill_activity_activity_create', [
+              ->find($id);
-                    'person_id' => $entity->getPerson()->getId(),
+        $person = $activity->getPerson();
-                ]),
+
-                'method' => 'POST',
+        if (!$activity) {
-                'center' => $entity->getCenter(),
+            throw $this->createNotFoundException('Unable to find Activity entity.');
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+        }
-            ]
+
-        );
+        $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'])
+            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm();
+            ->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'),
-        ]);
     }
 }

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(),
+            '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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView(),
-        ]);
+        ));
     }
 
     /**
-     * Lists all ActivityReasonCategory entities.
+    * Creates a form to edit a ActivityReasonCategory entity.
-     */
+    *
-    public function indexAction()
+    * @param ActivityReasonCategory $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    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',
+        ));
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
+        return $form;
-            '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.
-     *
-     * @param mixed $id
-     */
-    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', [
-            '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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            '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(),
+            '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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView()
-        ]);
+        ));
     }
 
     /**
-     * Lists all ActivityReason entities.
+    * Creates a form to edit a ActivityReason entity.
-     */
+    *
-    public function indexAction()
+    * @param ActivityReason $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    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',
+        ));
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
+        return $form;
-            '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.
-     *
-     * @param mixed $id
-     */
-    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', [
-            '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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            '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;
     }
 }

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 Symfony\Component\HttpFoundation\Request;
-use Chill\ActivityBundle\Form\ActivityTypeType;
 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(),
+            '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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView()
-        ]);
+        ));
     }
 
     /**
-     * Lists all ActivityType entities.
+    * Creates a form to edit a ActivityType entity.
-     */
+    *
-    public function indexAction()
+    * @param ActivityType $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    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',
+        ));
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityType')->findAll();
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        return $this->render('ChillActivityBundle:ActivityType:index.html.twig', [
+        return $form;
-            '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.
-     *
-     * @param mixed $id
-     */
-    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', [
-            '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,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            '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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <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')
+        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
-            ->getRepository('ChillPersonBundle:Person')
+        return $this->getReference($scopeRef);
-            ->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;
     }
 
     /**
-     * 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 a random user
-     *
-     * @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 \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,62 +1,77 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  * 
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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)
                 ->setCategory($this->getReference($r['category']));
             $manager->persist($activityReason);
-            $reference = 'activity_reason_' . $r['name']['en'];
+            $reference = 'activity_reason_'.$r['name']['en'];
             $this->addReference($reference, $activityReason);
             static::$references[] = $reference;
         }

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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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' =>
-            ['name' => ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
+                ['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'],
+              'cat_'.$c['name']['en'],
-                $activityReasonCategory
+              $activityReasonCategory);
-            );
         }
         
         $manager->flush();

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

@@ -1,45 +1,63 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  * 
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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' =>
-            ['name' => ['fr' => 'Entretien', 'en' => 'Interview', 'nl' => 'Vraaggesprek']],
+                ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel']],
-            ['name' => ['fr' => 'Inspection', 'en' => 'Inspection', 'nl' => 'Inspectie']],
+            [ '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);
-            $reference = 'activity_type_' . $t['name']['en'];
+            $reference = 'activity_type_'.$t['name']['en'];
             $this->addReference($reference, $activityType);
             static::$references[] = $reference;
         }

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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,12 +40,12 @@ 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){
-            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 //create permission group
                 switch ($permissionsGroup->getName()) {
@@ -41,49 +53,47 @@ 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(
+                printf("Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s "
-                    'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
                         . "permission group, scope '%s' \n", 
-                    $permissionsGroup->getName(),
+                        $permissionsGroup->getName(), $scope->getName()['en']);
-                    $scope->getName()['en']
-                );
                 $roleScopeUpdate = (new RoleScope())
-                    ->setRole('CHILL_ACTIVITY_UPDATE')
+                            ->setRole('CHILL_ACTIVITY_UPDATE')
-                    ->setScope($scope);
+                            ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
                 $roleScopeCreate = (new RoleScope())
-                    ->setRole('CHILL_ACTIVITY_CREATE')
+                            ->setRole('CHILL_ACTIVITY_CREATE')
-                    ->setScope($scope);
+                            ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeCreate);
                 $roleScopeDelete = (new RoleScope())
-                    ->setRole('CHILL_ACTIVITY_DELETE')
+                            ->setRole('CHILL_ACTIVITY_DELETE')
-                    ->setScope($scope);
+                            ->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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Loader;
 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();
@@ -30,7 +47,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
@@ -47,30 +64,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', [
+         $container->prependExtensionConfig('chill_main', array(
-            'routing' => [
+           'routing' => array(
-                'resources' => [
+              'resources' => array(
-                    '@ChillActivityBundle/config/routes.yaml',
+                 '@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,71 +1,69 @@
 <?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');
         $rootNode = $treeBuilder->getRootNode('chill_activity');
         
         $rootNode
-            ->children()
+                ->children()
-            ->arrayNode('form')
+                    ->arrayNode('form')
-            ->canBeEnabled()
+                        ->canBeEnabled()
-            ->children()
+                        ->children()
-            ->arrayNode('time_duration')
+                            ->arrayNode('time_duration')
-            ->isRequired()
+                            ->isRequired()
-            ->requiresAtLeastOneElement()
+                            ->requiresAtLeastOneElement()
-            ->defaultValue(
+                            ->defaultValue(
-                [
+                                    array(
-                    ['label' => '5 minutes',  'seconds' => 300],
+                                        [ 'label' => '5 minutes',  'seconds' => 300], 
-                    ['label' => '10 minutes', 'seconds' => 600],
+                                        [ 'label' => '10 minutes', 'seconds' => 600],
-                    ['label' => '15 minutes', 'seconds' => 900],
+                                        [ 'label' => '15 minutes', 'seconds' => 900],
-                    ['label' => '20 minutes', 'seconds' => 1200],
+                                        [ 'label' => '20 minutes', 'seconds' => 1200],
-                    ['label' => '25 minutes', 'seconds' => 1500],
+                                        [ 'label' => '25 minutes', 'seconds' => 1500],
-                    ['label' => '30 minutes', 'seconds' => 1800],
+                                        [ 'label' => '30 minutes', 'seconds' => 1800],
-                    ['label' => '45 minutes', 'seconds' => 2700],
+                                        [ 'label' => '45 minutes', 'seconds' => 2700],
-                    ['label' => '1 hour',     'seconds' => 3600],
+                                        [ 'label' => '1 hour',     'seconds' => 3600],
-                    ['label' => '1 hour 15',  'seconds' => 4500],
+                                        [ 'label' => '1 hour 15',  'seconds' => 4500],
-                    ['label' => '1 hour 30',  'seconds' => 5400],
+                                        [ 'label' => '1 hour 30',  'seconds' => 5400],
-                    ['label' => '1 hour 45',  'seconds' => 6300],
+                                        [ 'label' => '1 hour 45',  'seconds' => 6300],
-                    ['label' => '2 hours',    'seconds' => 7200],
+                                        [ 'label' => '2 hours',    'seconds' => 7200],
-                ]
+                                        )
-            )
+                                    )
-            ->info('The intervals of time to show in activity form')
+                            ->info('The intervals of time to show in activity form')
-            ->prototype('array')
+
-            ->children()
+                            ->prototype('array')
-            ->scalarNode('seconds')
+                                ->children()
-            ->info('The number of seconds of this duration. Must be an integer.')
+                                    ->scalarNode('seconds')
-            ->cannotBeEmpty()
+                                        ->info("The number of seconds of this duration. Must be an integer.")
-            ->validate()
+                                        ->cannotBeEmpty()
-            ->ifTrue(function ($data) {
+                                        ->validate()
-                return !is_int($data);
+                                            ->ifTrue(function($data) {
-            })->thenInvalid('The value %s is not a valid integer')
+                                                return !is_int($data);
-            ->end()
+                                            })->thenInvalid("The value %s is not a valid integer")
-            ->end()
+                                        ->end()
-            ->scalarNode('label')
+                                    ->end()
-            ->cannotBeEmpty()
+                                    ->scalarNode('label')
-            ->info('The label to show into fields')
+                                        ->cannotBeEmpty()
-            ->end()
+                                        ->info("The label to show into fields")
-            ->end()
+                                    ->end()
-            ->end()
+                                ->end()
+
+                            ->end()
 //                            ->validate()
 //                            
 //                                ->ifTrue(function ($data) {
@@ -86,10 +84,11 @@ class Configuration implements ConfigurationInterface
 //                                    })
 //                                    ->thenInvalid("The data are invalid. The keys must be a string and the value integers")
 //                            ->end()
-            ->end()
+                            ->end()
-            ->end()
+                        ->end()
-            ->end()
+                
-            ->end();
+                    ->end()
+                ->end();
 
         return $treeBuilder;
     }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -1,65 +1,55 @@
 <?php
 
-/**
+/*
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 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 Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
+use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\HasScopeInterface;
 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 Chill\MainBundle\Entity\HasCenterInterface;
-use Doctrine\Common\Collections\ArrayCollection;
+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()
  * @ORM\Table(name="activity")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  * @UserCircleConsistency(
- *     "CHILL_ACTIVITY_SEE_DETAILS",
+ *      "CHILL_ACTIVITY_SEE_DETAILS",
- *     getUserFunction="getUser",
+ *      getUserFunction="getUser",
- * path="scope")
+ *      path="scope")
  */
 class Activity implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var bool
+     * @var integer
-     * @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
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -68,10 +58,28 @@ class Activity implements HasCenterInterface, HasScopeInterface
     private $id;
 
     /**
-     * @var Person
+     * @var User
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @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
+     * @var Scope
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @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.
+     * @param ActivityReason $reason
-     *
-     * @return bool
      */
-    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
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 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\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
+     * @var integer
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var ActivityReasonCategory
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
-     * inversedBy="reasons")
-     */
-    private $category;
-
-    /**
-     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -50,17 +49,86 @@ class ActivityReason
     private $name;
 
     /**
-     * Get active.
+     * @var ActivityReasonCategory
-     *
+     * @ORM\ManyToOne(
-     * @return bool
+     *     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.
+     * Set active
-     *
-     * @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
      *
+     * @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
+     * Get active
-     * category, the reason will become inactive.
      *
-     * @return ActivityReason
+     * @return boolean
      */
-    public function setCategory(ActivityReasonCategory $category)
+    public function getActive()
     {
-        if ($this->category !== $category && !$category->getActive()) {
+        return $this->active;
-            $this->setActive(false);
-        }
-
-        $this->category = $category;
-
-        return $this;
-    }
-
-    /**
-     * Set name.
-     *
-     * @param array $name
-     *
-     * @return ActivityReason
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
     }
 }
+

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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ *  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
+     * @var integer
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -43,12 +48,17 @@ 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",
-     * mappedBy="category")
+     *     mappedBy="category")
      */
     private $reasons;
     
@@ -65,23 +75,13 @@ class ActivityReasonCategory
      */
     public function __toString()
     {
-        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
+        return 'ActivityReasonCategory('.$this->getName('x').')';
     }
 
     /**
-     * Get active.
+     * Get id
      *
-     * @return bool
+     * @return integer
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * Get id.
-     *
-     * @return int
      */
     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,32 +111,30 @@ class ActivityReasonCategory
         if ($locale) {
             if (isset($this->name[$locale])) {
                 return $this->name[$locale];
-            }
+            } else {
-
+                foreach ($this->name as $name) {
-            foreach ($this->name as $name) {
+                    if (!empty($name)) {
-                if (!empty($name)) {
+                        return $name;
-                    return $name;
+                    }
                 }
             }
-
             return '';
+        } else {
+            return $this->name;
         }
-
-        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.
+     * set as unactive
-     *
-     * @param bool $active
      *
+     * @param boolean $active
      * @return ActivityReasonCategory
      */
     public function setActive($active)
     {
-        if ($this->active !== $active && !$active) {
+        if($this->active !== $active && !$active) {
             foreach ($this->reasons as $reason) {
                 $reason->setActive($active);
             }
@@ -137,16 +146,13 @@ class ActivityReasonCategory
     }
 
     /**
-     * Set name.
+     * Get active
      *
-     * @param array $name
+     * @return boolean
-     *
-     * @return ActivityReasonCategory
      */
-    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
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 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;
@@ -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
+     * @var integer
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -42,20 +48,16 @@ class ActivityType
     private $name;
     
     /**
-     * Get active
+     * @var bool
-     * return true if the type is active.
+     * @ORM\Column(type="boolean")
-     *
-     * @return bool
      */
-    public function getActive()
+    private $active = true;
-    {
+
-        return $this->active;
-    }
 
     /**
-     * Get id.
+     * Get id
      *
-     * @return int
+     * @return integer
      */
     public function getId()
     {
@@ -63,62 +65,9 @@ class ActivityType
     }
 
     /**
-     * Get name.
+     * Set 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.
      *
      * @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,96 +1,107 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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;
 
     public function __construct(
-        EntityRepository $categoryRepository,
+            EntityRepository $categoryRepository,
-        EntityRepository $reasonRepository,
+            EntityRepository $reasonRepository,
-        TranslatableStringHelper $stringHelper
+            TranslatableStringHelper $stringHelper
     ) {
         $this->categoryRepository = $categoryRepository;
-        $this->reasonRepository = $reasonRepository;
+        $this->reasonRepository   = $reasonRepository;
-        $this->stringHelper = $stringHelper;
+        $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);
+        $qb->addSelect($elem.' as '.$alias);
 
         // make a jointure only if needed
         $join = $qb->getDQLPart('join');
-
         if (
-            (
+            (array_key_exists('activity', $join)
-                array_key_exists('activity', $join)
+            &&
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            or (!array_key_exists('activity', $join))
+            OR
+            (! array_key_exists('activity', $join))
         ) {
             $qb->add(
-                'join',
+                    'join',
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
+                    array('activity' =>
-                ],
+                        new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')
-                true
+                        ),
-            );
+                    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 boolean
-     * @return bool
      */
     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,48 +1,61 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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;
+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
 {
-    public const KEY = 'activity_type_aggregator';
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $stringHelper;
     
     /**
+     *
      * @var EntityRepository
      */
     protected $typeRepository;
     
-    public function __construct(
+    /**
-        EntityRepository $typeRepository,
+     *
-        TranslatableStringHelper $stringHelper
+     * @var TranslatableStringHelper
-    ) {
+     */
-        $this->typeRepository = $typeRepository;
+    protected $stringHelper;
-        $this->stringHelper = $stringHelper;
-    }
     
-    public function addRole()
+    const KEY = 'activity_type_aggregator';
-    {
+    
-        return new Role(ActivityStatsVoter::STATS);
+    public function __construct(
+            EntityRepository $typeRepository,
+            TranslatableStringHelper $stringHelper
+    ) {
+        $this->typeRepository     = $typeRepository;
+        $this->stringHelper       = $stringHelper;
     }
     
     public function alterQuery(QueryBuilder $qb, $data)
@@ -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) {
+        return function($value) use ($data) {
-            if ('_header' === $value) {
+            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
-
+/*
-/**
+ * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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;
+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
 {
-    public const KEY = 'activity_user_id';
-
     /**
+     *
      * @var EntityManagerInterface
      */
     protected $em;
     
-    public function __construct(EntityManagerInterface $em)
+    const KEY = 'activity_user_id';
+    
+    function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
@@ -56,17 +70,16 @@ 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)
             ->findBy(['id' => $values]);
         
-        return function ($value) {
+        return function($value) {
             switch ($value) {
                 case '_header':
                     return 'activity user';
-
                 default:
                     return $this->em->getRepository(User::class)->find($value)
                         ->getUsername();
@@ -76,11 +89,11 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function getQueryKeys($data)
     {
-        return [self::KEY];
+        return [ self::KEY ];
     }
 
     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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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\QueryBuilder;
-use Doctrine\ORM\Query;
-use LogicException;
 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
+            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.';
+        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);
     }
 
     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) {
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
-            return $el['center'];
-        }, $acl);
         
         $qb->select('COUNT(activity.id) as export_count_activity')
-            ->from('ChillActivityBundle:Activity', '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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,131 +74,115 @@ class ListActivity implements ListInterface
         'type_name',
         'person_firstname',
         'person_lastname',
-        'person_id',
+        'person_id'
-    ];
+    );
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
 
     public function __construct(
-        EntityManagerInterface $em,
+            EntityManagerInterface $em,
-        TranslatorInterface $translator,
+            TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper
+            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',
+            'label'    => 'Fields to include in export',
-            'constraints' => [new Callback([
+            'constraints' => [new Callback(array(
-                'callback' => function ($selected, ExecutionContextInterface $context) {
+                '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) {
+            case 'date' :
-                    if ('_header' === $value) {
+                return function($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) {
+                return function($value) {
-                    if ('_header' === $value) {
+                    if ($value === '_header') return 'attendee';
-                        return 'attendee';
-                    }
 
                     return $value ? 1 : 0;
                 };
-
+            case 'list_reasons' :
-            case 'list_reasons':
                 /* @var $activityReasonsRepository EntityRepository */
                 $activityRepository = $this->entityManager
                     ->getRepository('ChillActivityBundle:Activity');
 
-                return function ($value) use ($activityRepository) {
+                return function($value) use ($activityRepository) {
-                    if ('_header' === $value) {
+                    if ($value === '_header') return 'activity reasons';
-                        return 'activity reasons';
-                    }
 
                     $activity = $activityRepository
-                        ->find($value);
+                            ->find($value);
 
-                    return implode(', ', array_map(function (ActivityReason $r) {
+                    return implode(", ", array_map(function(ActivityReason $r) {
-                        return '"' .
+
+                        return '"'.
                                 $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                . ' > ' .
+                                .' > '.
                                 $this->translatableStringHelper->localize($r->getName())
-                                . '"';
+                                .'"';
                     }, $activity->getReasons()->toArray()));
                 };
-
+            case 'circle_name' :
-            case 'circle_name':
+                return function($value) {
-                return function ($value) {
+                    if ($value === '_header') return 'circle';
-                    if ('_header' === $value) {
-                        return 'circle';
-                    }
 
                     return $this->translatableStringHelper
-                        ->localize(json_decode($value, true));
+                            ->localize(json_decode($value, true));
                 };
-
+            case 'type_name' :
-            case 'type_name':
+                return function($value) {
-                return function ($value) {
+                    if ($value === '_header') return 'activity type';
-                    if ('_header' === $value) {
-                        return 'activity type';
-                    }
 
                     return $this->translatableStringHelper
-                        ->localize(json_decode($value, true));
+                            ->localize(json_decode($value, true));
                 };
-
             default:
-                return function ($value) use ($key) {
+                return function($value) use ($key) {
-                    if ('_header' === $value) {
+                    if ($value === '_header') return $key;
-                        return $key;
-                    }
 
                     return $value;
                 };
@@ -198,83 +209,68 @@ 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) {
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
-            return $el['center'];
-        }, $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
+        if (!\array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException("any fields "
-                . 'have been checked');
+                . "have been checked");
         }
 
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
-            ->from('ChillActivityBundle:Activity', 'activity')
+                ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person')
+                ->join('activity.person', 'person')
-            ->join('person.center', 'center')
+                ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
+                ->andWhere('center IN (:authorized_centers)')
-            ->setParameter('authorized_centers', $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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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\QueryBuilder;
-use Doctrine\ORM\Query;
-use LogicException;
 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
+     * constructor
-     */
-    protected $entityManager;
-
-    /**
-     * constructor.
      * 
+     * @param EntityManagerInterface $em
      * @param string $action the stat to perform
      */
     public function __construct(
-        EntityManagerInterface $em,
+            EntityManagerInterface $em,
-        $action = 'sum'
+            $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) {
+        if ($this->action === self::SUM) {
-            return 'Sum activities duration by various parameters.';
+            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) {
+        if ($this->action === self::SUM) {
-            return 'Sum activity duration';
+            return "Sum activity duration";
         }
+        
     }
 
     public function getType()
@@ -107,34 +91,69 @@ 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) {
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
-            return $el['center'];
-        }, $acl);
         $qb = $this->entityManager->createQueryBuilder();
         
-        if (self::SUM === $this->action) {
+        if ($this->action === self::SUM) {
-            $select = 'SUM(activity.durationTime) AS export_stat_activity';
+            $select = "SUM(activity.durationTime) AS export_stat_activity";
         }
         
         $qb->select($select)
-            ->from('ChillActivityBundle:Activity', 'activity')
+                ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person')
+                ->join('activity.person',  'person')
-            ->join('person.center', 'center')
+                ->join('person.center', 'center')
-            ->where($qb->expr()->in('center', ':centers'))
+                ->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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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(
+        $clause = $qb->expr()->between('activity.date', ':date_from', 
-            'activity.date',
+            ':date_to');
-            ':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, [
+        $builder->add('date_from', DateType::class, array(
-            'label' => 'Activities after this date',
+            'label' => "Activities after this date",
-            'data' => new DateTime(),
+            'data'  => new \DateTime(),
-            'attr' => ['class' => 'datepicker'],
+            'attr'  => array('class' => 'datepicker'),
-            'widget' => 'single_text',
+            'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
-        $builder->add('date_to', DateType::class, [
+        $builder->add('date_to', DateType::class, array(
-            'label' => 'Activities before this date',
+            'label' => "Activities before this date",
-            'data' => new DateTime(),
+            'data'  => new \DateTime(),
-            'attr' => ['class' => 'datepicker'],
+            'attr'  => array('class' => 'datepicker'),
-            'widget' => 'single_text',
+            'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $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();
+                $form      = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
-                $date_to = $form->get('date_to')->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 ($date_to   === null) {
-                if (null === $date_to) {
                     $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 !== null && $date_to !== null)
-                    && $date_from >= $date_to
+                    &&
+                    $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 [
+        return array(
-            'Filtered by date of activity: only between %date_from% and %date_to%',
+            "Filtered by date of activity: only between %date_from% and %date_to%",
-            [
+            array(
-                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                "%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 'Filtered by date activity';
+        return "Filtered by date activity";
     }
+
 }

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

@@ -1,76 +1,88 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,
+ * 
-    ExportElementValidatedInterface
+ *
+ * @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,
+            TranslatableStringHelper $helper,
-        EntityRepository $reasonRepository
+            EntityRepository $reasonRepository
     ) {
         $this->translatableStringHelper = $helper;
-        $this->reasonRepository = $reasonRepository;
+        $this->reasonRepository         = $reasonRepository;
     }
     
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
     
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $join = $qb->getDQLPart('join');
+        $join  = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
         //dump($join);
         // add a join to reasons only if needed
         if (
-            (
+            (array_key_exists('activity', $join)
-                array_key_exists('activity', $join)
+            &&
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            or (!array_key_exists('activity', $join))
+            OR
+            (! array_key_exists('activity', $join))
         ) {
             $qb->add(
-                'join',
+                    'join', 
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
+                    array('activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')), 
-                true
+                    true
-            );
+                    );
         }
 
         if ($where instanceof Expr\Andx) {
@@ -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 boolean
-     *
-     * @return bool
      */
     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,56 +1,66 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,
+ * 
-    ExportElementValidatedInterface
+ *
+ */
+class ActivityTypeFilter implements FilterInterface,
+   ExportElementValidatedInterface
 {
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
     
     /**
-     * The repository for activity reasons.
+     * The repository for activity reasons
      *
      * @var EntityRepository
      */
     protected $typeRepository;
     
     public function __construct(
-        TranslatableStringHelper $helper,
+            TranslatableStringHelper $helper,
-        EntityRepository $typeRepository
+            EntityRepository $typeRepository
     ) {
         $this->translatableStringHelper = $helper;
         $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 boolean
-     *
-     * @return bool
      */
     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,60 +1,79 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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;
     
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
+            TranslatableStringHelper $translatableStringHelper,
-        EntityRepository $activityReasonRepository,
+            EntityRepository $activityReasonRepository,
-        TranslatorInterface $translator
+            TranslatorInterface $translator
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->activityReasonRepository = $activityReasonRepository;
-        $this->translator = $translator;
+        $this->translator               = $translator;
     }
 
+
     public function addRole()
     {
         return null;
@@ -64,25 +83,23 @@ class PersonHavingActivityBetweenDateFilter implements
     {
         // create a query for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
-        $sqb->select('person_person_having_activity.id')
+        $sqb->select("person_person_having_activity.id")
-            ->from('ChillActivityBundle:Activity', 'activity_person_having_activity')
+                ->from("ChillActivityBundle:Activity", "activity_person_having_activity")
-            ->join('activity_person_having_activity.person', 'person_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 '
+        $sqb->where("activity_person_having_activity.date BETWEEN "
-                . ':person_having_activity_between_date_from'
+                . ":person_having_activity_between_date_from"
-                . ' AND '
+                . " AND "
-                . ':person_having_activity_between_date_to');
+                . ":person_having_activity_between_date_to");
         // add clause activity reason
-        $sqb->join(
+        $sqb->join('activity_person_having_activity.reasons', 
-            'activity_person_having_activity.reasons',
+                'reasons_person_having_activity');
-            'reasons_person_having_activity'
-        );
         $sqb->andWhere(
-            $sqb->expr()->in(
+                $sqb->expr()->in(
-                'reasons_person_having_activity',
+                    'reasons_person_having_activity',
-                ':person_having_activity_reasons'
+                    ":person_having_activity_reasons")
-            )
+                );
-        );
         
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('person.id', $sqb->getDQL());
@@ -94,14 +111,10 @@ class PersonHavingActivityBetweenDateFilter implements
         }
         
         $qb->add('where', $where);
-        $qb->setParameter(
+        $qb->setParameter('person_having_activity_between_date_from', 
-            'person_having_activity_between_date_from',
+                $data['date_from']);
-            $data['date_from']
+        $qb->setParameter('person_having_activity_between_date_to', 
-        );
+                $data['date_to']);
-        $qb->setParameter(
-            'person_having_activity_between_date_to',
-            $data['date_to']
-        );
         $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
@@ -112,107 +125,104 @@ class PersonHavingActivityBetweenDateFilter implements
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, [
+        $builder->add('date_from', DateType::class, array(
-            'label' => 'Implied in an activity after this date',
+            'label' => "Implied in an activity after this date",
-            'data' => new DateTime(),
+            'data'  => new \DateTime(),
-            'attr' => ['class' => 'datepicker'],
+            'attr'  => array('class' => 'datepicker'),
-            'widget' => 'single_text',
+            'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
-        ]);
+        ));
         
-        $builder->add('date_to', DateType::class, [
+        $builder->add('date_to', DateType::class, array(
-            'label' => 'Implied in an activity before this date',
+            'label' => "Implied in an activity before this date",
-            'data' => new DateTime(),
+            'data'  => new \DateTime(),
-            'attr' => ['class' => 'datepicker'],
+            'attr'  => array('class' => 'datepicker'),
-            'widget' => 'single_text',
+            '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
-                    ->localize($reason->getName());
+                        ->localize($reason->getName());
             },
-            'group_by' => function (ActivityReason $reason) {
+            'group_by' => function(ActivityReason $reason) {
                 return $this->translatableStringHelper
-                    ->localize($reason->getCategory()->getName());
+                        ->localize($reason->getCategory()->getName());
             },
             '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) {
+        $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();
+                $form      = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
-                $date_to = $form->get('date_to')->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 ($date_to   === null) {
-                if (null === $date_to) {
                     $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 !== null && $date_to !== null)
-                    && $date_from >= $date_to
+                    &&
+                    $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 [
+        return array(
-            'Filtered by person having an activity between %date_from% and '
+            "Filtered by person having an activity between %date_from% and "
-            . '%date_to% with reasons %reasons_name%',
+            . "%date_to% with reasons %reasons_name%",
-            [
+            array(
-                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                "%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'),
-                '%reasons_name%' => implode(', ', array_map(
+                "%reasons_name%"  => implode(", ", array_map(
-                    function (ActivityReason $r) {
+                        function (ActivityReason $r) {
-                        return '"' . $this->translatableStringHelper->
+                            return '"'.$this->translatableStringHelper->
-                                    localize($r->getName()) . '"';
+                                    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([
+        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
+            '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('active', CheckboxType::class, array('required' => false))
-            ->add('category', TranslatableActivityReasonCategory::class);
+            ->add('category', TranslatableActivityReasonCategory::class)
+        ;
     }
 
+    /**
+     * @param OptionsResolver $resolver
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason',
+            '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\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+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
+     * the user running this form
-     */
-    protected $om;
-
-    protected $timeChoices;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * 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,
+            TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
+            AuthorizationHelper $authorizationHelper, ObjectManager $om,
-        ObjectManager $om,
+            TranslatableStringHelper $translatableStringHelper,
-        TranslatableStringHelper $translatableStringHelper,
+            array $timeChoices
-        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,98 +68,103 @@ 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,
+                'choices' => $timeChoices,
-            'placeholder' => 'Choose the duration',
+                'placeholder' => 'Choose the duration',
-        ];
+        );
 
         $builder
-            ->add('date', ChillDateType::class, [
+            ->add('date', ChillDateType::class, array(
-                'required' => true,
+               'required' => true
-            ])
+            ))
             ->add('durationTime', ChoiceType::class, $durationTimeOptions)
-            ->add('attendee', ChoiceType::class, [
+            ->add('attendee', ChoiceType::class, array(
-                'expanded' => true,
+               'expanded' => true,
-                'required' => false,
+               'required' => false,
-                'choices' => [
+               'choices' => array(
-                    'present' => true,
+                  '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);
+                ->addModelTransformer($durationTimeTransformer);
+
 
         $builder->get('durationTime')
-            ->addEventListener(
+                ->addEventListener(
-                FormEvents::PRE_SET_DATA,
+                        FormEvents::PRE_SET_DATA,
-                function (FormEvent $formEvent) use (
+                        function(FormEvent $formEvent) use (
-                    $timeChoices,
+                                $timeChoices,
-                    $builder,
+                                $builder,
-                    $durationTimeTransformer,
+                                $durationTimeTransformer,
-                    $durationTimeOptions
+                                $durationTimeOptions
-                ) {
+                                )
-                    // set the timezone to GMT, and fix the difference between current and GMT
+                        {
-                    // the datetimetransformer will then handle timezone as GMT
+                            // set the timezone to GMT, and fix the difference between current and GMT
-                    $timezoneUTC = new DateTimeZone('GMT');
+                            // the datetimetransformer will then handle timezone as GMT
-                    /* @var $data \DateTime */
+                            $timezoneUTC = new \DateTimeZone('GMT');
-                    $data = $formEvent->getData() === null ?
+                            /* @var $data \DateTime */
-                                    DateTime::createFromFormat('U', 300) :
+                            $data = $formEvent->getData() === NULL ?
+                                    \DateTime::createFromFormat('U', 300) :
                                     $formEvent->getData();
-                    $seconds = $data->getTimezone()->getOffset($data);
+                            $seconds = $data->getTimezone()->getOffset($data);
-                    $data->setTimeZone($timezoneUTC);
+                            $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.
+                            // test if the timestamp is in the choices.
-                    // If not, recreate the field with the new timestamp
+                            // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
+                            if (!in_array($data->getTimestamp(), $timeChoices)) {
-                        // the data are not in the possible values. add them
+                                // the data are not in the possible values. add them
-                        $timeChoices[$data->format('H:i')] = $data->getTimestamp();
+                                $timeChoices[$data->format('H:i')] = $data->getTimestamp();
-                        $form = $builder->create(
+                                $form = $builder->create(
-                            'durationTime',
+                                        'durationTime',
-                            ChoiceType::class,
+                                        ChoiceType::class,
-                            array_merge(
+                                        array_merge(
-                                $durationTimeOptions,
+                                                $durationTimeOptions,
-                                [
+                                                array(
-                                    'choices' => $timeChoices,
+                                                    'choices' => $timeChoices,
-                                    'auto_initialize' => false,
+                                                    'auto_initialize' => false
-                                ]
+                                                )
-                            )
+                                                ));
-                        );
+                                $form->addModelTransformer($durationTimeTransformer);
-                        $form->addModelTransformer($durationTimeTransformer);
+                                $formEvent->getForm()->getParent()->add($form->getForm());
-                        $formEvent->getForm()->getParent()->add($form->getForm());
+                            }
-                    }
+                        });
-                }
-            );
     }
 
     /**
@@ -174,14 +172,15 @@ class ActivityType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\Activity',
+            'data_class' => 'Chill\ActivityBundle\Entity\Activity'
-        ]);
+        ));
 
         $resolver
-            ->setRequired(['center', 'role'])
+              ->setRequired(array('center', 'role'))
-            ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
+              ->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, [
+            ->add('active', ChoiceType::class, array(
-                'choices' => [
+                'choices' => array(
                     'Yes' => true,
-                    'No' => false,
+                    'No'  => false
-                ],
+                ),
-                'expanded' => true,
+                'expanded' => true
-            ]);
+            ));
     }
 
     /**
@@ -35,9 +32,9 @@ class ActivityTypeType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityType',
+            '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
+ * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <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,30 +57,6 @@ class TranslatableActivityReason extends AbstractType
         $this->reasonRender = $reasonRender;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            [
-                'class' => 'ChillActivityBundle:ActivityReason',
-                'choice_label' => function (ActivityReason $choice) {
-                    return $this->reasonRender->renderString($choice, []);
-                },
-                'group_by' => function (ActivityReason $choice): ?string {
-                    if (null !== $category = $choice->getCategory()) {
-                        return $this->translatableStringHelper->localize($category->getName());
-                    }
-
-                    return null;
-                },
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('r')
-                        ->where('r.active = true');
-                },
-                'attr' => ['class' => ' select2 '],
-            ]
-        );
-    }
-
     public function getBlockPrefix()
     {
         return 'translatable_activity_reason';
@@ -73,4 +66,28 @@ class TranslatableActivityReason extends AbstractType
     {
         return EntityType::class;
     }
+    
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            array(
+                'class' => 'ChillActivityBundle:ActivityReason',
+                'choice_label' => function(ActivityReason $choice)  {
+                    return $this->reasonRender->renderString($choice, []);
+                },
+                'group_by' => function(ActivityReason $choice): ?string {
+                    if (null !== $category = $choice->getCategory()) {
+                        return $this->translatableStringHelper->localize($category->getName());
+                    }
+
+                    return null;
+                },
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('r')
+                        ->where('r.active = true');
+                },
+                'attr' => [ 'class' => ' select2 ']
+            )
+        );
+    }
 }

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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <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,
+            TranslatableStringHelper $helper,
-        EntityRepository $activityTypeRepository
+            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,41 +47,42 @@ class MenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationHelper = $authorizationHelper;
     }
 
+    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         /* @var $person \Chill\PersonBundle\Entity\Person */
-        $person = $parameters['person'];
+        $person  = $parameters['person'];
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user    = $this->tokenStorage->getToken()->getUser();
         $roleSee = new Role(ActivityVoter::SEE);
         $roleAdd = new Role(ActivityVoter::CREATE);
         
         if ($this->authorizationHelper->userHasAccess($user, $person, $roleSee)) {
             $menu->addChild($this->translator->trans('Activity list'), [
-                'route' => 'chill_activity_activity_list',
+                    'route' => 'chill_activity_activity_list',
-                'routeParameters' => [
+                    'routeParameters' => [
-                    'person_id' => $person->getId(),
+                        'person_id' => $person->getId()
-                ],
+                    ]
-            ])
+                ])
                 ->setExtras([
-                    'order' => 201,
+                    'order' => 201
                 ]);
         }
         
         if ($this->authorizationHelper->userHasAccess($user, $person, $roleAdd)) {
             $menu->addChild($this->translator->trans('Add a new activity'), [
-                'route' => 'chill_activity_activity_new',
+                    'route' => 'chill_activity_activity_new',
-                'routeParameters' => [
+                    'routeParameters' => [
-                    'person_id' => $person->getId(),
+                        'person_id' => $person->getId()
-                ],
+                    ]
-            ])
+                ])
                 ->setExtras([
-                    'order' => 200,
+                    'order' => 200
                 ]);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return ['person'];
+        return [ 'person' ];
     }
 }

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -1,40 +1,56 @@
 <?php
-
+/*
-/**
+ * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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()],
+                    '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()],
+                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ]
+                ])
-            )
+                ->setExtra('order', 200)
-                ->setExtra('order', 200);
+                ;
         }
     }
 

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

@@ -1,36 +1,13 @@
 <?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
 {
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir() . '/ActivityBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir() . '/ActivityBundle/logs';
-    }
-
     public function registerBundles()
     {
-        return [
+        return array(
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -43,12 +20,28 @@ class AppKernel extends Kernel
             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)
+            #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');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+    }
+
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/ActivityBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/ActivityBundle/logs';
     }
 }

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';
+$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,20 +9,18 @@ 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 (
+if (isset($_SERVER['HTTP_CLIENT_IP'])
-    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.');
-    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
 }
 
-$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
+$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
 Debug::enable();
 
-require_once __DIR__ . '/../app/AppKernel.php';
+require_once __DIR__.'/../app/AppKernel.php';
 
 $kernel = new AppKernel('dev', true);
 $kernel->loadClassCache();

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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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 Chill\MainBundle\Entity\Center;
 
-use function in_array;
+/**
-
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const LISTS = 'CHILL_ACTIVITY_LIST';
+    const STATS = 'CHILL_ACTIVITY_STATS';
-
+    const LISTS  = 'CHILL_ACTIVITY_LIST';
-    public const STATS = 'CHILL_ACTIVITY_STATS';
     
     /**
+     *
      * @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();
+        return array(self::STATS, self::LISTS);
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return ['Activity' => $this->getRoles()];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return $this->getAttributes();
     }
 
     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 (
+        return $this->getAttributes();
-            $subject instanceof Center
-            && in_array($attribute, $this->getAttributes())
-        ) {
-            return true;
-        }
-
-        return false;
     }
 
-    private function getAttributes()
+    public function getRolesWithoutScope()
     {
-        return [self::STATS, self::LISTS];
+        return $this->getAttributes();
+    }
+
+    public function getRolesWithHierarchy()
+    {
+        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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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 Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Chill\MainBundle\Entity\User;
+
 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';
+    const CREATE = 'CHILL_ACTIVITY_CREATE';
-
+    const SEE    = 'CHILL_ACTIVITY_SEE';
-    public const DELETE = 'CHILL_ACTIVITY_DELETE';
+    const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
-
+    const UPDATE = 'CHILL_ACTIVITY_UPDATE';
-    public const SEE = 'CHILL_ACTIVITY_SEE';
+    const DELETE = 'CHILL_ACTIVITY_DELETE';
-
-    public const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
-
-    public const UPDATE = 'CHILL_ACTIVITY_UPDATE';
 
     /**
+     *
      * @var AuthorizationHelper
      */
     protected $helper;
@@ -42,33 +53,18 @@ 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());
+            return \in_array($attribute, $this->getAttributes());
+        } elseif ($subject instanceof Person) {
+            return $attribute === self::SEE 
+                ||
+                $attribute === self::CREATE;
+        } else {
+            return false;
         }
-
-        if ($subject instanceof Person) {
-            return self::SEE === $attribute
-                || self::CREATE === $attribute;
-        }
-
-        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 */
@@ -89,7 +85,25 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
     
     private function getAttributes()
     {
-        return [self::CREATE, self::SEE, self::UPDATE, self::DELETE,
+        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
+ * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <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,27 +41,32 @@ class ActivityReasonRender extends AbstractChillEntityRender
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    
     public function renderBox($entity, array $options): string
     {
         return
-            $this->getDefaultOpeningBox('activity-reason') .
+            $this->getDefaultOpeningBox('activity-reason').
-            '<i class="fa fa-question-circle"></i>&nbsp;' .
+            '<i class="fa fa-question-circle"></i>&nbsp;'.
-            '<span class="activity-reason__category">' .
+            '<span class="activity-reason__category">'.
             $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
-            ) .
+            ).
-            '</span>' .
+            '</span>'.
-            '<span class="activity-reason__separator">&nbsp;>&nbsp;</span>' .
+            '<span class="activity-reason__separator">&nbsp;>&nbsp;</span>'.
-            '<span class="activity-reason__reason">' .
+            '<span class="activity-reason__reason">'.
             $this->translatableStringHelper->localize(
                 $entity->getName()
-            ) .
+            ).
-            '</span>' .
+            '</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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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(
+        $this->assertTrue($client->getResponse()->isRedirect('http://localhost/login'),
-            $client->getResponse()->isRedirect('http://localhost/login'),
+              sprintf('the page "%s" does not redirect to http://localhost/login', $url));
-            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(
+        $crawler = $client->request('GET', sprintf('en/person/%d/activity/',
-            'en/person/%d/activity/',
+              $person->getId()));
-            $person->getId()
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(),
-        ));
+              "Unexpected HTTP status code for GET /activity/");
-        $this->assertEquals(
-            200,
-            $client->getResponse()->getStatusCode(),
-            'Unexpected HTTP status code for GET /activity/'
-        );
         $crawler = $client->click($crawler->selectLink('Ajouter une nouvelle activité')
-            ->link());
+              ->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([
+        $form = $crawler->selectButton('Ajouter une nouvelle activité')->form(array(
-            'chill_activitybundle_activity' => [
+            'chill_activitybundle_activity'=> array(
-                'date' => '15-01-2015',
+               'date' => '15-01-2015',
-                'durationTime' => 600,
+               'durationTime' => 600,
-                //   'remark' => 'blabla',
+            //   'remark' => 'blabla',
-                'scope' => $this->getRandomScope('center a_social', 'Center A')->getId(),
+               'scope' => $this->getRandomScope('center a_social', 'Center A')->getId(),
-                'type' => $this->getRandomActivityType()->getId(),
+               'type'   => $this->getRandomActivityType()->getId()
-            ],
+            )
-        ]);
+        ));
-        $form['chill_activitybundle_activity[reasons]']->select([$reason1->getId(), $reason2->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(
+        $this->assertGreaterThan(0, $crawler->filter('dd:contains("January 15, 2015")')->count(),
-            0,
+              'Missing element dd:contains("January 15, 2015")');
-            $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([
+        $form = $crawler->selectButton("Sauver l'activité")->form(array(
-            'chill_activitybundle_activity' => [
+            'chill_activitybundle_activity'  => array(
-                'date' => '25-01-2015',
+               'date' => '25-01-2015',
-                //  'remark' => 'Foo'
+             //  'remark' => 'Foo'
-            ],
+            )
-        ]);
+        ));
 
         $client->submit($form);
 
@@ -163,33 +148,164 @@ class ActivityControllerTest extends WebTestCase
         $crawler = $client->followRedirect();
 
         // check that new data are present
-        $this->assertGreaterThan(
+        $this->assertGreaterThan(0,
-            0,
+              $crawler->filter('dd:contains("January 25, 2015")')->count(),
-            $crawler->filter('dd:contains("January 25, 2015")')->count(),
+              'Missing element dd:contains("January 25, 2015")');
-            'Missing element dd:contains("January 25, 2015")'
+        $this->assertGreaterThan(0,
-        );
+              $crawler->filter('dd:contains("Foo")')->count(),
-        $this->assertGreaterThan(
+              'Missing element dd:contains("Foo")');
-            0,
-            $crawler->filter('dd:contains("Foo")')->count(),
-            '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');
+       $button = $crawler->selectButton('Supprimer');
 
-        $form = $button->form();
+       $form = $button->form();
 
-        $client->submit($form);
+       $client->submit($form);
-        $this->assertTrue($client->getResponse()->isRedirect(sprintf(
+       $this->assertTrue($client->getResponse()->isRedirect(sprintf('/en/person/%d/activity/',
-            '/en/person/%d/activity/',
+              $person->getId())));
-            $person->getId()
-        )));
 
-        $crawler = $client->followRedirect();
+       $crawler = $client->followRedirect();
 
-        $this->assertNotContains('January 25, 2015', $crawler->text());
+       $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)];
     }
 
     /**
@@ -205,10 +321,10 @@ class ActivityControllerTest extends WebTestCase
 
         //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
         $socialPermissionGroup = $em
-            ->getRepository('ChillMainBundle:PermissionsGroup')
+                ->getRepository('ChillMainBundle:PermissionsGroup')
-            ->findOneByName('social');
+                ->findOneByName('social');
         $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup())
-            ->setName('social without activity');
+                ->setName('social without activity');
         //copy role scopes where ACTIVITY is not present
         foreach ($socialPermissionGroup->getRoleScopes() as $roleScope) {
             if (!strpos($roleScope->getRole(), 'ACTIVITY')) {
@@ -218,8 +334,8 @@ 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);
+                ->setPermissionsGroup($withoutActivityPermissionGroup);
         $em->persist($withoutActivityPermissionGroup);
         $em->persist($groupCenter);
 
@@ -228,10 +344,10 @@ class ActivityControllerTest extends WebTestCase
         $username = $faker->name;
         $user = new \Chill\MainBundle\Entity\User();
         $user
-            ->setPassword($container->get('security.password_encoder')
+                ->setPassword($container->get('security.password_encoder')
-            ->encodePassword($user, 'password'))
+                        ->encodePassword($user, 'password'))
-            ->setUsername($username)
+                ->setUsername($username)
-            ->addGroupCenter($groupCenter);
+                ->addGroupCenter($groupCenter);
 
         $em->persist($user);
 
@@ -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()
     {
@@ -67,5 +55,5 @@ class ActivityReasonCategoryControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-     */
+    */
 }

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()
     {
@@ -67,5 +55,5 @@ class ActivityReasonControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-     */
+    */
 }

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()
     {
@@ -67,5 +55,5 @@ class ActivityTypeControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-     */
+    */
 }

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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @coversNothing
  */
 class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
      */
     private $aggregator;
@@ -33,13 +43,13 @@ 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');
         
         $container->get('request_stack')
-            ->push($request->reveal());
+                ->push($request->reveal());
     }
     
     public function getAggregator()
@@ -49,22 +59,22 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
     
     public function getFormData()
     {
-        return [
+        return array(
-            ['level' => 'reasons'],
+            array('level' => 'reasons'),
-            ['level' => 'categories'],
+            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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @coversNothing
  */
 class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
     /**
+     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
      */
     private $aggregator;
@@ -33,13 +43,13 @@ 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');
         
         $container->get('request_stack')
-            ->push($request->reveal());
+                ->push($request->reveal());
     }
     
     public function getAggregator()
@@ -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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,13 +42,13 @@ 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');
         
         $container->get('request_stack')
-            ->push($request->reveal());
+                ->push($request->reveal());
     }
     
     public function getAggregator()
@@ -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 [
+        return array(
-            ['activity'],
+            array('activity'),
-            ['activity', 'person'],
+            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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,24 +44,21 @@ 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');
         
         $container->get('request_stack')
-            ->push($request->reveal());
+                ->push($request->reveal());
     }
     
-    public function getExport()
+    
-    {
-        return $this->export;
-    }
 
     public function getFormData()
     {
-        return [
+        return array(
-            ['fields' => [
+            array('fields' => array(
                 'id',  
                 'date', 
                 'durationTime', 
@@ -59,20 +68,26 @@ class ListActivityTest extends AbstractExportTest
                 'type_name', 
                 'person_firstname',
                 'person_lastname',
-                'person_id',
+                'person_id'
-            ]],
+            )),
-            ['fields' => [
+            array('fields' => array(
                 'id',  
-                'list_reasons',
+                'list_reasons'
-            ]],
+            )),
-        ];
+        );
     }
 
     public function getModifiersCombination()
     {
-        return [
+        return array(
-            ['activity'],
+            array('activity'),
-            ['activity', 'person'],
+            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
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @coversNothing
  */
 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 [
+        return array(
-            ['activity'],
+            array('activity'),
-            ['activity', 'person'],
+            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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,15 +44,16 @@ 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');
         
         $container->get('request_stack')
-            ->push($request->reveal());
+                ->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 '
+        $reasons = $em->createQuery("SELECT reason "
-                . 'FROM ChillActivityBundle:ActivityReason reason')
+                . "FROM ChillActivityBundle:ActivityReason reason")
-            ->getResult();
+                ->getResult();
         
         // generate an array of 5 different combination of results
-        for ($i = 0; 5 > $i; ++$i) {
+        for ($i=0; $i < 5; $i++) {
-            $r[] = ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))];
+            $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
-
+/*
-/**
+ * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,13 +42,13 @@ 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');
         
         $container->get('request_stack')
-            ->push($request->reveal());
+                ->push($request->reveal());
     }
     
     public function getFilter()
@@ -49,33 +58,49 @@ class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        $date_from = DateTime::createFromFormat('Y-m-d', '2015-01-15');
+        $date_from = \DateTime::createFromFormat('Y-m-d', '2015-01-15');
-        $date_to = new DateTime(); // today
+        $date_to   = new \DateTime(); // today
         $reasons = $this->getActivityReasons();
 
-        $data = [];
         
-        for ($i = 0; 4 > $i; ++$i) {
+        $data = array();
-            $data[] = [
+        for ($i = 0; $i < 4; $i++) {
+            $data[] = array(
                 'date_from' => $date_from,
-                'date_to' => $date_to,
+                '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,170 +1,183 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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')
+                ->get('form.factory')
-            ->createBuilder(FormType::class, null, [
+                ->createBuilder(FormType::class, null, array(
-                'csrf_protection' => false,
+                    'csrf_protection' => false,
-                'csrf_field_name' => '_token',
+                    'csrf_field_name' => '_token'
-            ]);
+                ));
 
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
 
         self::$kernel->getContainer()
-            ->get('request_stack')
+                ->get('request_stack')
-            ->push($request);
+                ->push($request);
 
         $this->user = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:User')
+                ->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')
+                ->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());
+                ->setToken($token->reveal());
+
     }
 
     public function testForm()
     {
         $form = $this->formBuilder
-            ->add('activity', ActivityType::class, [
+                ->add('activity', ActivityType::class, array(
-                'center' => $this->center,
+                    'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+                    'role' => new Role('CHILL_ACTIVITY_CREATE')
-            ])
+                ))
-            ->getForm();
+                ->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,
+                    'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+                    'role' => new Role('CHILL_ACTIVITY_CREATE')
-            ])
+                ))
-            ->getForm();
+                ->getForm();
 
-        $form->submit(['activity' => [
+        $form->submit(array( 'activity' => array(
             'date' => '9-3-2015',
             'durationTime' => 300,
-            //  'remark' => 'blabla',
+          //  '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->isSynchronized(), "Test the form is synchronized");
-        $this->assertTrue($form->isValid(), 'test the form is valid');
+        $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(
+        $this->assertEquals('09-03-2015', $activity->getDate()->format('d-m-Y'),
-            '09-03-2015',
+                "Test the date is correct");
-            $activity->getDate()->format('d-m-Y'),
+        $this->assertEquals('00:05', $activity->getDurationTime()->format('H:i'),
-            'Test the date is correct'
+                "Test the formatted hour 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());
+     //   $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')
+                ->get('form.factory')
-            ->createBuilder(FormType::class, ['activity' => $activity], [
+                ->createBuilder(FormType::class, array('activity' => $activity), array(
-                'csrf_protection' => false,
+                    '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,
+                    'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+                    'role' => new Role('CHILL_ACTIVITY_CREATE')
-            ])
+                ))
-            ->getForm();
+                ->getForm();
 
-        $form->submit(['activity' => [
+
+        $form->submit(array( 'activity' => array(
             'date' => '9-3-2015',
             'durationTime' => 60,
-            //  'remark' => 'blabla',
+          //  '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(
+        $this->assertEquals('00:01', $activity->getDurationTime()->format('H:i'),
-            '00:01',
+                "Test the formatted hour is correct");
-            $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(
+        $values = array_map(function($choice) { return $choice->value; },
-            function ($choice) { return $choice->value; },
+                $view['activity']['durationTime']->vars['choices']);
-            $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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @coversNothing
+ * @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();
-    }
         
-    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([
+        return array(new PreloadedExtension(array(
-            'entity' => $entityType,
+           'entity' => $entityType
-        ], [])];
+        ), array()));
+    }
+    
+    
+    public function testSimple()
+    {
+        $translatableActivityReasonType = new TranslatableActivityReason(
+              $this->getTranslatableStringHelper()
+              );
+        
+        $this->markTestSkipped("See issue 651");
     }
     
     /**
+     * 
      * @param string $locale
      * @param string $fallbackLocale
-     *
      * @return TranslatableStringHelper
      */
-    protected function getTranslatableStringHelper(
+    protected function getTranslatableStringHelper($locale = 'en', 
-        $locale = 'en',
+          $fallbackLocale = 'en')
-        $fallbackLocale = 'en'
+    {
-    ) {
+        $prophet = new \Prophecy\Prophet;
-        $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(
+        return new TranslatableStringHelper($requestStack->reveal(), 
-            $requestStack->reveal(),
+              $translator->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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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;
@@ -36,35 +50,46 @@ class TranslatableActivityTypeTest extends KernelTestCase
         $this->container = self::$kernel->getContainer();
         
         $this->builder = $this->container
-            ->get('form.factory')
+                ->get('form.factory')
-            ->createBuilder(FormType::class, null, [
+                ->createBuilder(FormType::class, null, array(
-                'csrf_protection' => false,
+                    'csrf_protection' => false,
-                'csrf_field_name' => '_token',
+                    'csrf_field_name' => '_token'
-            ]);
+                ));
         
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
         
         $this->container->get('request_stack')
-            ->push($request);
+                ->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();
+                ->getForm();
         
-        $form->submit([
+        $form->submit(array(
-            'type' => $type->getId(),
+            'type' => $type->getId()
-        ]);
+        ));
         
         $this->assertTrue($form->isSynchronized());
-        $this->assertInstanceOf(
+        $this->assertInstanceOf(\Chill\ActivityBundle\Entity\ActivityType::class, 
-            \Chill\ActivityBundle\Entity\ActivityType::class,
+                $form->getData()['type'], 
-            $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,108 +1,65 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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 PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait, 
-    use PrepareCenterTrait;
+            PreparePersonTrait, PrepareActivityTrait;
-    use PreparePersonTrait;
-    use PrepareScopeTrait;
-    use PrepareUserTrait;
-
-    /**
-     * @var \Prophecy\Prophet
-     */
-    protected $prophet;
     
     /**
+     *
      * @var \Chill\PersonBundle\Security\Authorization\PersonVoter
      */
     protected $voter;
     
+    /**
+     *
+     * @var \Prophecy\Prophet
+     */
+    protected $prophet;
+    
     public function setUp()
     {
         static::bootKernel();
         $this->voter = static::$kernel->getContainer()
-            ->get('chill.activity.security.authorization.activity_voter');
+              ->get('chill.activity.security.authorization.activity_voter');
         $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();
@@ -112,51 +69,103 @@ class ActivityVoterTest extends KernelTestCase
         $activity = $this->prepareActivity($scope, $person);
         
         $this->assertEquals(
-            VoterInterface::ACCESS_DENIED,
+                VoterInterface::ACCESS_DENIED,
-            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
+                $this->voter->vote($token, $activity, array('CHILL_ACTIVITY_SEE')), 
-            'assert that a null user is not allowed to 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(
+    public function testVoteAction($expectedResult, User $user, Scope $scope, 
-        $expectedResult,
+            Center $center, $attribute, $message)
-        User $user,
+    {
-        Scope $scope,
-        Center $center,
-        $attribute,
-        $message
-    ) {
         $token = $this->prepareToken($user);
         $activity = $this->prepareActivity($scope, $this->preparePerson($center));
         
         $this->assertEquals(
-            $expectedResult,
+                $expectedResult,
-            $this->voter->vote($token, $activity, [$attribute]),
+                $this->voter->vote($token, $activity, array($attribute)),
-            $message
+                $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 ($user === NULL) {
-        if (null === $user) {
             $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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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,63 +1,89 @@
 <?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
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * 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 Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping\ClassMetadata;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use LogicException;
-use RuntimeException;
 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;
 
 /**
- * Provide activity for inclusion in timeline.
+ * Provide activity for inclusion in timeline
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
  */
 class TimelineActivityProvider implements TimelineProviderInterface
 {
+    
     /**
+     *
      * @var EntityManager
      */
     protected $em;
     
     /**
+     *
      * @var AuthorizationHelper
      */
     protected $helper;
     
     /**
+     *
      * @var \Chill\MainBundle\Entity\User 
      */
     protected $user;
     
     /**
      * TimelineActivityProvider constructor.
+     *
+     * @param EntityManager $em
+     * @param AuthorizationHelper $helper
+     * @param TokenStorageInterface $storage
      */
     public function __construct(
         EntityManager $em,
         AuthorizationHelper $helper,
         TokenStorageInterface $storage
-    ) {
+    )
+    {
         $this->em = $em;
         $this->helper = $helper;
         
-        if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User) {
+        if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User)
-            throw new RuntimeException('A user should be authenticated !');
+        {
+            throw new \RuntimeException('A user should be authenticated !');
         }
         
         $this->user = $storage->getToken()->getUser();
     }
     
+    /**
+     * 
+     * {@inheritDoc}
+     */
     public function fetchQuery($context, array $args)
     {
         $this->checkContext($context);
@@ -65,93 +91,24 @@ class TimelineActivityProvider implements TimelineProviderInterface
         $metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity');
         $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
         
-        return [
+        return array(
-            'id' => $metadataActivity->getTableName()
+           'id' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('id'),
+                .'.'.$metadataActivity->getColumnName('id'),
-            'type' => 'activity',
+           'type' => 'activity',
-            'date' => $metadataActivity->getTableName()
+           'date' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('date'),
+                .'.'.$metadataActivity->getColumnName('date'),
-            'FROM' => $this->getFromClause($metadataActivity, $metadataPerson),
+           'FROM' => $this->getFromClause($metadataActivity, $metadataPerson),
-            'WHERE' => $this->getWhereClause(
+           'WHERE' => $this->getWhereClause($metadataActivity, $metadataPerson,
-                $metadataActivity,
+                   $args['person'])
-                $metadataPerson,
-                $args['person']
-            ),
-        ];
-    }
-
-    public function getEntities(array $ids)
-    {
-        $activities = $this->em->getRepository('ChillActivityBundle:Activity')
-            ->findBy(['id' => $ids]);
-
-        $result = [];
-
-        foreach ($activities as $activity) {
-            $result[$activity->getId()] = $activity;
-        }
-
-        return $result;
-    }
-
-    public function getEntityTemplate($entity, $context, array $args)
-    {
-        $this->checkContext($context);
-
-        return [
-            'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
-            'template_data' => [
-                'activity' => $entity,
-                'person' => $args['person'],
-                'user' => $entity->getUser(),
-            ],
-        ];
-    }
-
-    public function supportsType($type)
-    {
-        return 'activity' === $type;
-    }
-
-    /**
-     * check if the context is supported.
-     *
-     * @param string $context
-     *
-     * @throws LogicException if the context is not supported
-     */
-    private function checkContext($context)
-    {
-        if ('person' !== $context) {
-            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
         );
+    }
+    
+    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) {
@@ -160,39 +117,103 @@ class TimelineActivityProvider implements TimelineProviderInterface
         
         // we start with activities having the person_id linked to person 
         // (currently only context "person" is supported)
-        $whereClause = sprintf(
+        $whereClause = sprintf('%s = %d',
-            '%s = %d',
+                 $associationMapping['joinColumns'][0]['name'],
-            $associationMapping['joinColumns'][0]['name'],
+                 $person->getId());
-            $person->getId()
-        );
         
         // we add acl (reachable center and scopes)
-        $centerAndScopeLines = [];
+        $centerAndScopeLines = array();
-
         foreach ($reachableCenters as $center) {
             $reachablesScopesId = array_map(
-                function (Scope $scope) {
+                    function(Scope $scope) { return $scope->getId(); },
-                    return $scope->getId();
+                    $this->helper->getReachableScopes($this->user, $role, 
-                },
+                        $person->getCenter())
-                $this->helper->getReachableScopes(
+                );
-                    $this->user,
-                    $role,
-                    $person->getCenter()
-                )
-            );
                     
-            $centerAndScopeLines[] = sprintf(
+            $centerAndScopeLines[] = sprintf('(%s = %d AND %s IN (%s))',
-                '(%s = %d AND %s IN (%s))',
+                    $metadataPerson->getTableName().'.'.
-                $metadataPerson->getTableName() . '.' .
                         $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'],
-                $center->getId(),
+                    $center->getId(),
-                $metadataActivity->getTableName() . '.' .
+                    $metadataActivity->getTableName().'.'.
                         $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'],
-                implode(',', $reachablesScopesId)
+                    implode(',', $reachablesScopesId));
-            );
+            
         }
-        $whereClause .= ' AND (' . implode(' OR ', $centerAndScopeLines) . ')';
+        $whereClause .= ' AND ('.implode(' OR ', $centerAndScopeLines).')';
         
         return $whereClause;
     }
+    
+    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']
+            ;
+    }
+
+    /**
+     * 
+     * {@inheritDoc}
+     */
+    public function getEntities(array $ids)
+    {
+        $activities = $this->em->getRepository('ChillActivityBundle:Activity')
+              ->findBy(array('id' => $ids));
+        
+        $result = array();
+        foreach($activities as $activity) {
+            $result[$activity->getId()] = $activity;
+        }
+        
+        return $result;
+    }
+
+    /**
+     * 
+     * {@inheritDoc}
+     */
+    public function getEntityTemplate($entity, $context, array $args)
+    {
+        $this->checkContext($context);
+        
+        return array(
+           'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
+           'template_data' => array(
+              'activity' => $entity,
+              'person' => $args['person'],
+              'user' => $entity->getUser()
+           )
+        );
+    }
+
+    /**
+     * 
+     * {@inheritDoc}
+     */
+    public function supportsType($type)
+    {
+        return $type === 'activity';
+    }
+    
+    /**
+     * check if the context is supported
+     * 
+     * @param string $context
+     * @throws \LogicException if the context is not supported
+     */
+    private function checkContext($context)
+    {
+        if ($context !== 'person') {
+            throw new \LogicException("The context '$context' is not "
+                  . "supported. Currently only 'person' is supported");
+        }
+    }
+
 }

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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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
+    /**
-    {
+     * @param Schema $schema
-        // 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');
-    }
-
     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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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
+    /**
-    {
+     * @param Schema $schema
-        // 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;');
-    }
-
     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
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <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
+    /**
-    {
+     * @param Schema $schema
-        // 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;');
-    }
-
     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,47 +13,21 @@ use Doctrine\Migrations\AbstractMigration;
  */
 class Version20160222103457 extends AbstractMigration
 {
-    public function down(Schema $schema): void
+    /**
-    {
+     * @param Schema $schema
-        $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');
-    }
-
     public function up(Schema $schema): void
     {
-        $this->abortIf(
+        
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
-            'Migration can only be executed safely on \'postgresql\'.'
+                'Migration can only be executed safely on \'postgresql\'.');
-        );
 
         // create the new table activity reason
-        $this->addSql(
+        $this->addSql('CREATE TABLE activity_activityreason ('
-            'CREATE TABLE activity_activityreason ('
                 . 'activity_id INT NOT NULL, '
                 . 'activityreason_id INT NOT NULL, '
                 . 'PRIMARY KEY(activity_id, activityreason_id))'
-        );
+                );
         $this->addSql('CREATE INDEX IDX_338A864381C06096 ON activity_activityreason (activity_id)');
         $this->addSql('CREATE INDEX IDX_338A8643D771E0FC ON activity_activityreason (activityreason_id)');
         $this->addSql('ALTER TABLE activity_activityreason '
@@ -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
+    /**
-    {
+     * @param Schema $schema
-        $this->addSql('ALTER TABLE ActivityType DROP active');
+     */
-    }
-
     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,7 +12,20 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210304154629 extends AbstractMigration
 {
-    public function down(Schema $schema): void
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activity ADD comment_comment TEXT DEFAULT NULL');
+        $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
 
@@ -27,17 +33,4 @@ final class Version20210304154629 extends AbstractMigration
         $this->addSql('ALTER TABLE activity DROP comment_userId');
         $this->addSql('ALTER TABLE activity DROP comment_date');
     }
-
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activity ADD comment_comment TEXT DEFAULT NULL');
-        $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');
-    }
 }

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,20 +12,21 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210311114250 extends AbstractMigration
 {
-    public function down(Schema $schema): void
+    public function getDescription() : string
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-    }
-
-    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema): void
+    public function up(Schema $schema) : void
     {
         // this up() migration is auto-generated, please modify it to your needs
         $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,22 +1,22 @@
 <?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;
+    public function calculate(array $elements) : ?CalculatorResult;
     
     public function getAlias();
 }

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;
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
-use function implode;
+ */
-
 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 $type;
-
-    public const TYPE_RATE = 'rate';
-
-    public $label;
     
     public $result;
     
-    public $type;
+    public $label;
 }

src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.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\AMLI\BudgetBundle;
 
-use Chill\AMLI\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Chill\AMLI\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
 
 class ChillAMLIBudgetBundle extends Bundle
 {

src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php

@@ -1,26 +1,27 @@
 <?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\Config;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class ConfigRepository
 {
     /**
-     * @var array
+     *
-     */
-    protected $charges;
-
-    /**
      * @var array
      */
     protected $resources;
     
+    /**
+     *
+     * @var array
+     */
+    protected $charges;
+    
     public function __construct($resources, $charges)
     {
         $this->resources = $resources;
@@ -28,25 +29,12 @@ class ConfigRepository
     }
     
     /**
-     * @return array where keys are the resource'key and label the ressource label
+     * 
-     */
-    public function getChargesLabels()
-    {
-        $charges = [];
-
-        foreach ($this->charges as $definition) {
-            $charges[$definition['key']] = $this->normalizeLabel($definition['labels']);
-        }
-
-        return $charges;
-    }
-
-    /**
      * @return array where keys are the resource'key and label the ressource label
      */
     public function getResourcesLabels()
     {
-        $resources = [];
+        $resources = array();
         
         foreach ($this->resources as $definition) {
             $resources[$definition['key']] = $this->normalizeLabel($definition['labels']);
@@ -55,9 +43,24 @@ class ConfigRepository
         return $resources;
     }
     
+    /**
+     * 
+     * @return array where keys are the resource'key and label the ressource label
+     */
+    public function getChargesLabels()
+    {
+        $charges = array();
+        
+        foreach ($this->charges as $definition) {
+            $charges[$definition['key']] = $this->normalizeLabel($definition['labels']);
+        }
+        
+        return $charges;
+    }
+    
     private function normalizeLabel($labels) 
     {
-        $normalizedLabels = [];
+        $normalizedLabels = array();
         
         foreach ($labels as $labelDefinition) {
             $normalizedLabels[$labelDefinition['lang']] = $labelDefinition['label'];
@@ -65,4 +68,5 @@ class ConfigRepository
         
         return $normalizedLabels;
     }
+
 }

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -1,42 +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\AMLI\BudgetBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\HttpFoundation\Request;
+use Doctrine\ORM\EntityManagerInterface;
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Translation\TranslatorInterface;
+use Psr\Log\LoggerInterface;
 
 abstract class AbstractElementController extends Controller
 {
     /**
-     * @var LoggerInterface
+     *
-     */
-    protected $chillMainLogger;
-
-    /**
      * @var EntityManagerInterface
      */
     protected $em;
     
     /**
+     *
      * @var TranslatorInterface
      */
     protected $translator;
     
+    /**
+     *
+     * @var LoggerInterface
+     */
+    protected $chillMainLogger;
+    
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -48,58 +44,56 @@ abstract class AbstractElementController extends Controller
     }
 
     /**
-     * Route(
+     * @return AbstractElement the newly created element
-     *  "{_locale}/family-members/family-members/{id}/delete",
-     *  name="chill_family_members_family_members_delete"
-     * ).
-     *
-     * @param mixed $template
-     * @param mixed $flashMessage
-     *
-     * @return \Symfony\Component\BrowserKit\Response
      */
-    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
+    abstract protected function createNewElement();
+    
+    abstract protected function getType();
+
+    /**
+     * 
+     */
+    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
     {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
+        /* @var $element \Chill\AMLI\BudgetBundle\Entity\AbstractElement */
-             . 'allowed to delete this family membership');
+        $element = $this->createNewElement()
+            ->setPerson($person)
+            ;
         
-        $form = $this->createDeleteForm();
+        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
         
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        $form = $this->createForm($this->getType(), $element);
-            $form->handleRequest($request);
+        $form->add('submit', SubmitType::class);
         
-            if ($form->isValid()) {
+        $form->handleRequest($request);
-                $this->chillMainLogger->notice('A budget element has been removed', [
-                    'family_element' => get_class($element),
-                    'by_user' => $this->getUser()->getUsername(),
-                    'family_member_id' => $element->getId(),
-                    'amount' => $element->getAmount(),
-                    'type' => $element->getType(),
-                ]);
         
-                $em = $this->getDoctrine()->getManager();
+        if ($form->isSubmitted() and $form->isValid()) {
-                $em->remove($element);
+            $em = $this->getDoctrine()->getManager();
-                $em->flush();
+            $em->persist($element);
+            $em->flush();
             
-                $this->addFlash('success', $this->translator
+            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
-                    ->trans($flashMessage));
             
-                return $this->redirectToRoute('chill_budget_elements_index', [
+            return $this->redirectToRoute('chill_budget_elements_index', [
-                    'id' => $element->getPerson()->getId(),
+                'id' => $person->getId()
-                ]);
+            ]);
-            }
+        } elseif ($form->isSubmitted()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
         
-        return $this->render($template, [
+        return $this->render($template, array(
-            'element' => $element,
+            'form' => $form->createView(),
-            'delete_form' => $form->createView(),
+            'person' => $person,
-        ]);
+            'element' => $element
+        ));
     }
 
     /**
+     * 
+     * @param AbstractElement $element
+     * @param Request $request
      * @param string $template
      * @param string $flashOnSuccess
-     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
@@ -118,91 +112,96 @@ abstract class AbstractElementController extends Controller
             $this->addFlash('success', $this->translator->trans($flashOnSuccess));
             
             return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $element->getPerson()->getId(),
+                'id' => $element->getPerson()->getId()
             ]);
         }
         
-        return $this->render($template, [
+        return $this->render($template, array(
             'element' => $element,
             'form' => $form->createView(),
-            'person' => $element->getPerson(),
+            'person' => $element->getPerson()
-        ]);
+        ));
     }
     
     /**
-     * @param mixed $template
+     * 
-     * @param mixed $flashMessageOnSuccess
+     * Route(
+     *  "{_locale}/family-members/family-members/{id}/delete",
+     *  name="chill_family_members_family_members_delete"
+     * )
+     * 
+     * @param AbstractElement $element
+     * @param Request $request
+     * @return \Symfony\Component\BrowserKit\Response
      */
-    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
+    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
     {
-        /* @var $element \Chill\AMLI\BudgetBundle\Entity\AbstractElement */
+        $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
-        $element = $this->createNewElement()
+             . 'allowed to delete this family membership');
-            ->setPerson($person);
 
-        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
+        $form = $this->createDeleteForm();
 
-        $form = $this->createForm($this->getType(), $element);
+        if ($request->getMethod() === Request::METHOD_DELETE) {
-        $form->add('submit', SubmitType::class);
+            $form->handleRequest($request);
 
-        $form->handleRequest($request);
+            if ($form->isValid()) {
+                $this->chillMainLogger->notice("A budget element has been removed", array(
+                   'family_element' => get_class($element),
+                   'by_user' => $this->getUser()->getUsername(),
+                   'family_member_id' => $element->getId(),
+                   'amount' => $element->getAmount(),
+                   'type' => $element->getType()
+                ));
 
-        if ($form->isSubmitted() and $form->isValid()) {
+                $em = $this->getDoctrine()->getManager();
-            $em = $this->getDoctrine()->getManager();
+                $em->remove($element);
-            $em->persist($element);
+                $em->flush();
-            $em->flush();
 
-            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
+                $this->addFlash('success', $this->translator
+                        ->trans($flashMessage));
 
-            return $this->redirectToRoute('chill_budget_elements_index', [
+                return $this->redirectToRoute('chill_budget_elements_index', array(
-                'id' => $person->getId(),
+                     'id' => $element->getPerson()->getId()
-            ]);
+                  ));
+            }
         }
 
-        if ($form->isSubmitted()) {
-            $this->addFlash('error', $this->translator->trans('This form contains errors'));
-        }
 
-        return $this->render($template, [
+        return $this->render($template, array(
-            'form' => $form->createView(),
+           'element' => $element,
-            'person' => $person,
+           'delete_form' => $form->createView()
-            'element' => $element,
+        ));
-        ]);
     }
     
     /**
      * Route(
      *  "{_locale}/family-members/family-members/{id}/view",
      *  name="chill_family_members_family_members_view"
-     * ).
+     * )
-     *
-     * @param mixed $template
      */
     protected function _view(AbstractElement $element, $template)
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
         
-        return $this->render($template, [
+        return $this->render($template, array(
-            'element' => $element,
+            'element' => $element
-        ]);
+        ));
     }
     
-    /**
-     * @return AbstractElement the newly created element
-     */
-    abstract protected function createNewElement();
-
-    abstract protected function getType();
-
     /**
      * Creates a form to delete a help request entity by id.
      *
+     * @param mixed $id The entity id
+     *
      * @return \Symfony\Component\Form\Form The form
      */
     private function createDeleteForm()
     {
         return $this->createFormBuilder()
             ->setMethod(Request::METHOD_DELETE)
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm();
+            ->getForm()
+        ;
     }
+
 }

src/Bundle/ChillBudgetBundle/Controller/ChargeController.php

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

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -1,50 +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.
- */
-
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\HttpFoundation\Request;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Translation\TranslatorInterface;
+use Psr\Log\LoggerInterface;
 use Chill\AMLI\BudgetBundle\Entity\Charge;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Chill\PersonBundle\Entity\Person;
+use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
-use DateTime;
-use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Translation\TranslatorInterface;
-
-use function array_merge;
 
 class ElementController extends Controller
 {
     /**
-     * @var CalculatorManager
+     *
-     */
-    protected $calculator;
-
-    /**
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
-
-    /**
      * @var EntityManagerInterface
      */
     protected $em;
     
     /**
+     *
      * @var TranslatorInterface
      */
     protected $translator;
     
+    /**
+     *
+     * @var LoggerInterface
+     */
+    protected $chillMainLogger;
+    
+    /**
+     *
+     * @var CalculatorManager
+     */
+    protected $calculator;
+    
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -59,8 +55,8 @@ class ElementController extends Controller
     
     /**
      * @Route(
-     *     "{_locale}/budget/elements/by-person/{id}",
+     *  "{_locale}/budget/elements/by-person/{id}",
-     *     name="chill_budget_elements_index"
+     *  name="chill_budget_elements_index"
      * )
      */
     public function indexAction(Person $person)
@@ -74,7 +70,7 @@ class ElementController extends Controller
             ->getRepository(Resource::class)
             ->findByPerson($person);
         
-        $now = new DateTime('now');
+        $now = new \DateTime('now');
         
         $actualCharges = $this->em
             ->getRepository(Charge::class)
@@ -83,17 +79,18 @@ class ElementController extends Controller
             ->getRepository(Resource::class)
             ->findByPersonAndDate($person, $now);
         
-        $elements = array_merge($actualCharges, $actualResources);
+        $elements = \array_merge($actualCharges, $actualResources);
         
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
         
-        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', [
+        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', array(
             'person' => $person,
             'charges' => $charges,
             'resources' => $ressources,
-            'results' => $results ?? [],
+            'results' => $results ?? []
-        ]);
+        ));
     }
+
 }

src/Bundle/ChillBudgetBundle/Controller/ResourceController.php

@@ -1,64 +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.
  */
-
 namespace Chill\AMLI\BudgetBundle\Controller;
 
+use Symfony\Component\HttpFoundation\Request;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Chill\AMLI\BudgetBundle\Controller\AbstractElementController;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
 use Chill\AMLI\BudgetBundle\Form\ResourceType;
 use Chill\PersonBundle\Entity\Person;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class ResourceController extends AbstractElementController
 {
+
+    protected function getType()
+    {
+        return ResourceType::class;
+    }
+    
+    protected function createNewElement()
+    {
+        return new Resource();
+    }
+    
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/delete",
-     *     name="chill_budget_resource_delete"
-     * )
      * 
+     * @Route(
+     *  "{_locale}/budget/resource/{id}/view",
+     *  name="chill_budget_resource_view"
+     * )
+     * @param Request $request
+     * @param Resource $resource
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function deleteAction(Request $request, Resource $resource)
+    public function viewAction(Resource $resource)
     {
-        return $this->_delete(
+        return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig');
-            $resource,
-            $request,
-            '@ChillAMLIBudget/Resource/confirm_delete.html.twig',
-            'Resource deleted'
-        );
     }
     
     /**
      * @Route(
-     *     "{_locale}/budget/resource/{id}/edit",
+     *  "{_locale}/budget/resource/by-person/{id}/new",
-     *     name="chill_budget_resource_edit"
+     *  name="chill_budget_resource_new"
-     * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function editAction(Request $request, Resource $resource)
-    {
-        return $this->_edit(
-            $resource,
-            $request,
-            '@ChillAMLIBudget/Resource/edit.html.twig',
-            'Resource updated'
-        );
-    }
-
-    /**
-     * @Route(
-     *     "{_locale}/budget/resource/by-person/{id}/new",
-     *     name="chill_budget_resource_new"
      * )
      * 
+     * @param Request $request
+     * @param Person $person
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function newAction(Request $request, Person $person)
@@ -67,30 +60,44 @@ class ResourceController extends AbstractElementController
             $person, 
             $request, 
             '@ChillAMLIBudget/Resource/new.html.twig', 
-            'Resource created'
+            'Resource created');
-        );
     }
     
     /**
      * @Route(
-     *     "{_locale}/budget/resource/{id}/view",
+     *  "{_locale}/budget/resource/{id}/edit",
-     *     name="chill_budget_resource_view"
+     *  name="chill_budget_resource_edit"
      * )
      * 
+     * @param Request $request
+     * @param Resource $resource
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function viewAction(Resource $resource)
+    public function editAction(Request $request, Resource $resource)
     {
-        return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig');
+        return $this->_edit(
+            $resource, 
+            $request, 
+            '@ChillAMLIBudget/Resource/edit.html.twig', 
+            'Resource updated');
     }
     
-    protected function createNewElement()
+    /**
+     * 
+     * @Route(
+     *  "{_locale}/budget/resource/{id}/delete",
+     *  name="chill_budget_resource_delete"
+     * )
+     * 
+     * @param Request $request
+     * @param Resource $resource
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function deleteAction(Request $request, Resource $resource)
     {
-        return new Resource();
+        return $this->_delete($resource, 
-    }
+            $request, 
-
+            '@ChillAMLIBudget/Resource/confirm_delete.html.twig', 
-    protected function getType()
+            'Resource deleted');
-    {
-        return ResourceType::class;
     }
 }

src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php

@@ -1,34 +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\AMLI\BudgetBundle\DependencyInjection;
 
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services/config.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/security.yaml');
@@ -47,34 +43,35 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
         $this->prependRoutes($container);
     }
     
+    protected function storeConfig($position, array $config, ContainerBuilder $container) 
+    {
+        $container
+            ->setParameter(sprintf('chill_budget.%s', $position), $config[$position])
+            ;
+    }
+
+    protected function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', array(
+           'role_hierarchy' => array(
+               BudgetElementVoter::UPDATE => [ BudgetElementVoter::SHOW ],
+               BudgetElementVoter::CREATE => [ BudgetElementVoter::SHOW ]
+           )
+        ));
+    }
+    
     /* (non-PHPdoc)
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container) 
     {
         //add routes for custom bundle
-        $container->prependExtensionConfig('chill_main', [
+         $container->prependExtensionConfig('chill_main', array(
-            'routing' => [
+           'routing' => array(
-                'resources' => [
+              'resources' => array(
-                    '@ChillAMLIBudgetBundle/config/routing.yaml',
+                 '@ChillAMLIBudgetBundle/config/routing.yaml'
-                ],
+              )
-            ],
+           )
-        ]);
+        ));
-    }
-
-    protected function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', [
-            'role_hierarchy' => [
-                BudgetElementVoter::UPDATE => [BudgetElementVoter::SHOW],
-                BudgetElementVoter::CREATE => [BudgetElementVoter::SHOW],
-            ],
-        ]);
-    }
-
-    protected function storeConfig($position, array $config, ContainerBuilder $container)
-    {
-        $container
-            ->setParameter(sprintf('chill_budget.%s', $position), $config[$position]);
     }
 }

src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php

@@ -1,18 +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\AMLI\BudgetBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class CalculatorCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
@@ -20,10 +20,10 @@ class CalculatorCompilerPass implements CompilerPassInterface
         $manager = $container->getDefinition('Chill\AMLI\BudgetBundle\Calculator\CalculatorManager');
         
         foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
-            foreach ($tags as $tag) {
+            foreach($tags as $tag) {
                 $reference = new Reference($id);
 
-                $manager->addMethodCall('addCalculator', [$reference, $tag['default'] ?? false]);
+                $manager->addMethodCall('addCalculator', [ $reference, $tag['default'] ?? false ]);
             }
         }
     }

src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.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\AMLI\BudgetBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -19,6 +12,9 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_amli_budget');
@@ -28,52 +24,54 @@ class Configuration implements ConfigurationInterface
             ->children()
             
                 // ressources
-            ->arrayNode('resources')->isRequired()->requiresAtLeastOneElement()
+                ->arrayNode('resources')->isRequired()->requiresAtLeastOneElement()
-            ->arrayPrototype()
+                    ->arrayPrototype()
-            ->children()
+                        ->children()
-            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+                            ->scalarNode('key')->isRequired()->cannotBeEmpty()
-            ->info('the key stored in database')
+                                ->info('the key stored in database')
-            ->example('salary')
+                                ->example('salary')
-            ->end()
+                            ->end()
-            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-            ->arrayPrototype()
+                                ->arrayPrototype()
-            ->children()
+                                    ->children()
-            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-            ->example('fr')
+                                            ->example('fr')
-            ->end()
+                                        ->end()
-            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+                                        ->scalarNode('label')->isRequired()->cannotBeEmpty()
-            ->example('Salaire')
+                                            ->example('Salaire')
-            ->end()
+                                        ->end()
-            ->end()
+                                    ->end()
-            ->end()
+                                ->end()
-            ->end()
+                            ->end()
-            ->end()
+                        ->end()
-            ->end()
+                    ->end()
-            ->end()
+                ->end()
-            ->arrayNode('charges')->isRequired()->requiresAtLeastOneElement()
-            ->arrayPrototype()
-            ->children()
-            ->scalarNode('key')->isRequired()->cannotBeEmpty()
-            ->info('the key stored in database')
-            ->example('salary')
-            ->end()
-            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-            ->arrayPrototype()
-            ->children()
-            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-            ->example('fr')
-            ->end()
-            ->scalarNode('label')->isRequired()->cannotBeEmpty()
-            ->example('Salaire')
-            ->end()
-            ->end()
-            ->end()
-            ->end()
-            ->end()
-            ->end()
-            ->end()
             
-            ->end();
+                ->arrayNode('charges')->isRequired()->requiresAtLeastOneElement()
+                    ->arrayPrototype()
+                        ->children()
+                            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+                                ->info('the key stored in database')
+                                ->example('salary')
+                            ->end()
+                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+                                ->arrayPrototype()
+                                    ->children()
+                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+                                            ->example('fr')
+                                        ->end()
+                                        ->scalarNode('label')->isRequired()->cannotBeEmpty()
+                                            ->example('Salaire')
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            
+            ->end()
+            ;
 
         return $treeBuilder;
     }

src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php

@@ -1,38 +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.
- */
-
 namespace Chill\AMLI\BudgetBundle\Entity;
 
-use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
+use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * AbstractElement.
+ * AbstractElement
  *
- * @ORM\MappedSuperclass
+ * @ORM\MappedSuperclass()
  */
 abstract class AbstractElement
 {
+    
+    /**
+     *
+     * @var Person
+     * @ORM\ManyToOne(
+     *  targetEntity="\Chill\PersonBundle\Entity\Person"
+     * )
+     */
+    private $person;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="type", type="string", length=255)
+     */
+    private $type;
+
     /**
      * @var decimal
      *
      * @ORM\Column(name="amount", type="decimal", precision=10, scale=2)
      * @Assert\GreaterThan(
-     *     value=0
+     *  value=0
      * )
      * @Assert\NotNull(
-     *     message="The amount cannot be empty"
+     *  message="The amount cannot be empty"
      * )
+     * 
      */
     private $amount;
 
@@ -44,149 +52,33 @@ abstract class AbstractElement
     private $comment;
 
     /**
-     * @var DateTimeImmutable|null
+     * @var \DateTimeImmutable
-     *
-     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
-     * @Assert\GreaterThan(
-     *     propertyPath="startDate",
-     *     message="The budget element's end date must be after the start date"
-     * )
-     */
-    private $endDate;
-
-    /**
-     * @var Person
-     * @ORM\ManyToOne(
-     *     targetEntity="\Chill\PersonBundle\Entity\Person"
-     * )
-     */
-    private $person;
-
-    /**
-     * @var DateTimeImmutable
      *
      * @ORM\Column(name="startDate", type="datetime_immutable")
-     * @Assert\Date
+     * @Assert\Date()
      */
     private $startDate;
 
     /**
-     * @var string
+     * @var \DateTimeImmutable|null
      *
-     * @ORM\Column(name="type", type="string", length=255)
+     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
+     * @Assert\GreaterThan(
+     *   propertyPath="startDate",
+     *   message="The budget element's end date must be after the start date"
+     * )
      */
-    private $type;
+    private $endDate;
     
-    /**
+    abstract public function isCharge(): bool;
-     * Get amount.
-     *
-     * @return float
-     */
-    public function getAmount()
-    {
-        return (float) $this->amount;
-    }
     
-    /**
+    abstract public function isResource(): bool;
-     * Get comment.
-     *
-     * @return string|null
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Get endDate.
-     *
-     * @return DateTimeImmutable|null
-     */
-    public function getEndDate()
-    {
-        return $this->endDate;
-    }
     
     public function getPerson(): Person
     {
         return $this->person;
     }
 
-    /**
-     * Get startDate.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getStartDate()
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * Get type.
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    abstract public function isCharge(): bool;
-
-    public function isEmpty()
-    {
-        return 0 == $this->amount;
-    }
-
-    abstract public function isResource(): bool;
-
-    /**
-     * Set amount.
-     *
-     * @param string $amount
-     *
-     * @return AbstractElement
-     */
-    public function setAmount($amount)
-    {
-        $this->amount = $amount;
-
-        return $this;
-    }
-
-    /**
-     * Set comment.
-     *
-     * @param string|null $comment
-     *
-     * @return AbstractElement
-     */
-    public function setComment($comment = null)
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    /**
-     * Set endDate.
-     *
-     * @return AbstractElement
-     */
-    public function setEndDate(?DateTimeInterface $endDate = null)
-    {
-        if ($endDate instanceof DateTime) {
-            $this->endDate = DateTimeImmutable::createFromMutable($endDate);
-        } elseif (null === $endDate) {
-            $this->endDate = null;
-        } else {
-            $this->endDate = $endDate;
-        }
-
-        return $this;
-    }
-
     public function setPerson(Person $person)
     {
         $this->person = $person;
@@ -194,24 +86,6 @@ abstract class AbstractElement
         return $this;
     }
     
-    /**
-     * Set startDate.
-     *
-     * @return AbstractElement
-     */
-    public function setStartDate(DateTimeInterface $startDate)
-    {
-        if ($startDate instanceof DateTime) {
-            $this->startDate = DateTimeImmutable::createFromMutable($startDate);
-        } elseif (null === $startDate) {
-            $this->startDate = null;
-        } else {
-            $this->startDate = $startDate;
-        }
-
-        return $this;
-    }
-
     /**
      * Set type.
      *
@@ -225,4 +99,127 @@ abstract class AbstractElement
 
         return $this;
     }
+
+    /**
+     * Get type.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set amount.
+     *
+     * @param string $amount
+     *
+     * @return AbstractElement
+     */
+    public function setAmount($amount)
+    {
+        $this->amount = $amount;
+
+        return $this;
+    }
+
+    /**
+     * Get amount.
+     *
+     * @return double
+     */
+    public function getAmount()
+    {
+        return (double) $this->amount;
+    }
+
+    /**
+     * Set comment.
+     *
+     * @param string|null $comment
+     *
+     * @return AbstractElement
+     */
+    public function setComment($comment = null)
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    /**
+     * Get comment.
+     *
+     * @return string|null
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * Set startDate.
+     *
+     * @param \DateTimeInterface  $startDate
+     *
+     * @return AbstractElement
+     */
+    public function setStartDate(\DateTimeInterface $startDate)
+    {
+        if ($startDate instanceof \DateTime) {
+            $this->startDate = \DateTimeImmutable::createFromMutable($startDate);
+        } elseif (NULL === $startDate) {
+            $this->startDate = null;
+        } else {
+            $this->startDate = $startDate;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get startDate.
+     *
+     * @return \DateTimeImmutable
+     */
+    public function getStartDate()
+    {
+        return $this->startDate;
+    }
+
+    /**
+     * Set endDate.
+     *
+     * @param \DateTimeInterface|null $endDate
+     *
+     * @return AbstractElement
+     */
+    public function setEndDate(\DateTimeInterface $endDate = null)
+    {
+        if ($endDate instanceof \DateTime) {
+            $this->endDate = \DateTimeImmutable::createFromMutable($endDate);
+        } elseif (NULL === $endDate) {
+            $this->endDate = null;
+        } else {
+            $this->endDate = $endDate;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get endDate.
+     *
+     * @return \DateTimeImmutable|null
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+    
+    public function isEmpty()
+    {
+        return $this->amount == 0;
+    }
 }