Issue #3: Remove public prefix and align routes.

URGENT : Fix namespace pbm

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

.env

@@ -0,0 +1,64 @@
+##
+##  Manually dump .env files in .env.local.php with
+## `$ composer symfony:dump-env prod`
+##
+
+## Project environment
+APP_ENV=dev
+
+## Enable debug
+APP_DEBUG=true
+
+## Locale
+LOCALE=fr
+
+## Framework secret
+APP_SECRET=ThisTokenIsNotSoSecretChangeIt
+
+## Symfony/swiftmailer
+MAILER_TRANSPORT=smtp
+MAILER_HOST=smtp
+MAILER_PORT=1025
+MAILER_CRYPT=
+MAILER_AUTH=
+MAILER_USER=
+MAILER_PASSWORD=
+MAILER_URL=${MAILER_TRANSPORT}://${MAILER_HOST}:${MAILER_PORT}?encryption=${MAILER_CRYPT}&auth_mode=${MAILER_AUTH}&username=${MAILER_USER}&password=${MAILER_PASSWORD}
+
+## Notifications
+NOTIFICATION_HOST=localhost:8001
+NOTIFICATION_FROM_EMAIL=admin@chill.social
+NOTIFICATION_FROM_NAME=Chill
+
+## Gelf
+GELF_HOST=gelf
+GELF_PORT=12201
+
+## OVH OpenStack Storage User/Role
+OS_USERNAME=
+OS_PASSWORD=
+OS_TENANT_ID=
+OS_REGION_NAME=GRA
+OS_AUTH_URL=https://auth.cloud.ovh.net/v2.0/
+
+## OVH OpenStack Storage Container
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+## Redis Cache
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
+
+## Twilio
+TWILIO_SID=~
+TWILIO_SECRET=~
+
+## DOCKER IMAGES REGISTRY
+#IMAGE_PHP=
+#IMAGE_NGINX=
+
+## DOCKER IMAGES VERSION
+#VERSION=test
+VERSION=prod

.env.test

@@ -0,0 +1,6 @@
+# variables for .env environement
+# those variables suits for gitlab-ci
+# Run tests from root to adapt your own environment
+KERNEL_CLASS='App\Kernel'
+APP_SECRET='$ecretf0rt3st'
+DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8

.gitignore

@@ -1,3 +1,21 @@
 .composer/*
 composer.phar
+composer.lock
 
+docs/build/
+
+###> symfony/framework-bundle ###
+/.env.local
+/.env.local.php
+/.env.*.local
+/config/secrets/prod/prod.decrypt.private.php
+/public/bundles/
+/var/
+/vendor/
+/bin/
+###< symfony/framework-bundle ###
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###

.gitlab-ci.yml

@@ -0,0 +1,41 @@
+---
+image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+
+# Select what we should cache between builds
+cache:
+  paths:
+    - tests/app/vendor/
+
+before_script:
+  # add extensions to postgres
+  - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+  # Install and run Composer
+  - curl -sS https://getcomposer.org/installer | php
+  - php composer.phar install
+  - php tests/app/bin/console doctrine:migrations:migrate -n
+  - php tests/app/bin/console doctrine:fixtures:load -n
+
+# 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
+    alias: db
+  - name: redis
+    alias: redis
+
+# Set any variables we need
+variables:
+  # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
+  POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: postgres
+  # fetch the chill-app using git submodules
+  GIT_SUBMODULE_STRATEGY: recursive
+  REDIS_HOST: redis
+  REDIS_PORT: 6379
+  REDIS_URL: redis://redis:6379
+
+
+# Run our tests
+test:
+  script:
+    - bin/phpunit --colors=never

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "_exts/sphinx-php"]
 	path = _exts/sphinx-php
 	url = https://github.com/fabpot/sphinx-php.git
+[submodule "tests/app"]
+	path = tests/app
+	url = https://gitlab.com/Chill-projet/chill-app.git

README.md

@@ -0,0 +1,9 @@
+# Chill framework
+
+Documentation of the Chill software.
+
+The online documentation can be found at http://docs.chill.social
+
+See the [`docs`][1] directory for more.
+
+[1]: docs/README.md

composer.json

@@ -19,10 +19,14 @@
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+          "App\\": "tests/app/src/"
+        }
+    },
     "require": {
         "champs-libres/async-uploader-bundle": "dev-sf4",
         "graylog2/gelf-php": "^1.5",
-        "symfony/flex": "^1.9",
         "symfony/form": "4.*",
         "symfony/twig-bundle": "^4.4",
         "twig/extra-bundle": "^2.12|^3.0",
@@ -38,6 +42,7 @@
         "symfony/validator": "4.*",
         "sensio/framework-extra-bundle": "^5.5",
         "symfony/yaml": "4.*",
+        "symfony/webpack-encore-bundle": "^1.11",
         "knplabs/knp-menu": "^3.1",
         "knplabs/knp-menu-bundle": "^3.0",
         "symfony/templating": "4.*",
@@ -52,7 +57,8 @@
         "symfony/browser-kit": "^5.2",
         "symfony/css-selector": "^5.2",
         "twig/markdown-extra": "^3.3",
-        "erusev/parsedown": "^1.7"
+        "erusev/parsedown": "^1.7",
+        "symfony/serializer": "^5.2"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -66,6 +72,17 @@
         "symfony/stopwatch": "^5.1",
         "symfony/web-profiler-bundle": "^5.0",
         "symfony/var-dumper": "4.*",
-        "symfony/debug-bundle": "^5.1"
+        "symfony/debug-bundle": "^5.1",
+        "symfony/phpunit-bridge": "^5.2"
+    },
+    "scripts": {
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+        }
+    },
+    "config": {
+      "vendor-dir": "tests/app/vendor",
+      "bin-dir": "bin"
     }
 }

docs/README.md

@@ -10,10 +10,19 @@ Compilation into HTML
 
 To compile this documentation :
 
-1. Install [sphinx-doc](http://sphinx-doc.org) (eg. pip install sphinx &  pip install sphinx_rtd_theme)
+1. Install [sphinx-doc](http://sphinx-doc.org)
+    ``` bash
+            $ virtualenv .venv # creation of the virtual env (only the first time)
+            $ source .venv/bin/activate # activate the virtual env
+    (.venv) $ pip install -r requirements.txt
+    ```
 2. Install submodules : $ git submodule update --init;
 3. run `make html` from the root directory
 4. The base file is located on build/html/index.html
+    ``` bash
+    $ cd build/html
+    $ python -m http.server 8888 # will serve the site on the port 8888
+    ```
 
 Contribute
 ===========

docs/source/development/index.rst

@@ -14,7 +14,6 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
 .. toctree::
     :maxdepth: 2
 
-    Install Chill for development <installation.rst>
     Instructions to create a new bundle <create-a-new-bundle.rst>
     CRUD (Create - Update - Delete) for one entity <crud.rst>
     Routing <routing.rst>
@@ -30,7 +29,7 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
     Timelines <timelines.rst>
     Exports <exports.rst>
     Embeddable comments <embeddable-comments.rst>
-    Testing <make-test-working.rst>
+    Run tests <run-tests.rst>
     Useful snippets <useful-snippets.rst>
     manual/index.rst
     Assets <assets.rst>

docs/source/development/installation.rst

@@ -1,155 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _installation-for-development :
-
-Installation for development
-****************************
-
-Installation for development should allow:
-
-	- access to the source code, 
-	- upload the code to our CVS (i.e. `git`_) and 
-	- work with `composer`_.
-
-As Chill is divided into bundles (the Symfony name for 'modules'), each bundle has his own repository.
-
-Installation and big picture
-----------------------------
-
-First, you should install Chill as described in the :ref:`basic-installation` section.
-
-Two things must be modified : 
-
-First, add the `--prefer-source` argument when you create project. 
-
-.. code-block:: bash
-
-   composer create-project chill-project/standard path/to/your/directory --stability=dev --prefer-source
-
-Second, when composer ask you the following question : ::
-
-  Do you want to remove the existing VCS (.git, .svn..) history? [Y,n]?
-
-**You should answer `n` (no).**
-
-Once Chill is installed, all the downloaded bundles will be stored in the `/vendor` directories. 
-In those directories, you will have access to the git commands.
-
-.. code-block:: bash
-
-    $ cd vendor/chill-project/main/
-    $ git remote -v
-    composer   git://github.com/Chill-project/Standard.git (fetch)
-    composer   git://github.com/Chill-project/Standard.git (push)
-    origin     git://github.com/Chill-project/Standard.git (fetch)
-    origin     git@github.com:Chill-project/Standard.git (push)
-
-Files cleaning after installation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Composer will delete unrequired files, and add some. This is perfectly normal and will appears in your git index.
-But you should NOT delete those files.
-
-This is the expected 'git status' result: 
-
-.. code-block:: bash
-
-    $git status
-      #(...)
-
-      Modifications qui ne seront pas validées :
-        (utilisez "git add/rm <fichier>..." pour mettre à jour ce qui sera validé)
-        (utilisez "git checkout -- <fichier>..." pour annuler les modifications dans la copie de travail)
-
-	      modifié:         app/SymfonyRequirements.php
-	      supprimé:        app/SymfonyStandard/Composer.php
-	      supprimé:        app/SymfonyStandard/RootPackageInstallSubscriber.php
-	      modifié:         app/check.php
-
-You can ignore the local changes using the `git update-index --assume-unchanged` command.
-
-.. code-block:: bash
-
-   $ git update-index --assume-unchanged app/check.php
-   $ git update-index --assume-unchanged app/SymfonyRequirements.php
-   $ git update-index --assume-unchanged app/SymfonyStandard/Composer.php
-   $ git update-index --assume-unchanged app/SymfonyStandard/RootPackageInstallSuscriber.php
-
-Working with your own fork
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Ideally, you will work on a fork of the main github repository. 
-To ensure that composer will download the code from **your** repository, you will have to adapt the `composer.json` file accordingly, using your own repositories. 
-
-For each Chill module that you have forked, add an indexed array into the "repositories" key of the composer.json file 
-at the root of the chill installation directory if you want to force composer to download from your own forked repositories: 
-
-.. code-block:: json
-
-    "repositories": [
-       {
-         "type": "git",
-         "url": "git://github.com/your-github-username/ChillMain.git"
-       },
-       {
-         "type": "git",
-         "url": "git://github.com/your-github-username/Chill-Person.git"
-       }
-    ]
-    
-
-Then run composer update to load your forked code. 
-If it does not happen, delete the content of the chill/vendor/chill-project/my_forked_bundle and relaunch composer update and the code will be downloaded from your fork.
-
-.. code-block:: bash
-
-   composer update
-   
-You may also `use aliases <https://getcomposer.org/doc/articles/aliases.md>`_ to define versions.
-
-.. _editing-code-and-commiting :
-
-Editing the code and commiting
-------------------------------
-
-You may edit code in the `vendor/path/to/the/bundle` directory.
-
-Once satisfied with your changes, you should commit as usually : 
-
-.. code-block:: bash
-
-    $ cd vendor/path/to/bundle
-    $ git status 
-    Sur la branche master
-    Votre branche est à jour avec 'origin/master'.
-
-    rien à valider, la copie de travail est propre
-
-.. warning
-
-    The git command must be run from you vendor bundle's path (`vendor/path/to/bundle`). 
-
-Tips
-^^^^
-
-The command `composer status` (`see composer documentation <https://getcomposer.org/doc/03-cli.md#status>`_) will give you and idea of which bundle has been edited :
-
-.. code-block:: bash
-
-    $ cd ./../../ #back to the root project directory
-    $ composer status
-    You have changes in the following dependencies:
-    /path/to/your/project/install/vendor/chill-project/main
-    Use --verbose (-v) to see modified files
-
-
-
-
-.. _git: http://git-scm.org
-.. _composer: https://getcomposer.org

docs/source/development/make-test-working.rst

@@ -1,231 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Make tests working
-******************
-
-Unit and functional tests are important to ensure that bundle may be deployed securely.
-
-In reason of the Chill architecture, test should be runnable from the bundle's directory and works correctly: this will allow continuous integration tools to run tests automatically. 
-
-.. note::
-
-    Integration tools (i.e. `travis-ci <https://travis-ci.org>`_) works like this : 
-
-    * they clone the bundle repository in a virtual machine, using git
-    * they optionnaly run `composer` to download and install depedencies
-    * they optionnaly run other command to prepare a database, insert fixtures, ...
-    * they run test
-
-On the developer's machine test should be runnable with two or three commands **runned from the bundle directory** : 
-
-.. code-block:: bash
-
-   $ composer install --dev
-   $ // command to insert fixtures, ...
-   $ phpunit
-
-This chapter has been inspired by `this useful blog post <http://blog.kevingomez.fr/2013/01/09/functional-testing-standalone-symfony2-bundles/>`_.
-
-Bootstrap phpunit for a standalone bundle
-==========================================
-
-Unit tests should run after achieving this step.
-
-
-phpunit.xml
------------
-
-A `phpunit.xml.dist` file should be present at the bundle root.
-
-.. code-block:: xml
-
-   <?xml version="1.0" encoding="UTF-8"?>
-
-   <phpunit bootstrap="./Tests/bootstrap.php" colors="true">
-        <!-- the file "./Tests/boostrap.php" will be created on the next step -->
-       <testsuites>
-           <testsuite name="ChillMain test suite">
-               <directory suffix="Test.php">./Tests</directory>
-           </testsuite>
-       </testsuites>
-       <filter>
-           <whitelist>
-               <directory>./</directory>
-               <exclude>
-                   <directory>./Resources</directory>
-                   <directory>./Tests</directory>
-                   <directory>./vendor</directory>
-               </exclude>
-          </whitelist>
-      </filter>
-   </phpunit>
-
-
-bootstrap.php
---------------
-
-A file `boostrap.php`, located in the `Tests` directory, will allow phpunit to resolve class autoloading :
-
-.. code-block:: php
-
-   <?php
-
-   if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
-       throw new \LogicException('Could not find autoload.php in vendor/. Did you run "composer install --dev"?');
-   }
-
-   require $autoloadFile;
-
-
-composer.json
--------------
-
-The `composer.json` file **located at the bundle's root** should contains all depencies needed to run test (and to execute bundle functions).
-
-Ensure that all dependencies are included in the `require` and `require-dev` sections.
-
-
-Functional tests
-================
-
-If you want to access services, database, and run functional tests, you will have to bootstrap a symfony app, with the minimal configuration. Three files are required : 
-
-* a `config_test.yml` file (eventually with a `config.yml`);
-* a `routing.yml` file
-* an `AppKernel.php` file
-
-Adapt phpunit.xml
------------------
-
-You should add reference to the new application within `phpunit.xml.dist`. The directive `<php>` should be added like this, if your `AppKernel.php` file is located in `Tests/Fixtures/App` directory:
-
-.. code-block:: xml
-
-    <?xml version="1.0" encoding="UTF-8"?>
-
-    <phpunit bootstrap="./Tests/bootstrap.php" colors="true">
-        <testsuites>
-            <testsuite name="ChillMain test suite">
-                <directory suffix="Test.php">./Tests</directory>
-            </testsuite>
-        </testsuites>
-        <filter>
-            <whitelist>
-                <directory>./</directory>
-                <exclude>
-                    <directory>./Resources</directory>
-                    <directory>./Tests</directory>
-                    <directory>./vendor</directory>
-                </exclude>
-            </whitelist>
-        </filter>
-        <!-- the lines we added --> 
-       <php>
-            <server name="KERNEL_DIR" value="./Tests/Fixtures/App/" />
-        </php>
-    </phpunit>
-
-AppKernel.php
--------------
-
-This file boostrap the app. It contains three functions. This is the file used in the ChillMain bundle :
-
-.. code-block:: php
-                                                                                                                                                                                                                 
-    <?php
-
-    use Symfony\Component\HttpKernel\Kernel;
-    use Symfony\Component\Config\Loader\LoaderInterface;
-
-    class AppKernel extends Kernel
-    {
-        public function registerBundles()
-        {   
-            return array(
-                new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-                new Chill\MainBundle\ChillMainBundle(),
-                new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-                new Symfony\Bundle\TwigBundle\TwigBundle(),
-                new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-                #add here all the required bundle (some bundle are not required)
-            );
-        }   
-
-        public function registerContainerConfiguration(LoaderInterface $loader)
-        {   
-            $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-        }   
-
-        /** 
-         * @return string
-         */
-        public function getCacheDir()
-        {   
-            return sys_get_temp_dir().'/ChillMainBundle/cache';
-        }   
-
-        /** 
-         * @return string
-         */
-        public function getLogDir()
-        {   
-            return sys_get_temp_dir().'/ChillMainBundle/logs';
-        }   
-    }
-
-config_test.yml
----------------
-
-There are only few parameters required for the config file. This is a basic version for ChillMain :
-
-.. code-block:: yaml
-
-    # config/config_test.yml
-    imports:
-        - { resource: config.yml } #here we import a config.yml file, this is not required
-
-    framework:
-        test: ~
-        session:
-            storage_id: session.storage.filesystem
-
-.. code-block:: yaml
-
-   # config/config.yml
-   framework: 
-    secret:          Not very secret
-    router:          { resource: "%kernel.root_dir%/config/routing.yml" }
-    form:            true
-    csrf_protection: true
-    session:         ~
-    default_locale:  fr  
-    translator:      { fallback: fr }
-    profiler:        { only_exceptions: false }
-    templating: #required for assetic. Remove if not needed
-        engines: ['twig']
-
-.. note:: 
-
-    You must adapt config.yml file according to your required bundle. Some options will be missing, other may be removed...
-
-.. note::
-
-    If you would like to tests different environments, with differents configuration, you could create differents config_XXX.yml files.
-
-routing.yml
-------------
-
-You should add there all routing information needed for your bundle. 
-
-.. code-block: yaml
-
-    chill_main_bundle:
-      resource: "@CLChillMainBundle/Resources/config/routing.yml"
-
-That's it. Tests should pass.

docs/source/development/run-tests.rst

@@ -0,0 +1,68 @@
+.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
+   Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+Run tests
+*********
+
+In reason of the Chill architecture, test should be runnable from the bundle's directory and works correctly: this will allow continuous integration tools to run tests automatically. 
+
+From chill app
+==============
+
+This is the most convenient method for developer: run test for chill bundle from the main app.
+
+.. code-block:: bash
+
+   # run into a container
+   docker-compose exec --user $(id -u) php bash
+   # execute all tests suites
+   bin/phpunit
+   # .. or execute a single test
+   bin/phpunit vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/Tests/path/to/FileTest.php
+
+You can also run tests in a single command:
+
+.. code-block:: bash
+
+   docker-compose exec --user $(id -u) php bin/phpunit
+
+
+Tests from a bundle (chill-bundles)
+-----------------------------------
+
+Those tests needs the whole symfony app to execute Application Tests (which test html page).
+
+For ease, the app is cloned using a :code:`git submodule`, which clone the main app into :code:`tests/app`, and tests are bootstrapped to this app. The dependencies are also installed into `tests/app/vendor` to ensure compliance with relative path from this symfony application.
+
+You may boostrap the tests fro the chill bundle this way:
+
+.. code-block:: bash
+
+   # ensure to be located into the environement (provided by docker suits well)
+   docker-compose exec --user $(id -u) php bash
+   # go to chill subdirectory
+   cd vendor/chill-project/chill-bundles
+   # install submodule
+   git submodule init
+   git submodule update
+   # install composer and dependencies
+   curl -sS https://getcomposer.org/installer | php
+   # run tests
+   bin/phpunit
+
+.. note::
+
+   If you are on a fresh install, you will need to migrate database schema. 
+
+   The path to console tool must be adapted to the app. To load migration and add fixtures, one can execute the following commands:
+
+   .. code-block:: bash
+      
+      tests/app/bin/console doctrine:migrations:migrate
+      tests/app/bin/console doctrine:fixtures:load
+

docs/source/index.rst

@@ -30,21 +30,14 @@ Contents of this documentation:
 Let's talk together !
 ======================
 
-Subscribe to the dev mailing-list to discuss your project and extend Chill with the feature you need! 
-
-- `The dev mailing-list <https://lists.chill.social/listinfo/dev>`_
-- `Read the archives of the mailing-list <https://lists.chill.social/pipermail/dev/>`_
-
-
+You may talk to developers using the matrix room: `https://app.element.io/#/room/#chill-social-admin:matrix.org`_
 
 Contribute
 ==========
 
 
-* `Issue tracker <https://git.framasoft.org/groups/Chill-project/issues>`_ You may want to dispatch the issue in the multiple projects. If you do not know in which project is located your bug / feature request, use the project Chill-Main.
-* `The dev mailing-list <https://lists.chill.social/listinfo/dev>`_
+* `Issue tracker <https://gitlab.com/groups/Chill-project/issues>`_ You may want to dispatch the issue in the multiple projects. If you do not know in which project is located your bug / feature request, use the project Chill-Main.
 
-Source code is dispatched in multiple bundle, to improve re-usability. Each bundle has dependencies with other chill bundle, but the developer take care that bundles may not be installed if the user do not need it.
 
 User manual
 ===========
@@ -56,22 +49,22 @@ An user manual exists in French and currently focuses on describing the main con
 Available bundles
 =================
 
-* Chill-standard | https://git.framasoft.org/Chill-project/Chill-Standard This is the skeleton of the project. It does contains only few code, but information about configuration of your instance ;
-* Chill-Main : https://git.framasoft.org/Chill-project/Chill-Main : the main, required bundle for all the subsequent chill bundles. It contains the framework to add features (like searching, timeline, ...). It also provides the user managements (authentification and authorization)  ;
-* Chill-Person : https://git.framasoft.org/Chill-project/Chill-Person This is the bundle which provides the possibility to create and add a person.
-* Chill-CustomFields : https://git.framasoft.org/Chill-project/Chill-CustomFields This bundle allows you to create custom fields on other bundles. It provides the framework for this features, and modify the schema according to this. It is required by Chill-Person and Chill-Report.
-* Chill-Report: https://git.framasoft.org/Chill-project/Chill-Report This bundle allow to add report about People recorded in your database ;
-* Chill-Activity : https://git.framasoft.org/Chill-project/Chill-Activity This bundle allow to add activities about People recorded in your database ;
-* Chill-ICPC2 : https://git.framasoft.org/Chill-project/Chill-ICPC2 This bundle provides a custom fields for `ICPC code <https://en.wikipedia.org/wiki/International_Classification_of_Primary_Care>`_ (international classification for primary care)
-* Chill-Group: https://git.framasoft.org/Chill-project/Chill-Group This bundle provides a way to create link between accompanyed people
-* Chill-Event: https://git.framasoft.org/Chill-project/Chill-Event This bundle provides a way to create event and associate people to event through a "participation"
-* Chill-Ldap: https://git.framasoft.org/Chill-project/Chill-Ldap Allow to synchronize the database with a ldap directory.
-* Chill-ONEStat : https://framagit.org/Chill-project/Chill-ONEStat Provide statistics for the Belgian one "Centre de vacances" and "Ecoles de devoir".
+* Chill-app | https://gitlab.com/Chill-project/Chill-app This is the skeleton of the project. It does contains only few code, but information about configuration of your instance ;
+* Chill-bundle: contains the main bundles, the most used in an instance. This means:
+  * chill-main, the main framework,
+  * Chill Person, to deal with persons,
+  * chill custom fields, to add custom fields to some entities,
+  * chill activity: to add activities to people,
+  * chill report: to add report to people, 
+  * chill event: to gather people into events,
+  * chill docs store: to store documents to people, but also entities,
+  * chill task: to register task with people,
+  * chill third party: to register third parties,
+  * chill family members: to register family members
 
 You will also found the following projects :
 
-* The present documentation : https://git.framasoft.org/Chill-project/chill-documentation
-* The website https://chill.social : https://git.framasoft.org/Chill-project/chill.social
+* The website https://chill.social : https://gitlab.com/Chill-project/chill.social
 
 And various project to build docker containers with Chill.
 

docs/source/installation/index.rst

@@ -27,13 +27,13 @@ Installation in development mode
 1. Get the code
 ===============
 
-Clone or download the chill-standard project and `cd` into the main directory.
+Clone or download the chill-app project and `cd` into the main directory.
 
 
 .. code-block:: bash
 
-   git clone https://framagit.org/Chill-project/Chill-Standard.git
-   cd Chill-Standard
+   git clone https://gitlab.com/Chill-Projet/chill-app.git
+   cd chill-app
 
 
 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.

phpunit.xml.dist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="tests/app/tests/bootstrap.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+        <server name="APP_ENV" value="test" force="true" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" /> 
+        <server name="SHELL_VERBOSITY" value="-1" />
+    </php>
+
+    <testsuites>
+       <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>
+        </testsuite>
+      -->
+      </testsuites>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+    </listeners>
+
+    <!-- Run `composer require symfony/panther` before enabling this extension -->
+    <!--
+    <extensions>
+        <extension class="Symfony\Component\Panther\ServerExtension" />
+    </extensions>
+    -->
+</phpunit>

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -47,11 +47,11 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
 {
     /**
      * widget factory
-     * 
+     *
      * @var WidgetFactoryInterface[]
      */
     protected $widgetFactories = array();
-    
+
     /**
      * @param WidgetFactoryInterface $factory
      */
@@ -59,7 +59,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     {
         $this->widgetFactories[] = $factory;
     }
-    
+
     /**
      * @return WidgetFactoryInterface[]
      */
@@ -67,7 +67,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     {
         return $this->widgetFactories;
     }
-    
+
     /**
      * {@inheritDoc}
      * @param array $configs
@@ -79,31 +79,31 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         // configuration for main bundle
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
-        
+
         $container->setParameter('chill_main.installation_name',
             $config['installation_name']);
 
         $container->setParameter('chill_main.available_languages',
             $config['available_languages']);
-        
-        $container->setParameter('chill_main.routing.resources', 
-            $config['routing']['resources']); 
-        
+
+        $container->setParameter('chill_main.routing.resources',
+            $config['routing']['resources']);
+
         $container->setParameter('chill_main.pagination.item_per_page',
             $config['pagination']['item_per_page']);
-        
-        $container->setParameter('chill_main.notifications', 
+
+        $container->setParameter('chill_main.notifications',
             $config['notifications']);
-        
-        $container->setParameter('chill_main.redis', 
+
+        $container->setParameter('chill_main.redis',
             $config['redis']);
-        
-        $container->setParameter('chill_main.phone_helper', 
+
+        $container->setParameter('chill_main.phone_helper',
             $config['phone_helper'] ?? []);
-        
+
         // add the key 'widget' without the key 'enable'
-        $container->setParameter('chill_main.widgets', 
-            isset($config['widgets']['homepage']) ? 
+        $container->setParameter('chill_main.widgets',
+            isset($config['widgets']['homepage']) ?
                 array('homepage' => $config['widgets']['homepage']):
                 array()
                 );
@@ -131,10 +131,11 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         $loader->load('services/templating.yaml');
         $loader->load('services/timeline.yaml');
         $loader->load('services/search.yaml');
-        
+        $loader->load('services/serializer.yaml');
+
         $this->configureCruds($container, $config['cruds'], $loader);
     }
-    
+
     /**
      * @param array $config
      * @param ContainerBuilder $container
@@ -144,11 +145,11 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     {
         return new Configuration($this->widgetFactories, $container);
     }
-    
+
     /**
      * @param ContainerBuilder $container
      */
-    public function prepend(ContainerBuilder $container) 
+    public function prepend(ContainerBuilder $container)
     {
         //add installation_name and date_format to globals
         $chillMainConfig = $container->getExtensionConfig($this->getAlias());
@@ -163,7 +164,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
             'form_themes' => array('@ChillMain/Form/fields.html.twig')
         );
         $container->prependExtensionConfig('twig', $twigConfig);
-        
+
         //add DQL function to ORM (default entity_manager)
         $container->prependExtensionConfig('doctrine', array(
            'orm' => array(
@@ -182,7 +183,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
               )
            )
         ));
-        
+
         //add dbal types (default entity_manager)
         $container->prependExtensionConfig('doctrine', array(
            'dbal' => [
@@ -191,23 +192,23 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                ]
            ]
         ));
-        
+
         //add current route to chill main
         $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
                  '@ChillMainBundle/config/routes.yaml'
               )
-              
+
            )
         ));
-        
+
         //add a channel to log app events
         $container->prependExtensionConfig('monolog', array(
             'channels' => array('chill')
         ));
     }
-    
+
     /**
      * @param ContainerBuilder $container
      * @param array $config the config under 'cruds' key
@@ -218,31 +219,31 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         if (count($config) === 0) {
             return;
         }
-        
+
         $loader->load('services/crud.yaml');
-        
+
         $container->setParameter('chill_main_crud_route_loader_config', $config);
-        
+
         $definition = new Definition();
         $definition
             ->setClass(\Chill\MainBundle\CRUD\Routing\CRUDRoutesLoader::class)
             ->addArgument('%chill_main_crud_route_loader_config%')
             ;
-        
+
         $container->setDefinition('chill_main_crud_route_loader', $definition);
-        
+
         $alreadyExistingNames = [];
-        
+
         foreach ($config as $crudEntry) {
             $controller = $crudEntry['controller'];
             $controllerServiceName = 'cscrud_'.$crudEntry['name'].'_controller';
             $name = $crudEntry['name'];
-            
+
             // check for existing crud names
             if (\in_array($name, $alreadyExistingNames)) {
                 throw new LogicException(sprintf("the name %s is defined twice in CRUD", $name));
             }
-            
+
             if (!$container->has($controllerServiceName)) {
                 $controllerDefinition = new Definition($controller);
                 $controllerDefinition->addTag('controller.service_arguments');
@@ -250,7 +251,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                 $controllerDefinition->setClass($crudEntry['controller']);
                 $container->setDefinition($controllerServiceName, $controllerDefinition);
             }
-            
+
             $container->setParameter('chill_main_crud_config_'.$name, $crudEntry);
             $container->getDefinition($controllerServiceName)
                 ->addMethodCall('setCrudConfig', ['%chill_main_crud_config_'.$name.'%']);

src/Bundle/ChillMainBundle/Notification/Mailer.php

@@ -104,7 +104,7 @@ class Mailer
      * @param \User $to
      * @param array $subject Subject of the message [ 0 => $message (required), 1 => $parameters (optional), 3 => $domain (optional) ]
      * @param array $bodies The bodies. An array where keys are the contentType and values the bodies
-     * @param \callable $callback a callback to customize the message (add attachment, etc.)
+     * @param callable $callback a callback to customize the message (add attachment, etc.)
      */
     public function sendNotification(
         $recipient,

src/Bundle/ChillMainBundle/Resources/public/main.js

@@ -21,9 +21,7 @@ global.chill = chill;
 /*
  * load requirements in chill entrypoint
  */
-
-require('./sass/scratch.scss');
-
+require('./scss/chillmain.scss');
 require('./css/chillmain.css');
 require('./css/pikaday.css');
 
@@ -37,10 +35,11 @@ require('./modules/download-report/index.js');
 require('./modules/select_interactive_loading/index.js');
 require('./modules/export-list/export-list.scss');
 require('./modules/entity/index.js');
+//require('./modules/tabs/index.js');
 
 /*
  * load img
  */
 require('./img/favicon.ico');
 require('./img/logo-chill-sans-slogan_white.png');
-require('./img/logo-chill-outil-accompagnement_white.png');
+require('./img/logo-chill-outil-accompagnement_white.png');

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss

@@ -0,0 +1,4 @@
+/*
+ *  These custom styles will override bootstrap enabled stylesheets
+ */
+

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss

@@ -0,0 +1,47 @@
+/*
+ *  Enable / disable bootstrap assets
+ */
+
+@import "bootstrap/scss/functions";
+
+/* replace variables */
+// @import "bootstrap/scss/variables";
+@import "custom/_variables";
+
+@import "bootstrap/scss/mixins";
+// @import "bootstrap/scss/root";
+// @import "bootstrap/scss/reboot";
+// @import "bootstrap/scss/type";
+// @import "bootstrap/scss/images";
+// @import "bootstrap/scss/code";
+// @import "bootstrap/scss/grid";
+// @import "bootstrap/scss/tables";
+// @import "bootstrap/scss/forms";
+// @import "bootstrap/scss/buttons";
+// @import "bootstrap/scss/transitions";
+// @import "bootstrap/scss/dropdown";
+// @import "bootstrap/scss/button-group";
+// @import "bootstrap/scss/input-group";
+// @import "bootstrap/scss/custom-forms";
+// @import "bootstrap/scss/nav";
+// @import "bootstrap/scss/navbar";
+// @import "bootstrap/scss/card";
+// @import "bootstrap/scss/breadcrumb";
+// @import "bootstrap/scss/pagination";
+// @import "bootstrap/scss/badge";
+// @import "bootstrap/scss/jumbotron";
+// @import "bootstrap/scss/alert";
+// @import "bootstrap/scss/progress";
+// @import "bootstrap/scss/media";
+// @import "bootstrap/scss/list-group";
+// @import "bootstrap/scss/close";
+// @import "bootstrap/scss/toasts";
+@import "bootstrap/scss/modal";
+// @import "bootstrap/scss/tooltip";
+// @import "bootstrap/scss/popover";
+// @import "bootstrap/scss/carousel";
+// @import "bootstrap/scss/spinners";
+// @import "bootstrap/scss/utilities";
+// @import "bootstrap/scss/print";
+
+@import "custom";

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom.scss

@@ -1,42 +0,0 @@
-/*
-*   when bootstrap.css comes after chill.css
-*   we have to disable conflict classes
-*/
-
-@import "bootstrap/scss/functions";
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/root";
-//@import "bootstrap/scss/reboot";  // h1, h2, h3, ...
-//@import "bootstrap/scss/type";    // h1, h2, h3, ...
-@import "bootstrap/scss/images";
-@import "bootstrap/scss/code";
-//@import "bootstrap/scss/grid";    // container
-@import "bootstrap/scss/tables";
-@import "bootstrap/scss/forms";
-@import "bootstrap/scss/buttons";
-@import "bootstrap/scss/transitions";
-@import "bootstrap/scss/dropdown";
-@import "bootstrap/scss/button-group";
-@import "bootstrap/scss/input-group";
-@import "bootstrap/scss/custom-forms";
-@import "bootstrap/scss/nav";
-@import "bootstrap/scss/navbar";
-@import "bootstrap/scss/card";
-@import "bootstrap/scss/breadcrumb";
-@import "bootstrap/scss/pagination";
-@import "bootstrap/scss/badge";
-@import "bootstrap/scss/jumbotron";
-@import "bootstrap/scss/alert";
-@import "bootstrap/scss/progress";
-@import "bootstrap/scss/media";
-@import "bootstrap/scss/list-group";
-@import "bootstrap/scss/close";
-@import "bootstrap/scss/toasts";
-@import "bootstrap/scss/modal";
-@import "bootstrap/scss/tooltip";
-@import "bootstrap/scss/popover";
-@import "bootstrap/scss/carousel";
-@import "bootstrap/scss/spinners";
-@import "bootstrap/scss/utilities";
-@import "bootstrap/scss/print";

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js

@@ -1,9 +1,9 @@
 // Compile all bootstrap assets from nodes-modules
 //require('bootstrap/scss/bootstrap.scss')
 
-// Compile custom styles to adapt bootstrap in chill context
-require('./custom.scss')
+// Or compile bootstrap only enabled assets
+require('./bootstrap.scss');
 
 // You can specify which plugins you need
 //import { Tooltip, Toast, Popover } from 'bootstrap';
-//import Alert from 'bootstrap/js/dist/alert';
+import Modal from 'bootstrap/js/dist/modal';

src/Bundle/ChillMainBundle/Resources/public/modules/scratch/_custom.scss

@@ -1,3 +1,9 @@
+/*
+ * NOTE 2021.04
+ * scss/chill.scss is the main sass file for the new chill.2
+ * scratch will be replaced by bootstrap, please avoid to edit in modules/scratch/_custom.scss
+ */
+
 // YOUR CUSTOM SCSS
 @import 'custom/config/colors';
 @import 'custom/config/variables';
@@ -156,7 +162,6 @@ dl.chill_view_data {
 
 }
 
-
 blockquote.chill-user-quote,
 div.chill-user-quote {
     border-left: 10px solid $chill-yellow;
@@ -164,12 +169,12 @@ div.chill-user-quote {
     padding: 0.5em 10px;
     quotes: "\201C""\201D""\2018""\2019";
     background-color: $chill-llight-gray;
-    
+
     blockquote {
         margin: 1.5em 10px;
         padding: 0.5em 10px;
     }
-    
+
     blockquote:before {
         color: #ccc;
         content: open-quote;
@@ -182,5 +187,4 @@ div.chill-user-quote {
 
 .chill-no-data-statement {
     font-style: italic;
-
 }

src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_selection.scss

@@ -1,42 +1,42 @@
-@charset "UTF-8";
-
-/// Outputs the spec and prefixed versions of the `::selection` pseudo-element.
-///
-/// @param {Bool} $current-selector [false]
-///   If set to `true`, it takes the current element into consideration.
-///
-/// @example scss - Usage
-///   .element {
-///     @include selection(true) {
-///       background-color: #ffbb52;
-///     }
-///   }
-///
-/// @example css - CSS Output
-///   .element::-moz-selection {
-///     background-color: #ffbb52;
-///   }
-///
-///   .element::selection {
-///     background-color: #ffbb52;
-///   }
-
-@mixin selection($current-selector: false) {
-  @if $current-selector {
-    &::-moz-selection {
-      @content;
-    }
-
-    &::selection {
-      @content;
-    }
-  } @else {
-    ::-moz-selection {
-      @content;
-    }
-
-    ::selection {
-      @content;
-    }
-  }
-}
+@charset "UTF-8";
+
+/// Outputs the spec and prefixed versions of the `::selection` pseudo-element.
+///
+/// @param {Bool} $current-selector [false]
+///   If set to `true`, it takes the current element into consideration.
+///
+/// @example scss - Usage
+///   .element {
+///     @include selection(true) {
+///       background-color: #ffbb52;
+///     }
+///   }
+///
+/// @example css - CSS Output
+///   .element::-moz-selection {
+///     background-color: #ffbb52;
+///   }
+///
+///   .element::selection {
+///     background-color: #ffbb52;
+///   }
+
+@mixin selection($current-selector: false) {
+  @if $current-selector {
+    &::-moz-selection {
+      @content;
+    }
+
+    &::selection {
+      @content;
+    }
+  } @else {
+    ::-moz-selection {
+      @content;
+    }
+
+    ::selection {
+      @content;
+    }
+  }
+}