Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter

.circleci/config.yml

@@ -1,101 +1,141 @@
-version: 2
+version: 2.1
+orbs:
+    aws-ecr: circleci/aws-ecr@4.0.1
+executors:
+  docker_build:
+    machine:
+      docker_layer_caching: true
 jobs:
-  build:
+    build:
-    working_directory: ~/alchemy-fr/Phraseanet
-    parallelism: 2
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-    docker:
-    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
-      command: /sbin/init
-    steps:
-    - checkout
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    - run:
         working_directory: ~/alchemy-fr/Phraseanet
-        command: nvm install v10.12.0 && nvm alias default v10.12.0
+        parallelism: 2
-    - run:
+        shell: /bin/bash --login
-        working_directory: ~/alchemy-fr/Phraseanet
+        environment:
-        command: 'sudo service memcached status || sudo service memcached start; sudo
+          CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-          redis-cli ping >/dev/null 2>&1 || sudo service redis-server start; sudo
+          CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-          service mysql status || sudo service mysql start; sudo service rabbitmq-server
+        docker:
-          status || sudo service rabbitmq-server start; '
+        - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
-    # Dependencies
+          command: /sbin/init
-    #   This would typically go in either a build or a build-and-test job when using workflows
+        steps:
-    # Restore the dependency cache
+        - checkout
-    - restore_cache:
+        - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-        keys:
+        - run:
-        # This branch if available
+            working_directory: ~/alchemy-fr/Phraseanet
-        - v1-dep-{{ .Branch }}-
+            command: nvm install v10.12.0 && nvm alias default v10.12.0
-        # Default branch if not
+        - run:
-        - v1-dep-master-
+            working_directory: ~/alchemy-fr/Phraseanet
-        # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
+            command: 'sudo service memcached status || sudo service memcached start; sudo
-        - v1-dep-
+              redis-cli ping >/dev/null 2>&1 || sudo service redis-server start; sudo
-    # This is based on your 1.0 configuration file or project settings
+              service mysql status || sudo service mysql start; sudo service rabbitmq-server
-    - run: git clone https://github.com/alanxz/rabbitmq-c
+              status || sudo service rabbitmq-server start; '
-    - run: cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a
+        # Dependencies
-    - run: cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install
+        #   This would typically go in either a build or a build-and-test job when using workflows
-    # disabled because pear.php.net is down cause of security failure
+        # Restore the dependency cache
-    #- run: pecl channel-update pear.php.net
+        - restore_cache:
-    - run: yes '' | pecl install amqp-1.9.3
+            keys:
-    - run: yes '' | pecl install imagick
+            # This branch if available
-    - run: sudo apt-get install libzmq-dev
+            - v1-dep-{{ .Branch }}-
-    - run: yes '' | pecl install zmq-beta
+            # Default branch if not
-    - run: echo "extension = amqp.so" > /opt/circleci/php/$(phpenv global)/etc/conf.d/amqp.ini
+            - v1-dep-master-
-    - run: echo "extension = zmq.so" > /opt/circleci/php/$(phpenv global)/etc/conf.d/zmq.ini
+            # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
-    - run: echo "date.timezone = UTC" > /opt/circleci/php/$(phpenv global)/etc/conf.d/timezone.ini
+            - v1-dep-
-    - run: sed -i 's/^\(session.cache_limiter = \).*/\1""/' /opt/circleci/php/$(phpenv global)/etc/php.ini
+        # This is based on your 1.0 configuration file or project settings
-    - run: npm rebuild node-sass
+        - run: echo 127.0.0.1 redis elasticsearch db rabbitmq | sudo tee -a /etc/hosts
-    # This is based on your 1.0 configuration file or project settings
+        - run: git clone https://github.com/alanxz/rabbitmq-c
-    - run: composer install --no-progress --no-interaction --optimize-autoloader
+        - run: cd rabbitmq-c && git checkout 2ca1774489328cde71195f5fa95e17cf3a80cb8a
-    # This is based on your 1.0 configuration file or project settings
+        - run: cd rabbitmq-c && git submodule init && git submodule update && autoreconf -i && ./configure && make && sudo make install
-    - run: node -v
+        # disabled because pear.php.net is down cause of security failure
-    - run: npm -v
+        #- run: pecl channel-update pear.php.net
-    - run: npm install
+        - run: yes '' | pecl install amqp-1.9.3
-    - run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi
+        - run: yes '' | pecl install imagick
-    - run:
+        - run: sudo apt-get install libzmq-dev
-        command: elasticsearch-2.3.3/bin/elasticsearch
+        - run: yes '' | pecl install zmq-beta
-        background: true
+        - run: echo "extension = amqp.so" > /opt/circleci/php/$(phpenv global)/etc/conf.d/amqp.ini
-    # Save dependency cache
+        - run: echo "extension = zmq.so" > /opt/circleci/php/$(phpenv global)/etc/conf.d/zmq.ini
-    - save_cache:
+        - run: echo "date.timezone = UTC" > /opt/circleci/php/$(phpenv global)/etc/conf.d/timezone.ini
-        key: v1-dep-{{ .Branch }}-{{ epoch }}
+        - run: sed -i 's/^\(session.cache_limiter = \).*/\1""/' /opt/circleci/php/$(phpenv global)/etc/php.ini
-        paths:
+        - run: npm rebuild node-sass
-        # This is a broad list of cache paths to include many possible development environments
+        # This is based on your 1.0 configuration file or project settings
-        # You can probably delete some of these entries
+        - run: composer install --no-progress --no-interaction --optimize-autoloader
-        - vendor/bundle
+        # This is based on your 1.0 configuration file or project settings
-        - ~/virtualenvs
+        - run: node -v
-        - ~/.m2
+        - run: npm -v
-        - ~/.ivy2
+        - run: npm install -g yarn
-        - ~/.bundle
+        - run: rm ~/.yarn/bin/yarn
-        - ~/.go_workspace
+        - run: ln -s /opt/circleci/nodejs/v10.12.0/bin/yarn ~/.yarn/bin/yarn
-        - ~/.gradle
+        - run: yarn install
-        - ~/.cache/bower
+        - run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi
-        # These cache paths were specified in the 1.0 config
+        - run:
-        - elasticsearch-2.3.3
+            command: elasticsearch-2.3.3/bin/elasticsearch
-        - node_modules
+            background: true
-        - ~/.composer
+        # Save dependency cache
-    # This is based on your 1.0 configuration file or project settings
+        - save_cache:
-    - run: mysql -u ubuntu -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;';
+            key: v1-dep-{{ .Branch }}-{{ epoch }}
-    # This is based on your 1.0 configuration file or project settings
+            paths:
-    - run: ./bin/developer system:uninstall -v
+            # This is a broad list of cache paths to include many possible development environments
-    - run: ./bin/setup system:install -v --email=test@phraseanet.com --password=test --db-host=127.0.0.1 --db-user=ubuntu --db-template=fr-simple --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;
+            # You can probably delete some of these entries
-    - run: ./bin/developer ini:setup-tests-dbs -v
+            - vendor/bundle
-    - run: ./bin/console searchengine:index:create -v
+            - ~/virtualenvs
-    - run: ./bin/developer phraseanet:regenerate-sqlite -v
+            - ~/.m2
-    - run: ./bin/developer phraseanet:generate-js-fixtures -v
+            - ~/.ivy2
-    # Test
+            - ~/.bundle
-    #   This would typically be a build job when using workflows, possibly combined with build
+            - ~/.go_workspace
-    # This is based on your 1.0 configuration file or project settings
+            - ~/.gradle
-    - run: case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac
+            - ~/.cache/bower
-    # Teardown
+            # These cache paths were specified in the 1.0 config
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+            - elasticsearch-2.3.3
-    # Save test results
+            - node_modules
-    - store_test_results:
+            - ~/.composer
-        path: /tmp/circleci-test-results
+        # This is based on your 1.0 configuration file or project settings
-    # Save artifacts
+        - run: mysql -u ubuntu -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;';
-    - store_artifacts:
+        # This is based on your 1.0 configuration file or project settings
-        path: /tmp/circleci-artifacts
+        - run: ./bin/developer system:uninstall -v
-    - store_artifacts:
+        - run: ./bin/setup system:install -v --email=test@phraseanet.com --password=test --db-host=127.0.0.1 --db-user=ubuntu --db-template=fr-simple --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;
-        path: /tmp/circleci-test-results
+        - run: ./bin/developer ini:setup-tests-dbs -v
+        - run: ./bin/console searchengine:index:create -v
+        - run: ./bin/developer phraseanet:regenerate-sqlite -v
+        - run: ./bin/developer phraseanet:generate-js-fixtures -v
+        # Test
+        #   This would typically be a build job when using workflows, possibly combined with build
+        # This is based on your 1.0 configuration file or project settings
+        - run: case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac
+        # Teardown
+        #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+        # Save test results
+        - store_test_results:
+            path: /tmp/circleci-test-results
+        # Save artifacts
+        - store_artifacts:
+            path: /tmp/circleci-artifacts
+        - store_artifacts:
+            path: /tmp/circleci-test-results
+
+workflows:
+    version: 2
+    oldfashion:
+        jobs:
+            - build
+    newfashion:
+        jobs:
+            - aws-ecr/build_and_push_image:
+                account-url: AWS_ACCOUNT_URL
+                aws-access-key-id: AWS_ACCESS_KEY_ID
+                aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+                context: "AWS London"
+                create-repo: true
+                dockerfile: Dockerfile
+                extra-build-args: "--target phraseanet"
+                region: AWS_DEFAULT_REGION
+                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
+                tag: "alpha-0.1"
+            - aws-ecr/build_and_push_image:
+                account-url: AWS_ACCOUNT_URL
+                aws-access-key-id: AWS_ACCESS_KEY_ID
+                aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+                context: "AWS London"
+                create-repo: true
+                dockerfile: Dockerfile
+                extra-build-args: "--target phraseanet-nginx"
+                region: AWS_DEFAULT_REGION
+                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx"
+                tag: "alpha-0.1"

.gitignore

@@ -21,7 +21,7 @@
 !/config/configuration.sample.yml
 
 # Exclude generated proxies from doctrine2
-/resources/proxies
+#/resources/proxies
 
 # Exclude temporaries resources (zip files, quarantine documents etc ..) folder
 /tmp
@@ -69,3 +69,5 @@ grammar/jison-*
 pimple.json
 playbook.retry
 npm-debug.log
+
+/Phrasea_datas

AUTHORS

@@ -40,3 +40,4 @@ Phraseanet c/o Alchemy
 75009 Paris - France
 +33 1 53 20 43 80
 info@alchemy.fr
+

Dockerfile

@@ -0,0 +1,160 @@
+FROM php:7.0-fpm-stretch as builder
+
+RUN apt-get update \
+    && apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        gnupg2 \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends zlib1g-dev \
+        git \
+        ghostscript \
+        gpac \
+        imagemagick \
+        libav-tools \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg62-turbo-dev \
+        libmagickwand-dev \
+        libmcrypt-dev \
+        libpng-dev \
+        librabbitmq-dev \
+        libssl-dev \
+        libxslt-dev \
+        libzmq3-dev \
+        locales \
+        mcrypt \
+        swftools \
+        unoconv \
+        unzip \
+        xpdf \
+    && update-locale "LANG=fr_FR.UTF-8 UTF-8" \
+    && dpkg-reconfigure --frontend noninteractive locales \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install -j$(nproc) gd \
+    && docker-php-ext-install zip exif iconv mbstring pcntl sockets xsl intl pdo_mysql gettext bcmath mcrypt \
+    && pecl install redis amqp-1.9.3 zmq-beta imagick-beta \
+    && docker-php-ext-enable redis amqp zmq imagick \
+    && pecl clear-cache \
+    && docker-php-source delete \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php -r "if (hash_file('sha384', 'composer-setup.php') === '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+    && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
+    && php -r "unlink('composer-setup.php');"
+
+# Node Installation (node + yarn)
+# Reference :
+# https://linuxize.com/post/how-to-install-node-js-on-ubuntu-18.04/
+# https://yarnpkg.com/lang/en/docs/install/#debian-stable
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+    && apt install -y nodejs \
+    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update && apt-get install -y --no-install-recommends yarn \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/
+
+RUN mkdir /entrypoint /var/alchemy \
+    && useradd -u 1000 app \
+    && mkdir -p /home/app/.composer \
+    && chown -R app: /home/app /var/alchemy
+
+WORKDIR /var/alchemy/
+
+COPY gulpfile.js /var/alchemy/
+COPY Makefile /var/alchemy/
+COPY package.json /var/alchemy/
+COPY phpunit.xml.dist /var/alchemy/
+COPY yarn.lock /var/alchemy/
+COPY bin /var/alchemy/bin
+COPY composer.json /var/alchemy/
+COPY composer.lock /var/alchemy/
+RUN make install_composer
+COPY resources /var/alchemy/resources
+COPY www /var/alchemy/www
+RUN make clean_assets
+RUN make install_asset_dependencies
+RUN make install_assets
+
+ADD ./docker/phraseanet/ /
+COPY lib /var/alchemy/lib
+COPY tmp /var/alchemy/tmp
+COPY config /var/alchemy/config
+COPY grammar /var/alchemy/grammar
+COPY templates-profiler /var/alchemy/templates-profiler
+COPY templates /var/alchemy/templates
+COPY tests /var/alchemy/tests
+
+# Phraseanet
+FROM php:7.0-fpm-stretch as phraseanet
+RUN apt-get update \
+    && apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        gnupg2 \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends zlib1g-dev \
+        gettext \
+        git \
+        ghostscript \
+        gpac \
+        imagemagick \
+        libav-tools \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg62-turbo-dev \
+        libmagickwand-dev \
+        libmcrypt-dev \
+        libpng-dev \
+        librabbitmq-dev \
+        libssl-dev \
+        libxslt-dev \
+        libzmq3-dev \
+        locales \
+        mcrypt \
+        swftools \
+        unoconv \
+        unzip \
+        xpdf \
+    && update-locale "LANG=fr_FR.UTF-8 UTF-8" \
+    && dpkg-reconfigure --frontend noninteractive locales \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install -j$(nproc) gd \
+    && docker-php-ext-install zip exif iconv mbstring pcntl sockets xsl intl pdo_mysql gettext bcmath mcrypt \
+    && pecl install redis amqp-1.9.3 zmq-beta imagick-beta \
+    && docker-php-ext-enable redis amqp zmq imagick \
+    && pecl clear-cache \
+    && docker-php-source delete \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /entrypoint /var/alchemy \
+    && useradd -u 1000 app \
+    && mkdir -p /home/app/.composer \
+    && chown -R app: /home/app /var/alchemy
+
+COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet
+ADD ./docker/phraseanet/ /
+RUN mkdir -p /var/alchemy/Phraseanet/logs \
+    && chmod -R 777 /var/alchemy/Phraseanet/logs \
+    && mkdir -p /var/alchemy/Phraseanet/cache \
+    && chmod -R 777 /var/alchemy/Phraseanet/cache \
+    && mkdir -p /var/alchemy/Phraseanet/datas \
+    && chmod -R 777 /var/alchemy/Phraseanet/datas \
+    && mkdir -p /var/alchemy/Phraseanet/tmp \
+    && chmod -R 777 /var/alchemy/Phraseanet/tmp \
+    && mkdir -p /var/alchemy/Phraseanet/www/custom \
+    && chmod -R 777 /var/alchemy/Phraseanet/www/custom \
+    && mkdir -p /var/alchemy/Phraseanet/config \
+    && chmod -R 777 /var/alchemy/Phraseanet/config
+WORKDIR /var/alchemy/Phraseanet
+ENTRYPOINT ["/phraseanet-entrypoint.sh"]
+CMD ["/boot.sh"]
+
+# phraseanet-nginx
+FROM nginx:1.15 as phraseanet-nginx
+RUN useradd -u 1000 app
+ADD ./docker/nginx/ /
+COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www
+CMD ["/boot.sh"]

Dockerfile-debug

@@ -0,0 +1,18 @@
+ARG phraseanet
+FROM $phraseanet
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        iproute2 \
+    && rm -rf /var/lib/apt/lists/* \
+    && pecl install xdebug \
+    && docker-php-ext-enable xdebug \
+    && pecl clear-cache
+
+ADD ./docker/phraseanet-debug/ /
+
+RUN chmod +x /entrypoint.sh /usr/local/bin/docker-*
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["php-fpm"]

Makefile

@@ -8,18 +8,15 @@ install_composer:
 	composer install --ignore-platform-reqs
 
 install_asset_dependencies:
-	yarn upgrade 
+	yarn install
 	./node_modules/.bin/gulp build
 
 install_assets:
 	./node_modules/.bin/gulp install-assets
 
 clean_assets:
-	rm -rf ./node_modules
 	rm -rf ./www/assets
 	rm -Rf ./cache/*
-	mkdir ./node_modules
-	touch ./node_modules/.gitkeep
 
 config:
 	@php bin/console compile:configuration

README.md

@@ -1,4 +1,4 @@
-Phraseanet 4.0 - Digital Asset Management application
+Phraseanet 4.1 - Digital Asset Management application
 =====================================================
 
 [![CircleCI](https://circleci.com/gh/alchemy-fr/Phraseanet/tree/master.svg?style=shield)](https://circleci.com/gh/alchemy-fr/Phraseanet/tree/master)
@@ -9,7 +9,7 @@ Phraseanet 4.0 - Digital Asset Management application
  - RestFull APIS
  - Elasticsearch search engine
  - Multiple resolution assets generation
- 
+
 # Documentation :
 
 https://docs.phraseanet.com/
@@ -32,8 +32,9 @@ https://www.phraseanet.com/download/
 
 For development purpose Phraseanet is shipped with ready to use development environments using vagrant.
 
-- git clone 
+- git clone
-- vagrant up 
+- vagrant up
+
 
 For development with Phraseanet API see https://docs.phraseanet.com/4.0/en/Devel/index.html
 
@@ -42,3 +43,22 @@ For development with Phraseanet API see https://docs.phraseanet.com/4.0/en/Devel
 Phraseanet is licensed under GPL-v3 license.
 
 
+# Docker build
+
+WARNING : still in a work-in-progress status and can be used only for test purposes.
+
+The docker distribution come with 2 differents containers :
+* an nginx that act as the front http server.
+* the php-fpm who serves the php files through nginx.
+
+## How to build
+
+The two images can be built respectively with these two commands :
+
+    # nginx server
+    docker build --target phraseanet-nginx -t local/phraseanet-nginx .
+
+    # php-fpm application
+    docker build --target phraseanet -t local/phraseanet .
+
+

Vagrantfile

@@ -119,7 +119,14 @@ Vagrant.configure("2") do |config|
         ]
     end
 
-    config.vm.box = "ubuntu/trusty64"
+    # Switch between Phraseanet box and native trusty64
+    config.vm.box = "alchemy/Phraseanet-vagrant-dev"
+    #config.vm.box = "ubuntu/trusty64"
+
+    # In case, Phraseanet box, choose the php version
+    # For php 7.0 use box 0.0.1
+    # For php 7.1 use box 0.0.2
+    config.vm.box_version = "0.0.1"
 
     config.ssh.forward_agent = true
     config_net(config)

composer.json

@@ -47,7 +47,7 @@
     "php": ">=5.5.9",
     "ext-intl": "*",
     "alchemy-fr/tcpdf-clone": "~6.0",
-    "alchemy/embed-bundle": "^0.3.4",
+    "alchemy/embed-bundle": "^2.0.4",
     "alchemy/geonames-api-consumer": "~0.1.0",
     "alchemy/mediavorus": "^0.4.4",
     "alchemy/oauth2php": "1.1.0",
@@ -78,7 +78,6 @@
     "hoa/router": "~2.0",
     "igorw/get-in": "~1.0",
     "imagine/imagine": "0.6.x-dev",
-    "ircmaxell/random-lib": "~1.0",
     "jms/serializer": "~0.10",
     "jms/translation-bundle": "dev-rebase-2015-10-20",
     "justinrainbow/json-schema": "2.0.3 as 1.6.1",
@@ -120,10 +119,11 @@
     "alchemy/queue-bundle": "^0.1.5",
     "google/recaptcha": "^1.1",
     "facebook/graph-sdk": "^5.6",
-    "box/spout": "^2.7"
+    "box/spout": "^2.7",
+    "paragonie/random-lib": "^2.0"
   },
   "require-dev": {
-    "mikey179/vfsStream": "~1.5",
+    "mikey179/vfsstream": "~1.5",
     "phpunit/phpunit": "^4.8|^5.0"
   },
   "autoload": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "adf4074eb26ea80d414430d4f7b61311",
+    "content-hash": "a40bfa0aa6310530dc0c92b141b21305",
     "packages": [
         {
             "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
         },
         {
             "name": "alchemy/embed-bundle",
-            "version": "0.3.8",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/embed-bundle.git",
-                "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef"
+                "reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/8a9699bc51e2b2997ccfd357bb2892f3702c33ef",
+                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/b510748686c05c0c1d59b7ad15e2c1098abafc5a",
-                "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef",
+                "reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a",
                 "shasum": ""
             },
             "require-dev": {
@@ -178,10 +178,10 @@
             ],
             "description": "Embed resources bundle",
             "support": {
-                "source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.8",
+                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.4",
                 "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
             },
-            "time": "2019-01-11T10:35:41+00:00"
+            "time": "2019-06-03T13:35:50+00:00"
         },
         {
             "name": "alchemy/geonames-api-consumer",
@@ -3742,61 +3742,6 @@
             ],
             "time": "2014-11-20T16:49:30+00:00"
         },
-        {
-            "name": "ircmaxell/random-lib",
-            "version": "v1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ircmaxell/RandomLib.git",
-                "reference": "e9e0204f40e49fa4419946c677eccd3fa25b8cf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/RandomLib/zipball/e9e0204f40e49fa4419946c677eccd3fa25b8cf4",
-                "reference": "e9e0204f40e49fa4419946c677eccd3fa25b8cf4",
-                "shasum": ""
-            },
-            "require": {
-                "ircmaxell/security-lib": "^1.1",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^1.11",
-                "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": "^4.8|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "RandomLib": "lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Anthony Ferrara",
-                    "email": "ircmaxell@ircmaxell.com",
-                    "homepage": "http://blog.ircmaxell.com"
-                }
-            ],
-            "description": "A Library For Generating Secure Random Numbers",
-            "homepage": "https://github.com/ircmaxell/RandomLib",
-            "keywords": [
-                "cryptography",
-                "random",
-                "random-numbers",
-                "random-strings"
-            ],
-            "time": "2016-09-07T15:52:06+00:00"
-        },
         {
             "name": "ircmaxell/security-lib",
             "version": "v1.1.0",
@@ -4956,6 +4901,68 @@
             ],
             "time": "2016-11-28T09:17:04+00:00"
         },
+        {
+            "name": "paragonie/random-lib",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/RandomLib.git",
+                "reference": "b73a1cb8eae7a346824ccee42298046dedbf2415"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/RandomLib/zipball/b73a1cb8eae7a346824ccee42298046dedbf2415",
+                "reference": "b73a1cb8eae7a346824ccee42298046dedbf2415",
+                "shasum": ""
+            },
+            "require": {
+                "ircmaxell/security-lib": "^1.1",
+                "paragonie/random_compat": "^2",
+                "paragonie/sodium_compat": "^1.3",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^1.11",
+                "mikey179/vfsstream": "^1.6",
+                "phpunit/phpunit": "^4.8 || >=5.0.0 <5.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "RandomLib": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthony Ferrara",
+                    "email": "ircmaxell@ircmaxell.com",
+                    "homepage": "http://blog.ircmaxell.com"
+                },
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "A Library For Generating Secure Random Numbers",
+            "homepage": "https://github.com/ircmaxell/RandomLib",
+            "keywords": [
+                "cryptography",
+                "random",
+                "random-numbers",
+                "random-strings"
+            ],
+            "time": "2017-10-06T23:34:21+00:00"
+        },
         {
             "name": "paragonie/random_compat",
             "version": "v2.0.4",
@@ -5004,6 +5011,88 @@
             ],
             "time": "2016-11-07T23:38:38+00:00"
         },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v1.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": ">=1",
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^3|^4|^5"
+            },
+            "suggest": {
+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "time": "2019-03-20T17:19:05+00:00"
+        },
         {
             "name": "php-ffmpeg/php-ffmpeg",
             "version": "0.5.1",
@@ -5766,6 +5855,11 @@
         {
             "name": "roave/security-advisories",
             "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Roave/SecurityAdvisories.git",
+                "reference": "0698207bf8a9bed212fdde2d8c7cdc77085660c4"
+            },
             "conflict": {
                 "adodb/adodb-php": "<5.20.6",
                 "amphp/artax": ">=2,<2.0.4|>0.7.1,<1.0.4",
@@ -7653,12 +7747,12 @@
             "version": "v1.6.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mikey179/vfsStream.git",
+                "url": "https://github.com/bovigo/vfsStream.git",
                 "reference": "0247f57b2245e8ad2e689d7cee754b45fbabd592"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/0247f57b2245e8ad2e689d7cee754b45fbabd592",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/0247f57b2245e8ad2e689d7cee754b45fbabd592",
                 "reference": "0247f57b2245e8ad2e689d7cee754b45fbabd592",
                 "shasum": ""
             },
@@ -8342,6 +8436,7 @@
                 "mock",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2015-10-02T06:51:40+00:00"
         },
         {

config/configuration.sample.yml

@@ -8,6 +8,7 @@ main:
     key: ''
     api_require_ssl: true
     api_token_header: false
+    delete-account-require-email-confirmation: true
     database:
         host: 127.0.0.1
         port: 3306
@@ -90,7 +91,9 @@ main:
             client_secret: null
 border-manager:
     enabled: true
-    extension-mapping: { }
+    extension-mapping:
+        otc: application/vnd.oasis.opendocument.chart-template
+        ttc: application/x-font-ttf
     checkers:
         -
             type: Checker\Sha256
@@ -283,3 +286,7 @@ workers:
       user: guest
       password: guest
       vhost: /
+
+user_account:
+    deleting_policies:
+        email_confirmation: true

docker/nginx/boot.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cat nginx.conf.sample | sed "s/\$MAX_BODY_SIZE/$MAX_BODY_SIZE/g" > /etc/nginx/nginx.conf
+nginx -g "daemon off;"

docker/nginx/nginx.conf.sample

@@ -0,0 +1,85 @@
+user  app;
+worker_processes  auto;
+
+#error_log  /var/log/ngnix_error.log info;
+error_log /dev/stdout info;
+
+pid        /var/run/nginx.pid;
+#daemon off;
+
+events {
+    worker_connections  1024;
+    multi_accept on;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    server_tokens off;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /dev/stdout main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    reset_timedout_connection on;
+
+    proxy_connect_timeout  300s;
+    proxy_send_timeout  300s;
+    proxy_read_timeout  300s;
+    fastcgi_send_timeout 300s;
+    fastcgi_read_timeout 300;
+
+    resolver 127.0.0.11;
+
+    upstream backend {
+        server phraseanet:9000;
+    }
+
+    server {
+        listen       80;
+        server_name  localhost;
+        error_log    on;
+        access_log   on;
+        root         /var/alchemy/Phraseanet/www;
+
+        index        index.php;
+        client_max_body_size $MAX_BODY_SIZE;
+
+        location /api {
+            rewrite ^(.*)$ /api.php/$1 last;
+        }
+
+        location / {
+            # First attempt to serve request as file, then
+            # as directory, then fall back to index.html
+            try_files $uri $uri/ @rewriteapp;
+        }
+
+        location @rewriteapp {
+            rewrite ^(.*)$ /index.php/$1 last;
+        }
+
+        # PHP scripts -> PHP-FPM server listening on 127.0.0.1:9000
+        location ~ ^/(index|index_dev|api)\.php(/|$) {
+            fastcgi_pass   backend;
+            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+            include        fastcgi_params;
+        }
+
+        location ~ ^/(status|ping)$ {
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_index index.php;
+            include fastcgi_params;
+            fastcgi_pass backend;
+        }
+    }
+}

docker/phraseanet-debug/entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -z ${DOCKER_XDEBUG_ENABLED} ]; then
+    . usr-bin/docker-xdebug-enable
+fi
+
+exec "$@"

docker/phraseanet-debug/usr/bin/docker-get-host-ip

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/sbin/ip route|awk '/default/ { print $3 }'
+# TODO support MacOS & Windows host IP

docker/phraseanet-debug/usr/bin/docker-xdebug-disable

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+unset HOST_IP
+unset XDEBUG_CONFIG
+unset XDEBUG_REMOTE_HOST

docker/phraseanet-debug/usr/bin/docker-xdebug-enable

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+HOST_IP=$(docker-get-host-ip);
+
+export HOST_IP
+export XDEBUG_CONFIG="remote_enable=1 remote_host=${HOST_IP} idekey=PHPSTORM";
+export XDEBUG_REMOTE_HOST="${HOST_IP}";

docker/phraseanet/auto-install.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -xe
+
+/var/alchemy/Phraseanet/bin/setup system:install \
+    --email=$INSTALL_ACCOUNT_EMAIL \
+    --password=$INSTALL_ACCOUNT_PASSWORD \
+    --db-host=$INSTALL_DB_HOST \
+    --db-port=$INSTALL_DB_PORT \
+    --db-user=$INSTALL_DB_USER \
+    --db-password=$INSTALL_DB_PASSWORD \
+    --db-template=$INSTALL_DB_TEMPLATE \
+    --appbox=$INSTALL_APPBOX \
+    --databox=$INSTALL_DATABOX \
+    --server-name=$INSTALL_SERVER_NAME \
+    --data-path=/var/alchemy/Phraseanet/datas -y
+
+/var/alchemy/Phraseanet/bin/setup system:config set main.search-engine.options.host elasticsearch
+/var/alchemy/Phraseanet/bin/setup system:config set main.search-engine.options.minScore 2
+/var/alchemy/Phraseanet/bin/setup system:config set main.search-engine.options.base_aggregate_limit 10
+/var/alchemy/Phraseanet/bin/setup system:config set main.search-engine.options.collection_aggregate_limit 10
+/var/alchemy/Phraseanet/bin/setup system:config set main.search-engine.options.doctype_aggregate_limit 10
+
+## Redis
+/var/alchemy/Phraseanet/bin/setup system:config set main.cache.options.host redis
+/var/alchemy/Phraseanet/bin/setup system:config set main.cache.options.port 6379
+/var/alchemy/Phraseanet/bin/setup system:config set main.cache.options.domain $INSTALL_SERVER_NAME
+/var/alchemy/Phraseanet/bin/setup system:config set main.cache.type redis
+
+# RabbitMQ
+
+bin/setup system:config set rabbitmq.server.host rabbitmq
+bin/setup system:config set rabbitmq.server.port 5672
+bin/setup system:config set rabbitmq.server.user $INSTALL_RABBITMQ_USER
+bin/setup system:config set rabbitmq.server.password $INSTALL_RABBITMQ_PASSWORD
+bin/setup system:config set rabbitmq.server.vhost /
+
+
+/var/alchemy/Phraseanet/bin/console searchengine:index -c
+
+## enable API and disable ssl on it
+/var/alchemy/Phraseanet/bin/setup system:config set registry.api-clients.api-enabled true
+/var/alchemy/Phraseanet/bin/setup system:config set main.api_require_ssl false
+/var/alchemy/Phraseanet/bin/console compile:configuration

docker/phraseanet/boot.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+FILE=/var/alchemy/Phraseanet/config/configuration.yml
+if [ -f "$FILE" ]; then
+    echo "$FILE exist, skip setup."
+else
+    echo "$FILE doesn't exist, entering setup..."
+    runuser app -c '/auto-install.sh'
+fi
+
+php-fpm

docker/phraseanet/php-fpm.conf.sample

@@ -0,0 +1,125 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix (/usr/local). This prefix can be dynamically changed by using the
+; '-p' argument from the command line.
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+; Pid file
+; Note: the default prefix is /usr/local/var
+; Default Value: none
+;pid = run/php-fpm.pid
+
+; Error log file
+; If it's set to "syslog", log is sent to syslogd instead of being written
+; in a local file.
+; Note: the default prefix is /usr/local/var
+; Default Value: log/php-fpm.log
+error_log = /var/lib/phraseanet/logs/php-fpm.log
+
+; syslog_facility is used to specify what type of program is logging the
+; message. This lets syslogd specify that messages from different facilities
+; will be handled differently.
+; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
+; Default Value: daemon
+;syslog.facility = daemon
+
+; syslog_ident is prepended to every message. If you have multiple FPM
+; instances running on the same server, you can change the default value
+; which must suit common needs.
+; Default Value: php-fpm
+;syslog.ident = php-fpm
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+log_level = $PHP_LOG_LEVEL
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; The maximum number of processes FPM will fork. This has been design to control
+; the global number of processes when using dynamic PM within a lot of pools.
+; Use it with caution.
+; Note: A value of 0 indicates no limit
+; Default Value: 0
+; process.max = 128
+
+; Specify the nice(2) priority to apply to the master process (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool process will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+;daemonize = yes
+
+; Set open file descriptor rlimit for the master process.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit for the master process.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Specify the event mechanism FPM will use. The following is available:
+; - select     (any POSIX os)
+; - poll       (any POSIX os)
+; - epoll      (linux >= 2.5.44)
+; - kqueue     (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
+; - /dev/poll  (Solaris >= 7)
+; - port       (Solaris >= 10)
+; Default Value: not set (auto detection)
+;events.mechanism = epoll
+
+; When FPM is build with systemd integration, specify the interval,
+; in second, between health report notification to systemd.
+; Set to 0 to disable.
+; Available Units: s(econds), m(inutes), h(ours)
+; Default Unit: seconds
+; Default value: 10
+;systemd_interval = 10
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+; Relative path can also be used. They will be prefixed by:
+;  - the global prefix if it's been set (-p argument)
+;  - /usr/local otherwise
+include=etc/php-fpm.d/*.conf

docker/phraseanet/phraseanet-entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+envsubst < /php.ini.sample > /usr/local/etc/php/php.ini
+envsubst < /php-fpm.conf.sample > /usr/local/etc/php-fpm.conf
+
+docker-php-entrypoint $@

docker/phraseanet/usr/local/etc/php-fpm.d/www.conf.default

@@ -0,0 +1,380 @@
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or NONE) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = app
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions.
+;listen.group = app
+;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool processes will inherit the master process priority
+
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+; or group is differrent than the master process user. It allows to create proce
+ss
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following informations:
+;   pool                 - the name of the pool;
+;   process manager      - static, dynamic or ondemand;
+;   start time           - the date and time FPM has started;
+;   start since          - number of seconds since FPM has started;
+;   accepted conn        - the number of request accepted by the pool;
+;   listen queue         - the number of request in the queue of pending
+;                          connections (see backlog in listen(2));
+;   max listen queue     - the maximum number of requests in the queue
+;                          of pending connections since FPM has started;
+;   listen queue len     - the size of the socket queue of pending connections;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes;
+;   max active processes - the maximum number of active processes since FPM
+;                          has started;
+;   max children reached - number of times, the process limit has been reached,
+; Example output:
+;   pool:                 www
+;   process manager:      static
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          62636
+;   accepted conn:        190460
+;   listen queue:         0
+;   max listen queue:     1
+;   listen queue len:     42
+;   idle processes:       4
+;   active processes:     11
+;   total processes:      15
+;   max active processes: 12
+;   max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+; query string will also return status for each pool process.
+; Example:
+;   http://www.foo.bar/status?full
+;   http://www.foo.bar/status?json&full
+;   http://www.foo.bar/status?html&full
+;   http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+;   pid                  - the PID of the process;
+;   state                - the state of the process (Idle, Running, ...);
+;   start time           - the date and time the process has started;
+;   start since          - the number of seconds since the process has started;
+;   requests             - the number of requests the process has served;
+;   request duration     - the duration in µs of the requests;
+;   request method       - the request method (GET, POST, ...);
+;   request URI          - the request URI with the query string;
+;   content length       - the content length of the request (only with POST);
+;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
+;   script               - the main script called (or '-' if not set);
+;   last request cpu     - the %cpu the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          it's always 0 if the process is not in Idle state
+;                          because memory calculation is done when the request
+;                          processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+;   ************************
+;   pid:                  31330
+;   state:                Running
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          63087
+;   requests:             12808
+;   request duration:     1250261
+;   request method:       GET
+;   request URI:          /test_mem.php?N=10000
+;   content length:       0
+;   user:                 -
+;   script:               /home/fat/web/docs/php/test_mem.php
+;   last request cpu:     0.00
+;       It's available in: /usr/local/share/php/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+;  %%: the '%' character
+;  %C: %CPU used by the request
+;      it can accept the following format:
+;      - %{user}C for user CPU only
+;      - %{system}C for system CPU only
+;      - %{total}C  for user + system CPU (default)
+;  %d: time taken to serve the request
+;      it can accept the following format:
+;      - %{seconds}d (default)
+;      - %{miliseconds}d
+;      - %{mili}d
+;      - %{microseconds}d
+;      variable. Some exemples:
+;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+;  %f: script filename
+;  %l: content-length of the request (for POST request only)
+;  %m: request method
+;  %M: peak of memory allocated by PHP
+;      it can accept the following format:
+;      - %{bytes}M (default)
+;      - %{kilobytes}M
+;      - %{kilo}M
+;      - %{megabytes}M
+;      - %{mega}M
+;  %n: pool name
+;  %o: output header
+;      it must be associated with embraces to specify the name of the header:
+;      - %{Content-Type}o
+;      - %{X-Powered-By}o
+;      - %{Transfert-Encoding}o
+;      - ....
+;  %Q: the '?' character if query string exists
+;  %r: the request URI (without the query string, see %q and %Q)
+;  %R: remote IP address
+;  %s: status (response code)
+;  %t: server time the request was received
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %T: time the log has been written (the request has finished)
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr/local)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
+
+
+request_terminate_timeout=300s

docker/phraseanet/usr/local/etc/php-fpm.d/zz-docker.conf

@@ -0,0 +1,24 @@
+[global]
+daemonize = no
+error_log = /var/log/fpm-php.www.log
+process.max = 128
+
+[www]
+listen = 0.0.0.0:9000
+;listen = /sock/php-fpm.sock
+
+user = app
+group = app
+pm = dynamic
+pm.max_children = 9
+pm.start_servers = 3
+pm.min_spare_servers = 2
+pm.max_spare_servers = 4
+pm.max_requests = 1000
+
+request_terminate_timeout=300s
+
+pm.status_path = /status
+ping.path = /ping
+
+

lib/Alchemy/Phrasea/Application.php

@@ -92,9 +92,12 @@ use Alchemy\WorkerProvider\WorkerServiceProvider;
 use Doctrine\DBAL\Event\ConnectionEventArgs;
 use MediaVorus\Media\MediaInterface;
 use MediaVorus\MediaVorus;
+use Monolog\Handler\ErrorLogHandler;
 use Monolog\Handler\RotatingFileHandler;
+use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Neutron\ReCaptcha\ReCaptchaServiceProvider;
+use Psr\Log\LoggerInterface;
 use Silex\Application as SilexApplication;
 use Silex\Application\TranslationTrait;
 use Silex\Application\UrlGeneratorTrait;
@@ -253,6 +256,23 @@ class Application extends SilexApplication
         $this->register(new OrderServiceProvider());
         $this->register(new WebhookServiceProvider());
 
+        $this['monolog'] = $this->share(
+            $this->extend('monolog', function (LoggerInterface $logger, Application $app) {
+
+                $logger->pushHandler(new ErrorLogHandler(
+                    ErrorLogHandler::SAPI,
+                    Logger::ERROR
+                ));
+
+                $logger->pushHandler(new StreamHandler(
+                    fopen('php://stderr', 'w'),
+                    Logger::ERROR
+                ));
+
+                return $logger;
+            })
+        );
+
         $this['phraseanet.exception_handler'] = $this->share(function ($app) {
             /** @var PhraseaExceptionHandler $handler */
             $handler =  PhraseaExceptionHandler::register($app['debug']);

lib/Alchemy/Phrasea/CLI.php

@@ -73,9 +73,26 @@ class CLI extends Application
 
         $this->bindRoutes();
 
-        $this['logger'] = $this->extend('logger', function () {
+        $logger = false;
-            return new Console\Logger\ConsoleLogger(new Console\Output\ConsoleOutput(Console\Output\ConsoleOutput::VERBOSITY_DEBUG));
+
-        });
+        if ($this['configuration.store']->isSetup()){
+
+            $config = $this['configuration.store']->getConfig();
+
+            if ((isset($config['console_logger_enabled_environments']) && in_array($environment, $config['console_logger_enabled_environments']))){
+                $logger = true;
+            }
+        }
+
+        if ($environment == self::ENV_DEV){
+            $logger = true;
+        }
+
+        if ($logger){
+            $this['logger'] = $this->extend('logger', function () {
+                return new Console\Logger\ConsoleLogger(new Console\Output\ConsoleOutput(Console\Output\ConsoleOutput::VERBOSITY_DEBUG));
+            });
+        }
 
         error_reporting(-1);
         ErrorHandler::register();

lib/Alchemy/Phrasea/Collection/CollectionRepositoryRegistry.php

@@ -84,6 +84,15 @@ class CollectionRepositoryRegistry
         throw new \OutOfBoundsException('No repository available for given base [baseId: ' . $baseId . ' ].');
     }
 
+    public function getBaseIdMap()
+    {
+        if ($this->baseIdMap === null) {
+            $this->loadBaseIdMap();
+        }
+
+        return $this->baseIdMap;
+    }
+
     public function purgeRegistry()
     {
         $this->baseIdMap = null;

lib/Alchemy/Phrasea/Collection/CollectionService.php

@@ -319,7 +319,9 @@ class CollectionService
 
             $result = $userQuery->on_base_ids([ $reference->getBaseId()] )
                 ->who_have_right([\ACL::ORDER_MASTER])
-                ->execute()->get_results();
+                ->include_templates(true)
+                ->execute()
+                ->get_results();
 
             /** @var ACLProvider $acl */
             $acl = $this->app['acl'];

lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php

@@ -50,6 +50,7 @@ class CollectionController extends Controller
             $query = $this->createUserQuery();
             $admins = $query->on_base_ids([$bas_id])
                 ->who_have_right([\ACL::ORDER_MASTER])
+                ->include_templates(true)
                 ->execute()
                 ->get_results();
         }

lib/Alchemy/Phrasea/Controller/Admin/UserController.php

@@ -233,6 +233,7 @@ class UserController extends Controller
             ->who_have_right($have_right)
             ->who_have_not_right($have_not_right)
             ->on_base_ids($on_base)
+            ->include_templates(true)
             ->execute()
             ->get_results();
 

lib/Alchemy/Phrasea/Controller/Api/V1Controller.php

@@ -88,9 +88,10 @@ use Alchemy\Phrasea\Status\StatusStructure;
 use Alchemy\Phrasea\TaskManager\LiveInformation;
 use Alchemy\Phrasea\Utilities\NullableDateTime;
 use Doctrine\ORM\EntityManager;
-use JMS\TranslationBundle\Annotation\Ignore;
+use Guzzle\Http\Client as Guzzle;
 use League\Fractal\Resource\Item;
 use media_subdef;
+use Neutron\TemporaryFilesystem\TemporaryFilesystemInterface;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
@@ -905,19 +906,6 @@ class V1Controller extends Controller
 
     public function addRecordAction(Request $request)
     {
-        if (count($request->files->get('file')) == 0) {
-            return $this->getBadRequestAction($request, 'Missing file parameter');
-        }
-
-        $file = $request->files->get('file');
-        if (!$file instanceof UploadedFile) {
-            return $this->getBadRequestAction($request, 'You can upload one file at time');
-        }
-
-        if (!$file->isValid()) {
-            return $this->getBadRequestAction($request, 'Data corrupted, please try again');
-        }
-
         if (!$request->get('base_id')) {
             return $this->getBadRequestAction($request, 'Missing base_id parameter');
         }
@@ -930,16 +918,54 @@ class V1Controller extends Controller
             ))->createResponse();
         }
 
-        // Add file extension
+        if (count($request->files->get('file')) == 0) {
-        $uploadedFilename = $file->getRealPath();
+            if(count($request->get('url')) == 0) {
+                return $this->getBadRequestAction($request, 'Missing file parameter');
+            }
+            else {
+                // upload via url
+                $url = $request->get('url');
+                $pi = pathinfo($url);   // filename, extension
 
-        $renamedFilename = $file->getRealPath() . '.' . pathinfo($file->getClientOriginalName(), PATHINFO_EXTENSION);
+                /** @var TemporaryFilesystemInterface $tmpFs */
+                $tmpFs = $this->app['temporary-filesystem'];
+                $tempfile = $tmpFs->createTemporaryFile('download_', null, $pi['extension']);
 
-        $this->getFilesystem()->rename($uploadedFilename, $renamedFilename);
+                try {
+                    $guzzle = new Guzzle($url);
+                    $res = $guzzle->get("", [], ['save_to' => $tempfile])->send();
+                }
+                catch (\Exception $e) {
+                    return $this->getBadRequestAction($request, sprintf('Error "%s" downloading "%s"', $e->getMessage(), $url));
+                }
 
-        $media = $this->app->getMediaFromUri($renamedFilename);
+                if($res->getStatusCode() !== 200) {
+                    return $this->getBadRequestAction($request, sprintf('Error %s downloading "%s"', $res->getStatusCode(), $url));
+                }
 
-        $Package = new File($this->app, $media, $collection, $file->getClientOriginalName());
+                $originalName = $pi['filename'] . '.' . $pi['extension'];
+                $newPathname = $tempfile;
+            }
+        }
+        else {
+            // upload via file
+            $file = $request->files->get('file');
+            if (!$file instanceof UploadedFile) {
+                return $this->getBadRequestAction($request, 'You can upload one file at time');
+            }
+            if (!$file->isValid()) {
+                return $this->getBadRequestAction($request, 'Data corrupted, please try again');
+            }
+            $originalName = $file->getClientOriginalName();
+            $newPathname = $file->getPathname() . '.' . $file->getClientOriginalExtension();
+            if (false === rename($file->getPathname(), $newPathname)) {
+                return Result::createError($request, 403, 'Error while renaming file')->createResponse();
+            }
+        }
+
+        $media = $this->app->getMediaFromUri($newPathname);
+
+        $Package = new File($this->app, $media, $collection, $originalName);
 
         if ($request->get('status')) {
             $Package->addAttribute(new Status($this->app, $request->get('status')));

lib/Alchemy/Phrasea/Controller/PermalinkController.php

@@ -74,10 +74,10 @@ class PermalinkController extends AbstractDelivery
 
     public function deliverPermaview(Request $request, $sbas_id, $record_id, $subdef)
     {
-        return $this->doDeliverPermaview($sbas_id, $record_id, $request->query->get('token'), $subdef);
+        return $this->doDeliverPermaview($sbas_id, $record_id, $request->query->get('token'), $subdef, $request->query->get('t'));
     }
 
-    private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName)
+    private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName, $currentTime = null)
     {
         $databox = $this->findDataboxById($sbas_id);
         $record = $this->retrieveRecord($databox, $token, $record_id, $subdefName);
@@ -105,6 +105,7 @@ class PermalinkController extends AbstractDelivery
             'token'       => $token,
             'record'      => $record,
             'recordUrl'   => $information->getUrl(),
+            'currentTime' => $currentTime
         ]);
     }
 

lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php

@@ -38,7 +38,7 @@ class LazaretController extends Controller
      *
      * @param Request     $request The current request
      *
-     * @return Response
+     * @return String
      */
     public function listElement(Request $request)
     {

lib/Alchemy/Phrasea/Controller/Prod/QueryController.php

@@ -161,7 +161,33 @@ class QueryController extends Controller
             $result = $engine->query($query, $options);
 
             if ($this->getSettings()->getUserSetting($user, 'start_page') === 'LAST_QUERY') {
-                $userManipulator->setUserSetting($user, 'start_page_query', $query);
+                // try to save the "fulltext" query which will be restored on next session
+                try {
+                    // local code to find "FULLTEXT" value from jsonQuery
+                    $findFulltext = function($clause) use(&$findFulltext) {
+                        if(array_key_exists('_ux_zone', $clause) && $clause['_ux_zone']=='FULLTEXT') {
+                            return $clause['value'];
+                        }
+                        if($clause['type']=='CLAUSES') {
+                            foreach($clause['clauses'] as $c) {
+                                if(($r = $findFulltext($c)) !== null) {
+                                    return $r;
+                                }
+                            }
+                        }
+                        return null;
+                    };
+
+                    $userManipulator->setUserSetting($user, 'last_jsonquery', (string)$request->request->get('jsQuery'));
+
+                    $jsQuery = @json_decode((string)$request->request->get('jsQuery'), true);
+                    if(($ft = $findFulltext($jsQuery['query'])) !== null) {
+                        $userManipulator->setUserSetting($user, 'start_page_query', $ft);
+                    }
+                }
+                catch(\Exception $e) {
+                    // no-op
+                }
             }
 
             // log array of collectionIds (from $options) for each databox

lib/Alchemy/Phrasea/Controller/Prod/RecordController.php

@@ -90,35 +90,44 @@ class RecordController extends Controller
         }
         $recordCaptions["technicalInfo"] = $record->getPositionFromTechnicalInfos();
 
+        //  escape record title before rendering
+        $recordTitle = explode("</span>", $record->get_title());
+        if (count($recordTitle) >1) {
+            $recordTitle[1] = htmlspecialchars($recordTitle[1]);
+            $recordTitle = implode("</span>", $recordTitle);
+        } else {
+            $recordTitle = htmlspecialchars($record->get_title());
+        }
+
         return $this->app->json([
-            "desc"          => $this->render('prod/preview/caption.html.twig', [
+            "desc"            => $this->render('prod/preview/caption.html.twig', [
                 'record'        => $record,
                 'highlight'     => $query,
                 'searchEngine'  => $searchEngine,
                 'searchOptions' => $options,
             ]),
-            "recordCaptions"=> $recordCaptions,
+            "recordCaptions"  => $recordCaptions,
-            "html_preview"  => $this->render('common/preview.html.twig', [
+            "html_preview"    => $this->render('common/preview.html.twig', [
                 'record'        => $record
             ]),
-            "others"        => $this->render('prod/preview/appears_in.html.twig', [
+            "others"          => $this->render('prod/preview/appears_in.html.twig', [
                 'parents'       => $record->get_grouping_parents(),
                 'baskets'       => $record->get_container_baskets($this->getEntityManager(), $this->getAuthenticatedUser()),
             ]),
-            "current"       => $train,
+            "current"         => $train,
-            "record"        => $currentRecord,
+            "record"          => $currentRecord,
-            "history"       => $this->render('prod/preview/short_history.html.twig', [
+            "history"         => $this->render('prod/preview/short_history.html.twig', [
                 'record'        => $record,
             ]),
-            "popularity"    => $this->render('prod/preview/popularity.html.twig', [
+            "popularity"      => $this->render('prod/preview/popularity.html.twig', [
                 'record'        => $record,
             ]),
-            "tools"         => $this->render('prod/preview/tools.html.twig', [
+            "tools"           => $this->render('prod/preview/tools.html.twig', [
                 'record'        => $record,
             ]),
-            "pos"           => $record->getNumber(),
+            "pos"             => $record->getNumber(),
-            "title"         => $record->get_title(),
+            "title"           => $recordTitle,
-            "databox_name" => $record->getDatabox()->get_dbname(),
+            "databox_name"    => $record->getDatabox()->get_dbname(),
             "collection_name" => $record->getCollection()->get_name(),
             "collection_logo" => $record->getCollection()->getLogo($record->getBaseId(), $this->app),
         ]);

lib/Alchemy/Phrasea/Controller/Prod/UploadController.php

@@ -26,6 +26,7 @@ use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use DataURI\Exception\Exception as DataUriException;
 use DataURI\Parser;
+use Guzzle\Http\Client as Guzzle;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -76,6 +77,30 @@ class UploadController extends Controller
         ]);
     }
 
+    public function getHead(Request $request)
+    {
+        $response = [
+            'content-type' => null,
+            'content-length' => null,
+            'basename' => null
+        ];
+        try {
+            $url = $request->get('url');
+            $basename = pathinfo($url, PATHINFO_BASENAME);
+
+            $guzzle = new Guzzle($url);
+            $res = $guzzle->head("")->send();
+            $response['content-type'] = $res->getContentType();
+            $response['content-length'] = $res->getContentLength();
+            $response['basename'] = $basename;
+        }
+        catch (\Exception $e) {
+            // no-op : head will return no info but will not crash
+        }
+
+        return $this->app->json($response);
+    }
+
     /**
      * Upload processus
      *
@@ -98,7 +123,7 @@ class UploadController extends Controller
             'message' => '',
             'element' => '',
             'reasons' => [],
-            'id' => '',
+            'id'      => '',
         ];
 
         if (null === $request->files->get('files')) {
@@ -119,18 +144,44 @@ class UploadController extends Controller
             throw new AccessDeniedHttpException('User is not allowed to add record on this collection');
         }
 
+        /** @var UploadedFile $file */
         $file = current($request->files->get('files'));
 
         if (!$file->isValid()) {
             throw new BadRequestHttpException('Uploaded file is invalid');
         }
 
-        try {
+        if ($file->getClientOriginalName() === "blob" && $file->getClientMimeType() === "application/json") {
+
+            // a "upload by url" was done, we receive a tiny json that contains url.
+            $json = json_decode(file_get_contents($file->getRealPath()), true);
+            $url = $json['url'];
+            $pi = pathinfo($url);   // filename, extension
+
+            $tempfile = $this->getTemporaryFilesystem()->createTemporaryFile('download_', null, $pi['extension']);
+
+            try {
+                $guzzle = new Guzzle($url);
+                $res = $guzzle->get("", [], ['save_to' => $tempfile])->send();
+            }
+            catch (\Exception $e) {
+                throw new BadRequestHttpException(sprintf('Error "%s" downloading "%s"', $e->getMessage(), $url));
+            }
+
+            if($res->getStatusCode() !== 200) {
+                throw new BadRequestHttpException(sprintf('Error %s downloading "%s"', $res->getStatusCode(), $url));
+            }
+
+            $uploadedFilename = $renamedFilename = $tempfile;
+
+            $originalName = $pi['filename'] . '.' . $pi['extension'];
+
+        } else {
             // Add file extension, so mediavorus can guess file type for octet-stream file
             $uploadedFilename = $file->getRealPath();
             $renamedFilename = null;
 
-            if(!empty($this->app['conf']->get(['main', 'storage', 'tmp_files']))){
+            if(!empty($this->app['conf']->get(['main', 'storage', 'tmp_files']))) {
                 $tmpStorage = \p4string::addEndSlash($this->app['conf']->get(['main', 'storage', 'tmp_files'])).'upload/';
 
                 if(!is_dir($tmpStorage)){
@@ -139,12 +190,16 @@ class UploadController extends Controller
 
                 $renamedFilename = $tmpStorage. pathinfo($file->getRealPath(), PATHINFO_FILENAME) .'.' . pathinfo($file->getClientOriginalName(), PATHINFO_EXTENSION);
 
-            }else{
+            } else {
                 $renamedFilename = $file->getRealPath() . '.' . pathinfo($file->getClientOriginalName(), PATHINFO_EXTENSION);
             }
 
             $this->getFilesystem()->rename($uploadedFilename, $renamedFilename);
 
+            $originalName = $file->getClientOriginalName();
+        }
+
+        try {
             $media = $this->app->getMediaFromUri($renamedFilename);
             $collection = \collection::getByBaseId($this->app, $base_id);
 
@@ -153,7 +208,7 @@ class UploadController extends Controller
 
             $this->getEntityManager()->persist($lazaretSession);
 
-            $packageFile = new File($this->app, $media, $collection, $file->getClientOriginalName());
+            $packageFile = new File($this->app, $media, $collection, $originalName);
 
             $postStatus = $request->request->get('status');
 
@@ -184,7 +239,9 @@ class UploadController extends Controller
 
             $code = $this->getBorderManager()->process( $lazaretSession, $packageFile, $callback, $forceBehavior);
 
-            $this->getFilesystem()->rename($renamedFilename, $uploadedFilename);
+            if($renamedFilename !== $uploadedFilename) {
+                $this->getFilesystem()->rename($renamedFilename, $uploadedFilename);
+            }
 
             if (!!$forceBehavior) {
                 $reasons = [];

lib/Alchemy/Phrasea/Controller/Root/AccountController.php

@@ -17,20 +17,27 @@ use Alchemy\Phrasea\Application\Helper\EntityManagerAware;
 use Alchemy\Phrasea\Application\Helper\NotifierAware;
 use Alchemy\Phrasea\Authentication\Phrasea\PasswordEncoder;
 use Alchemy\Phrasea\Controller\Controller;
-use Alchemy\Phrasea\ControllerProvider\Root\Login;
 use Alchemy\Phrasea\Core\Configuration\RegistrationManager;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Form\Login\PhraseaRenewPasswordForm;
 use Alchemy\Phrasea\Model\Entities\ApiApplication;
 use Alchemy\Phrasea\Model\Entities\FtpCredential;
 use Alchemy\Phrasea\Model\Entities\Session;
+use Alchemy\Phrasea\Model\Entities\User;
 use Alchemy\Phrasea\Model\Manipulator\ApiAccountManipulator;
+use Alchemy\Phrasea\Model\Manipulator\ApiApplicationManipulator;
+use Alchemy\Phrasea\Model\Manipulator\BasketManipulator;
 use Alchemy\Phrasea\Model\Manipulator\TokenManipulator;
 use Alchemy\Phrasea\Model\Manipulator\UserManipulator;
 use Alchemy\Phrasea\Model\Repositories\ApiAccountRepository;
 use Alchemy\Phrasea\Model\Repositories\ApiApplicationRepository;
+use Alchemy\Phrasea\Model\Repositories\BasketRepository;
+use Alchemy\Phrasea\Model\Repositories\FeedPublisherRepository;
 use Alchemy\Phrasea\Model\Repositories\TokenRepository;
+use Alchemy\Phrasea\Model\Repositories\ValidationSessionRepository;
+use Alchemy\Phrasea\Notification\Mail\MailRequestAccountDelete;
 use Alchemy\Phrasea\Notification\Mail\MailRequestEmailUpdate;
+use Alchemy\Phrasea\Notification\Mail\MailSuccessAccountDelete;
 use Alchemy\Phrasea\Notification\Receiver;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -299,13 +306,102 @@ class AccountController extends Controller
         $manager = $this->getEventManager();
         $user = $this->getAuthenticatedUser();
 
+        $repo_baskets = $this->getBasketRepository();
+        $baskets = $repo_baskets->findActiveValidationAndBasketByUser($user);
+
+        $apiAccounts = $this->getApiAccountRepository()->findByUser($user);
+
+        $ownedFeeds = $this->getFeedPublisherRepository()->findBy(['user' => $user, 'owner' => true]);
+
+        $initiatedValidations = $this->getValidationSessionRepository()->findby(['initiator' => $user, ]);
+
         return $this->render('account/account.html.twig', [
-            'user'          => $user,
+            'user'                  => $user,
-            'evt_mngr'      => $manager,
+            'evt_mngr'              => $manager,
-            'notifications' => $manager->list_notifications_available($user),
+            'notifications'         => $manager->list_notifications_available($user),
+            'baskets'               => $baskets,
+            'api_accounts'          => $apiAccounts,
+            'owned_feeds'           => $ownedFeeds,
+            'initiated_validations' => $initiatedValidations,
         ]);
     }
 
+    /**
+     * @param Request $request
+     * @return RedirectResponse
+     */
+    public function processDeleteAccount(Request $request)
+    {
+        $user = $this->getAuthenticatedUser();
+
+        if($this->app['conf']->get(['user_account', 'deleting_policies', 'email_confirmation'])) {
+
+            // send email confirmation
+
+            try {
+                $receiver = Receiver::fromUser($user);
+            } catch (InvalidArgumentException $e) {
+                $this->app->addFlash('error', $this->app->trans('phraseanet::erreur: echec du serveur de mail'));
+
+                return $this->app->redirectPath('account');
+            }
+
+            $token = $this->getTokenManipulator()->createAccountDeleteToken($user, $user->getEmail());
+            $url = $this->app->url('account_confirm_delete', ['token' => $token->getValue()]);
+
+
+            $mail = MailRequestAccountDelete::create($this->app, $receiver);
+            $mail->setUserOwner($user);
+            $mail->setButtonUrl($url);
+            $mail->setExpiration($token->getExpiration());
+
+            $this->deliver($mail);
+
+            $this->app->addFlash('info', $this->app->trans('phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion'));
+
+            return $this->app->redirectPath('account');
+
+        } else {
+            $this->doDeleteAccount($user);
+
+            $response = $this->app->redirectPath('homepage', [
+                'redirect' => $request->query->get("redirect")
+            ]);
+
+            $response->headers->clearCookie('persistent');
+            $response->headers->clearCookie('last_act');
+
+            return $response;
+        }
+
+    }
+
+    public function confirmDeleteAccount(Request $request)
+    {
+        if (($tokenValue = $request->query->get('token')) !== null ) {
+            if (null === $token = $this->getTokenRepository()->findValidToken($tokenValue)) {
+                $this->app->addFlash('error', $this->app->trans('Token not found'));
+
+                return $this->app->redirectPath('account');
+            }
+
+            $user = $token->getUser();
+            // delete account and datas
+            $this->doDeleteAccount($user);
+
+            $this->getTokenManipulator()->delete($token);
+        }
+
+        $response = $this->app->redirectPath('homepage', [
+            'redirect' => $request->query->get("redirect")
+        ]);
+
+        $response->headers->clearCookie('persistent');
+        $response->headers->clearCookie('last_act');
+
+        return $response;
+    }
+
     /**
      * Update account information
      *
@@ -406,6 +502,49 @@ class AccountController extends Controller
         return $this->app->redirectPath('account');
     }
 
+    /**
+     * @param User $user
+     */
+    private function doDeleteAccount(User $user)
+    {
+        // basket
+        $repo_baskets = $this->getBasketRepository();
+        $baskets = $repo_baskets->findActiveByUser($user);
+        $this->getBasketManipulator()->removeBaskets($baskets);
+
+        // application
+        $applications = $this->getApiApplicationRepository()->findByUser($user);
+
+        $this->getApiApplicationManipulator()->deleteApiApplications($applications);
+
+
+        //  revoke access and delete phraseanet user account
+
+        $list = array_keys($this->app['repo.collections-registry']->getBaseIdMap());
+
+        $this->app->getAclForUser($user)->revoke_access_from_bases($list);
+
+        if ($this->app->getAclForUser($user)->is_phantom()) {
+            // send confirmation email: the account has been deleted
+
+            try {
+                $receiver = Receiver::fromUser($user);
+            } catch (InvalidArgumentException $e) {
+                $this->app->addFlash('error', $this->app->trans('phraseanet::erreur: echec du serveur de mail'));
+            }
+
+            $mail = MailSuccessAccountDelete::create($this->app, $receiver);
+
+            $this->app['manipulator.user']->delete($user);
+
+            $this->deliver($mail);
+        }
+
+        $this->getAuthenticator()->closeAccount();
+        $this->app->addFlash('info', $this->app->trans('phraseanet::account The account has been deleted'));
+
+    }
+
     /**
      * @return PasswordEncoder
      */
@@ -501,4 +640,44 @@ class AccountController extends Controller
     {
         return $this->app['events-manager'];
     }
+
+    /**
+     * @return BasketManipulator
+     */
+    private function getBasketManipulator()
+    {
+        return $this->app['manipulator.basket'];
+    }
+
+    /**
+     * @return BasketRepository
+     */
+    private function getBasketRepository()
+    {
+        return $this->app['repo.baskets'];
+    }
+
+    /**
+     * @return ApiApplicationManipulator
+     */
+    private function getApiApplicationManipulator()
+    {
+        return $this->app['manipulator.api-application'];
+    }
+
+    /**
+     * @return FeedPublisherRepository
+     */
+    private function getFeedPublisherRepository()
+    {
+        return $this->app['repo.feed-publishers'];
+    }
+
+    /**
+     * @return ValidationSessionRepository
+     */
+    private function getValidationSessionRepository()
+    {
+        return $this->app['repo.validation-session'];
+    }
 }

lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php

@@ -806,7 +806,7 @@ class ThesaurusController extends Controller
                         if (!$t) {
                             $t = "...";
                         }
-                        $fullBranch = " / " . $t . $fullBranch;
+                        $fullBranch = " / " . htmlspecialchars($t) . $fullBranch;
                     }
                 }
                 $nodes = $xpathstruct->query("/record/description/*");
@@ -1159,7 +1159,7 @@ class ThesaurusController extends Controller
             '1',
             null
         );
-        $fullpath = $dom->getElementsByTagName("fullpath_html")->item(0)->firstChild->nodeValue;
+        $fullpathHtml = $dom->getElementsByTagName("fullpath_html")->item(0)->firstChild->nodeValue;
         $hits = $dom->getElementsByTagName("allhits")->item(0)->firstChild->nodeValue;
 
         $languages = $synonyms = [];
@@ -1180,6 +1180,16 @@ class ThesaurusController extends Controller
             $languages[$lng_code[0]] = $language;
         }
 
+        //  Escape path  between span tag in fullpath_html
+        preg_match_all("'(<[^><]*>)(.*?)(<[^><]*>)'", $fullpathHtml, $matches, PREG_SET_ORDER);
+
+        $safeFullpath = '';
+        foreach($matches as $match) {
+            unset($match[0]);  // full match result not used
+            $match[2] = htmlspecialchars($match[2]);
+            $safeFullpath .= implode('', $match);
+        }
+
         return $this->render('thesaurus/properties.html.twig', [
             'typ' => $request->get('typ'),
             'bid' => $request->get('bid'),
@@ -1187,7 +1197,7 @@ class ThesaurusController extends Controller
             'id' => $request->get('id'),
             'dlg' => $request->get('dlg'),
             'languages' => $languages,
-            'fullpath' => $fullpath,
+            'fullpath' => $safeFullpath,
             'hits' => $hits,
             'synonyms' => $synonyms,
         ]);

lib/Alchemy/Phrasea/ControllerProvider/Prod/Upload.php

@@ -66,6 +66,9 @@ class Upload implements ControllerProviderInterface, ServiceProviderInterface
         $controllers->get('/html5-version/', 'controller.prod.upload:getHtml5UploadForm')
             ->bind('upload_html5_form');
 
+        $controllers->get('/head/', 'controller.prod.upload:getHead')
+            ->bind('upload_head');
+
         $controllers->post('/', 'controller.prod.upload:upload')
             ->bind('upload');
 

lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php

@@ -52,6 +52,14 @@ class Account implements ControllerProviderInterface, ServiceProviderInterface
         $controllers->get('/', 'account.controller:displayAccount')
             ->bind('account');
 
+        // allow to delete phraseanet account
+        $controllers->get('/delete/process', 'account.controller:processDeleteAccount')
+            ->bind('account_process_delete');
+
+        $controllers->get('/delete/confirm', 'account.controller:confirmDeleteAccount')
+            ->bind('account_confirm_delete');
+
+
         // Updates current logged in user account
         $controllers->post('/', 'account.controller:updateAccount')
             ->bind('submit_update_account');

lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php

@@ -41,7 +41,8 @@ class DisplaySettingService
         'css'                     => '000000',
         'start_page_query'        => '',
         'order_collection_by'     => self::ORDER_BY_ADMIN,
-        'start_page'              => 'QUERY',
+        'start_page'              => 'LAST_QUERY',
+        'last_jsonquery'          => '',
         'rollover_thumbnail'      => 'caption',
         'technical_display'       => '1',
         'doctype_display'         => '1',

lib/Alchemy/Phrasea/Core/Provider/RepositoriesServiceProvider.php

@@ -66,6 +66,9 @@ class RepositoriesServiceProvider implements ServiceProviderInterface
         $app['repo.validation-participants'] = $app->share(function (PhraseaApplication $app) {
             return $app['orm.em']->getRepository('Phraseanet:ValidationParticipant');
         });
+        $app['repo.validation-session'] = $app->share(function (PhraseaApplication $app) {
+            return $app['orm.em']->getRepository('Phraseanet:ValidationSession');
+        });
         $app['repo.story-wz'] = $app->share(function (PhraseaApplication $app) {
             return $app['orm.em']->getRepository('Phraseanet:StoryWZ');
         });

lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php

@@ -18,7 +18,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * @ORM\Table(name="ValidationSessions")
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Alchemy\Phrasea\Model\Repositories\ValidationSessionRepository")
  */
 class ValidationSession
 {

lib/Alchemy/Phrasea/Model/Manipulator/ApiApplicationManipulator.php

@@ -57,6 +57,14 @@ class ApiApplicationManipulator implements ManipulatorInterface
         $this->om->flush();
     }
 
+    public function deleteApiApplications(array $applications)
+    {
+        foreach ($applications as $application) {
+            $this->om->remove($application);
+        }
+        $this->om->flush();
+    }
+
     public function update(ApiApplication $application)
     {
         $this->om->persist($application);

lib/Alchemy/Phrasea/Model/Manipulator/BasketManipulator.php

@@ -118,4 +118,12 @@ class BasketManipulator
         $this->manager->remove($basket);
         $this->manager->flush();
     }
+
+    public function removeBaskets(array $baskets)
+    {
+        foreach ($baskets as $basket) {
+            $this->manager->remove($basket);
+        }
+        $this->manager->flush();
+    }
 }

lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php

@@ -26,6 +26,7 @@ class TokenManipulator implements ManipulatorInterface
     const TYPE_FEED_ENTRY = 'FEED_ENTRY';
     const TYPE_PASSWORD = 'password';
     const TYPE_ACCOUNT_UNLOCK = 'account-unlock';
+    const TYPE_ACCOUNT_DELETE = 'account-delete';
     const TYPE_DOWNLOAD = 'download';
     const TYPE_MAIL_DOWNLOAD = 'mail-download';
     const TYPE_EMAIL = 'email';
@@ -167,6 +168,16 @@ class TokenManipulator implements ManipulatorInterface
         return $this->create($user, self::TYPE_ACCOUNT_UNLOCK, new \DateTime('+3 days'));
     }
 
+    /**
+     * @param User $user
+     *
+     * @return Token
+     */
+    public function createAccountDeleteToken(User $user, $email)
+    {
+        return $this->create($user, self::TYPE_ACCOUNT_DELETE, new \DateTime('+1 hour'), $email);
+    }
+
     /**
      * @param User $user
      *

lib/Alchemy/Phrasea/Model/Repositories/ValidationSessionRepository.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Model\Repositories;
+
+use Doctrine\ORM\EntityRepository;
+
+/**
+ * ValidationSessionRepository
+ *
+ * This class was generated by the Doctrine ORM. Add your own custom
+ * repository methods below.
+ */
+class ValidationSessionRepository extends EntityRepository
+{
+}

lib/Alchemy/Phrasea/Notification/Mail/AbstractMail.php

@@ -17,6 +17,8 @@ use Alchemy\Phrasea\Notification\ReceiverInterface;
 
 abstract class AbstractMail implements MailInterface
 {
+    const MAIL_SKIN = 'default';
+
     /** @var Application */
     protected $app;
     /** @var EmitterInterface */
@@ -59,6 +61,7 @@ abstract class AbstractMail implements MailInterface
             'expiration'        => $this->getExpiration(),
             'buttonUrl'         => $this->getButtonURL(),
             'buttonText'        => $this->getButtonText(),
+            'mailSkin'          => $this->getMailSkin(),
         ]);
     }
 
@@ -166,6 +169,14 @@ abstract class AbstractMail implements MailInterface
         $this->url = $url;
     }
 
+    /**
+     * @return string
+     */
+    public function getMailSkin()
+    {
+        return self::MAIL_SKIN;
+    }
+
     /**
      * {@inheritdoc}
      */

lib/Alchemy/Phrasea/Notification/Mail/MailRequestAccountDelete.php

@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2016 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Notification\Mail;
+
+use Alchemy\Phrasea\Exception\LogicException;
+use Alchemy\Phrasea\Model\Entities\User;
+
+class MailRequestAccountDelete extends AbstractMailWithLink
+{
+    const MAIL_SKIN = 'warning';
+
+    /** @var User */
+    private $user;
+
+    /**
+     * Set the user owner
+     *
+     * @param User $userOwner
+     */
+    public function setUserOwner(User $userOwner)
+    {
+        $this->user = $userOwner;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSubject()
+    {
+        return $this->app->trans('Email:deletion:request:subject Delete account confirmation');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMessage()
+    {
+        if (!$this->user) {
+            throw new LogicException('You must set a user before calling getMessage');
+        }
+
+        return $this->app->trans("Email:deletion:request:message Hello %civility% %firstName% %lastName%.
+            We have received an account deletion request for your account on %urlInstance%, please confirm this deletion by clicking on the link below.
+            If you are not at the origin of this request, please change your password as soon as possible %resetPassword%
+            Link is valid for one hour.", [
+            '%civility%' => $this->getOwnerCivility(),
+            '%firstName%'=> $this->user->getFirstName(),
+            '%lastName%' => $this->user->getLastName(),
+            '%urlInstance%' => '<a href="'.$this->getPhraseanetURL().'">'.$this->getPhraseanetURL().'</a>',
+            '%resetPassword%' => '<a href="'.$this->app->url('reset_password').'">'.$this->app->url('reset_password').'</a>',
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonText()
+    {
+        return $this->app->trans('Email:deletion:request:textButton Delete my account');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonURL()
+    {
+        return $this->url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMailSkin()
+    {
+        return self::MAIL_SKIN;
+    }
+
+    private function getOwnerCivility()
+    {
+        if (!$this->user) {
+            throw new LogicException('You must set a user before calling getMessage');
+        }
+
+        $civilities = [
+            User::GENDER_MISS => 'Miss',
+            User::GENDER_MRS  => 'Mrs',
+            User::GENDER_MR   => 'Mr',
+        ];
+
+        if (array_key_exists($this->user->getGender(), $civilities)) {
+            return $civilities[$this->user->getGender()];
+        } else {
+            return '';
+        }
+    }
+}

lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccountDelete.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2016 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Notification\Mail;
+
+class MailSuccessAccountDelete extends AbstractMail
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getSubject()
+    {
+        return $this->app->trans('Delete account successfull');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMessage()
+    {
+        return $this->app->trans('Your phraseanet account on %urlInstance% has been deleted!', ['%urlInstance%' => '<a href="'.$this->getPhraseanetURL().'">'.$this->getPhraseanetURL().'</a>']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonText()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonURL()
+    {
+    }
+}

lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/QuotedTextNode.php

@@ -43,7 +43,7 @@ class QuotedTextNode extends Node
 
         $private_fields = $context->getPrivateFields();
         $private_fields = ValueChecker::filterByValueCompatibility($private_fields, $this->text);
-        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) {
+        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $private_field_query) {
             $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
         }
 

lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/RawNode.php

@@ -61,7 +61,7 @@ class RawNode extends Node
 
         $private_fields = $context->getPrivateFields();
         $private_fields = ValueChecker::filterByValueCompatibility($private_fields, $this->text);
-        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) {
+        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $private_field_query) {
             $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
         }
 

lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TermNode.php

@@ -19,9 +19,11 @@ class TermNode extends AbstractTermNode
             return $query;
         };
 
-        $query = $query_builder($context->getUnrestrictedFields());
+        $unrestricted_fields = $context->getUnrestrictedFields();
         $private_fields = $context->getPrivateFields();
-        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $concept_query) {
+        $query = $query_builder($unrestricted_fields);
+
+        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $concept_query) {
             $query = QueryHelper::applyBooleanClause($query, 'should', $concept_query);
         }
 

lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php

@@ -66,12 +66,11 @@ class TextNode extends AbstractTermNode implements ContextAbleInterface
             return $query;
         };
 
-        // Unrestricted fields
+        $unrestricted_fields = $context->getUnrestrictedFields();
-        $query = $query_builder($context->getUnrestrictedFields());
-
-        // Private fields
         $private_fields = $context->getPrivateFields();
-        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) {
+
+        $query = $query_builder($unrestricted_fields);
+        foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $unrestricted_fields, $query_builder) as $private_field_query) {
             $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
         }
 

lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php

@@ -619,6 +619,8 @@ class ElasticSearchEngine implements SearchEngineInterface
         foreach ($context->getHighlightedFields() as $field) {
             switch ($field->getType()) {
                 case FieldMapping::TYPE_STRING:
+                case FieldMapping::TYPE_DOUBLE:
+                case FieldMapping::TYPE_DATE:
                     $index_field = $field->getIndexField();
                     $raw_index_field = $field->getIndexField(true);
                     $highlighted_fields[$index_field . ".light"] = [
@@ -628,13 +630,10 @@ class ElasticSearchEngine implements SearchEngineInterface
                     ];
                     break;
                 case FieldMapping::TYPE_FLOAT:
-                case FieldMapping::TYPE_DOUBLE:
                 case FieldMapping::TYPE_INTEGER:
                 case FieldMapping::TYPE_LONG:
                 case FieldMapping::TYPE_SHORT:
                 case FieldMapping::TYPE_BYTE:
-                    continue;
-                case FieldMapping::TYPE_DATE:
                 default:
                     continue;
             }

lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php

@@ -127,20 +127,21 @@ class Fetcher
     private function getExecutedStatement()
     {
         if (!$this->statement) {
-            $sql = "SELECT r.record_id"
+            $sql =  "SELECT r.*, c.asciiname AS collection_name, subdef.width, subdef.height, subdef.size\n"
-                 . ", r.coll_id AS collection_id"
+                 . " FROM ((\n"
-                 . ", c.asciiname AS collection_name"
+                 . "     SELECT r.record_id, r.coll_id AS collection_id, r.uuid, r.status AS flags_bitfield, r.sha256,\n"
-                 . ", r.uuid"
+                 . "            r.originalname AS original_name, r.mime, r.type, r.parent_record_id,\n"
-                 . ", r.status AS flags_bitfield"
+                 . "            r.credate AS created_on, r.moddate AS updated_on, r.coll_id\n"
-                 . ", r.sha256" // -- TODO rename in "hash"
+                 . "     FROM record r\n"
-                 . ", r.originalname AS original_name"
+                 . "     -- WHERE\n"
-                 . ", r.mime, r.type, r.parent_record_id, r.credate AS created_on, r.moddate AS updated_on"
+                 . "     ORDER BY " . $this->options->getPopulateOrderAsSQL() . " " . $this->options->getPopulateDirectionAsSQL() . "\n"
-                 . ", subdef.width, subdef.height, subdef.size"
+                 . "     LIMIT :offset, :limit\n"
-                 . " FROM (record r INNER JOIN coll c ON (c.coll_id = r.coll_id))"
+                 . "   ) AS r\n"
-                 . " LEFT JOIN subdef ON subdef.record_id=r.record_id AND subdef.name='document'"
+                 . "   INNER JOIN coll c ON (c.coll_id = r.coll_id)\n"
-                 . " -- WHERE"
+                 . " )\n"
-                 . " ORDER BY " . $this->options->getPopulateOrderAsSQL() . " " . $this->options->getPopulateDirectionAsSQL()
+                 . " LEFT JOIN\n"
-                 . " LIMIT :offset, :limit";
+                 . " subdef ON subdef.record_id=r.record_id AND subdef.name='document'\n"
+                 . " ORDER BY " . $this->options->getPopulateOrderAsSQL() . " " . $this->options->getPopulateDirectionAsSQL() . "";
 
             $where = $this->delegate->buildWhereClause();
             $sql = str_replace('-- WHERE', $where, $sql);

lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/DoubleFieldMapping.php

@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of phrasea-4.0.
+ *
+ * (c) Alchemy <info@alchemy.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\SearchEngine\Elastic\Mapping;
+
+class DoubleFieldMapping extends ComplexFieldMapping
+{
+    /**
+     * @var bool
+     */
+    private $enableAnalysis = true;
+
+    /**
+     * @var string|null
+     */
+    private $analyzer = null;
+
+    /**
+     * @var string|null
+     */
+    private $termVector = null;
+
+    /**
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        parent::__construct($name, self::TYPE_DOUBLE);
+    }
+
+
+    public function disableAnalysis()
+    {
+        $this->enableAnalysis = false;
+
+        return $this;
+    }
+
+    public function enableAnalysis()
+    {
+        $this->enableAnalysis = true;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getProperties()
+    {
+        $properties = [];
+
+        if ($this->analyzer) {
+            $properties['analyzer'] = $this->analyzer;
+        }
+
+        if (! $this->enableAnalysis) {
+            $properties['index'] = 'not_analyzed';
+        }
+
+        if ($this->termVector) {
+            $properties['term_vector'] = $this->termVector;
+        }
+
+        return array_replace(parent::getProperties(), $properties);
+    }
+}

lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/FieldToFieldMappingConverter.php

@@ -19,28 +19,55 @@ class FieldToFieldMappingConverter
 
     public function convertField(Field $field, array $locales)
     {
-        if ($field->getType() === FieldMapping::TYPE_DATE) {
+        $ret = null;
-            return new DateFieldMapping($field->getName(), FieldMapping::DATE_FORMAT_CAPTION);
+        switch($field->getType()) {
+            case FieldMapping::TYPE_DATE:
+                $ret = new DateFieldMapping($field->getName(), FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION);
+                if (! $field->isFacet() && ! $field->isSearchable()) {
+                    $ret->disableIndexing();
+                }
+                else {
+                    $ret->addChild(
+                        (new StringFieldMapping('light'))
+                            ->setAnalyzer('general_light')
+                            ->enableTermVectors()
+                    );
+                }
+                break;
+
+            case FieldMapping::TYPE_STRING:
+                $ret = new StringFieldMapping($field->getName());
+                if (! $field->isFacet() && ! $field->isSearchable()) {
+                    $ret->disableIndexing();
+                }
+                else {
+                    $ret->addChild(
+                        (new StringFieldMapping('raw'))
+                            ->enableRawIndexing());
+                    $ret->addAnalyzedChildren($locales);
+                    $ret->enableTermVectors(true);
+                }
+                break;
+
+            case FieldMapping::TYPE_DOUBLE:
+                $ret = new DoubleFieldMapping($field->getName());
+                if (! $field->isFacet() && ! $field->isSearchable()) {
+                    $ret->disableIndexing();
+                }
+                else {
+                    $ret->addChild(
+                        (new StringFieldMapping('light'))
+                            ->setAnalyzer('general_light')
+                            ->enableTermVectors()
+                    );
+                }
+                break;
+
+            default:
+                $ret = new FieldMapping($field->getName(), $field->getType());
+                break;
         }
 
-        if ($field->getType() === FieldMapping::TYPE_STRING) {
+        return $ret;
-            $fieldMapping = new StringFieldMapping($field->getName());
-
-            if (! $field->isFacet() && ! $field->isSearchable()) {
-                $fieldMapping->disableIndexing();
-            } else {
-                $fieldMapping->addChild((new StringFieldMapping('raw'))->enableRawIndexing());
-
-                $child = new CompletionFieldMapping('suggest');
-                $fieldMapping->addChild($child);
-
-                $fieldMapping->addAnalyzedChildren($locales);
-                $fieldMapping->enableTermVectors(true);
-            }
-
-            return $fieldMapping;
-        }
-
-        return new FieldMapping($field->getName(), $field->getType());
     }
 }

lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryContext.php

@@ -107,13 +107,28 @@ class QueryContext
      */
     public function localizeField(Field $field)
     {
+        $ret = null;
         $index_field = $field->getIndexField();
 
-        if ($field->getType() === FieldMapping::TYPE_STRING) {
+        switch($field->getType()) {
-            return $this->localizeFieldName($index_field);
+            case FieldMapping::TYPE_STRING:
-        } else {
+                $ret = $this->localizeFieldName($index_field);
-            return [$index_field];
+                break;
+
+            case FieldMapping::TYPE_DATE:
+            case FieldMapping::TYPE_DOUBLE:
+                $ret = [
+                    $index_field . '.light',
+                    $index_field
+                ];
+                break;
+
+            default:
+                $ret = [$index_field];
+                break;
         }
+
+        return $ret;
     }
 
     private function localizeFieldName($field)

lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryHelper.php

@@ -10,13 +10,13 @@ class QueryHelper
 {
     private function __construct() {}
 
-    public static function wrapPrivateFieldQueries(array $fields, \Closure $query_builder)
+    public static function wrapPrivateFieldQueries(array $private_fields, array $unrestricted_fields, \Closure $query_builder)
     {
         // We make a boolean clause for each collection set to shrink query size
         // (instead of a clause for each field, with his collection set)
         $fields_map = [];
         $collections_map = [];
-        foreach ($fields as $field) {
+        foreach ($private_fields as $field) {
             $collections = $field->getDependantCollections();
             $hash = self::hashCollections($collections);
             $collections_map[$hash] = $collections;
@@ -31,7 +31,7 @@ class QueryHelper
         foreach ($fields_map as $hash => $fields) {
             // Right to query on a private field is dependant of document collection
             // Here we make sure we can only match on allowed collections
-            $query = $query_builder($fields);
+            $query = $query_builder(array_merge($fields, $unrestricted_fields));
             if ($query !== null) {
                 $queries[] = self::restrictQueryToCollections($query, $collections_map[$hash]);
             }

lib/Alchemy/Phrasea/SearchEngine/Elastic/Structure/ValueChecker.php

@@ -30,14 +30,14 @@ class ValueChecker
                 case FieldMapping::TYPE_LONG:
                 case FieldMapping::TYPE_SHORT:
                 case FieldMapping::TYPE_BYTE:
-                    if ($is_numeric) {
+//                    if ($is_numeric) {
                         $filtered[] = $item;
-                    }
+//                    }
                     break;
                 case FieldMapping::TYPE_DATE:
-                    if ($is_valid_date) {
+//                    if ($is_valid_date) {
                         $filtered[] = $item;
-                    }
+//                    }
                     break;
                 case FieldMapping::TYPE_STRING:
                 default:

lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php

@@ -43,7 +43,7 @@ class SubdefsEditor extends AbstractEditor
 <?xml version="1.0" encoding="UTF-8"?>
 <tasksettings>
   <embedded>1</embedded>
-  <sbas/>
+  <sbas>0</sbas>
   <type_image>1</type_image>
   <type_video>1</type_video>
   <type_audio>1</type_audio>

lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php

@@ -26,6 +26,7 @@ use PHPExiftool\Driver\Metadata\Metadata;
 use PHPExiftool\Driver\Value\Mono as MonoValue;
 use Symfony\Component\Filesystem\Exception\IOException;
 
+
 class ArchiveJob extends AbstractJob
 {
     const MINCOLD = 5;
@@ -69,6 +70,10 @@ class ArchiveJob extends AbstractJob
     protected function doJob(JobData $data)
     {
         $app = $data->getApplication();
+
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+
         $task = $data->getTask();
 
         $settings = simplexml_load_string($task->getSettings());
@@ -82,6 +87,9 @@ class ArchiveJob extends AbstractJob
 
         $databox = $app->findDataboxById($sbasId);
 
+        // quick fix to reconnect if mysql is lost
+        $databox->get_connection();
+
         $TColls = [];
         $collection = null;
         foreach ($databox->get_collections() as $coll) {
@@ -561,6 +569,10 @@ class ArchiveJob extends AbstractJob
 
     private function archive(Application $app, \databox $databox, \DOMDOcument $dom, \DOMElement $node, $path, $path_archived, $path_error, $depth, $moveError, $moveArchived, $stat0, $stat1)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $databox->get_connection();
+
         if ($node->getAttribute('temperature') == 'hot') {
             return;
         }
@@ -819,6 +831,10 @@ class ArchiveJob extends AbstractJob
 
     private function archiveGrp(Application $app, \databox $databox, \DOMDocument $dom, \DOMElement $node, $path, $path_archived, $path_error, array &$nodesToDel, $moveError, $moveArchived, $stat0, $stat1)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $databox->get_connection();
+
         $xpath = new \DOMXPath($dom);
 
         // grp folders stay in place
@@ -983,6 +999,10 @@ class ArchiveJob extends AbstractJob
 
     public function createStory(Application $app, \collection $collection, $pathfile, $captionFile, $stat0, $stat1)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $databox->get_connection();
+
         $status = \databox_status::operation_or($stat0, $stat1);
 
         $media = $app->getMediaFromUri($pathfile);
@@ -1031,6 +1051,10 @@ class ArchiveJob extends AbstractJob
      */
     public function createRecord(Application $app, \collection $collection, $pathfile, $captionFile, $grp_rid, $force, $stat0, $stat1)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $collection->get_connection();
+
         $status = \databox_status::operation_or($stat0, $stat1);
 
         $media = $app->getMediaFromUri($pathfile);
@@ -1096,6 +1120,10 @@ class ArchiveJob extends AbstractJob
      */
     private function archiveFilesToGrp(Application $app, \databox $databox, \DOMDocument $dom, \DOMElement $node, $path, $path_archived, $path_error, $grp_rid, $stat0, $stat1, $moveError, $moveArchived)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $databox->get_connection();
+
         $nodesToDel = [];
         for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
             if (!$this->isStarted()) {
@@ -1133,6 +1161,10 @@ class ArchiveJob extends AbstractJob
      */
     private function archiveFile(Application $app, \databox $databox, \DOMDocument $dom, \DOMElement $node, $path, $path_archived, $path_error, array &$nodesToDel, $grp_rid, $stat0, $stat1, $moveError, $moveArchived)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $databox->get_connection();
+
         $match = $node->getAttribute('match');
 
         if ($match == '*') {
@@ -1187,6 +1219,10 @@ class ArchiveJob extends AbstractJob
      */
     private function archiveFileAndCaption(Application $app, \databox $databox, \DOMDocument $dom, \DOMElement $node, \DOMElement $captionFileNode = null, $path, $path_archived, $path_error, $grp_rid, array &$nodesToDel, $stat0, $stat1, $moveError, $moveArchived)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+        $databox->get_connection();
+
         $file = $node->getAttribute('name');
         $cid = $node->getAttribute('cid');
         $captionFileName = $captionFileNode ? $captionFileNode->getAttribute('name') : null;
@@ -1360,6 +1396,9 @@ class ArchiveJob extends AbstractJob
      */
     protected function getLazaretSession(Application $app)
     {
+        // quick fix to reconnect if mysql is lost
+        $app->getApplicationBox()->get_connection();
+
         $lazaretSession = new LazaretSession();
 
         $app['orm.em']->persist($lazaretSession);

lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php

@@ -70,12 +70,13 @@ class SubdefsJob extends AbstractJob
 
         $app->getApplicationBox()->get_connection();
 
+        $allDb = count($settings->xpath('sbas[text()="0"]')) > 0;
         foreach ($app->getDataboxes() as $databox) {
             if (!$this->isStarted()) {
                 break;
             }
 
-            if(count($settings->xpath("sbas[text()=".$databox->get_sbas_id() ."]")) == 0) {
+            if(!$allDb && count($settings->xpath("sbas[text()=".$databox->get_sbas_id() ."]")) == 0) {
                 continue;
             }
 

lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php

@@ -88,7 +88,7 @@ class PhraseanetExtension extends \Twig_Extension
             $highlightValue = $highlights[$field];
 
             // if field is multivalued, merge highlighted values with captions ones
-            if (is_array($value)) {
+            if (is_array($value) && count($value) > 1) {
                 $highlightValue = array_merge($highlightValue, array_diff($value, array_map(function($value) {
                     return str_replace(array('[[em]]', '[[/em]]'), array('', ''), $value);
                 }, $highlightValue)));

lib/classes/patch/380alpha3a.php

@@ -50,6 +50,21 @@ class patch_380alpha3a extends patchAbstract
     {
         $conn = $databox->get_connection();
 
+        $sql = "CREATE TABLE IF NOT EXISTS `log_colls` (\n"
+            . " `id` int(11) unsigned NOT NULL AUTO_INCREMENT,\n"
+            . " `log_id` int(11) unsigned NOT NULL,\n"
+            . " `coll_id` int(11) unsigned NOT NULL,\n"
+            . " PRIMARY KEY (`id`),\n"
+            . " UNIQUE KEY `couple` (`log_id`,`coll_id`),\n"
+            . " KEY `log_id` (`log_id`),\n"
+            . " KEY `coll_id` (`coll_id`)\n"
+            . ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
+
+        $stmt = $conn->prepare($sql);
+        $stmt->execute();
+        $stmt->closeCursor();
+        unset($stmt);
+
         $removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
 
         $stmt = $conn->prepare($removeProc);

lib/classes/patch/410alpha13a.php

@@ -60,8 +60,14 @@ class patch_410alpha13a implements patchInterface
      */
     public function apply(base $databox, Application $app)
     {
+        // @see : https://phraseanet.atlassian.net/browse/PHRAS-2468
+        // to be able to migrate from 3.5 to 4.0.8, we must not delete the table anymore
+        // so the cli "bin/setup patch:log_coll_id" can be executed.
+
+        /*
         $sql = "DROP TABLE IF EXISTS `log_colls`";
         $databox->get_connection()->prepare($sql)->execute();
+        */
 
         /*
          * no need to do those ops, it's done by system:upgrade after fixing the xml scheme

lib/conf.d/configuration.yml

@@ -1,6 +1,10 @@
 servername: 'http://local.phrasea/'
 languages:
-    available: []
+    available:
+        - fr
+        - en
+        - de
+        - nl
     default: 'fr'
 main:
     maintenance: false
@@ -23,10 +27,33 @@ main:
         options: {}
     search-engine:
         type: elasticsearch
-        # type: phrasea
         options:
-            host: localhost
+            host: 'localhost'
             port: 9200
+            index: ''
+            shards: 3
+            replicas: 0
+            minScore: 2
+            highlight: true
+            maxResultWindow: 500000
+            populate_order: RECORD_ID
+            populate_direction: DESC
+            activeTab: '#elastic-search'
+            base_aggregate_limit: 10
+            collection_aggregate_limit: 10
+            doctype_aggregate_limit: 0
+            camera_model_aggregate_limit: 0
+            iso_aggregate_limit: 0
+            aperture_aggregate_limit: 0   
+            shutterspeed_aggregate_limit: 0
+            flashfired_aggregate_limit: 0
+            framerate_aggregate_limit: 0
+            audiosamplerate_aggregate_limit: 0
+            videocodec_aggregate_limit: 0
+            audiocodec_aggregate_limit: 0
+            orientation_aggregate_limit: 0
+            colorspace_aggregate_limit: 0
+            mimetype_aggregate_limit: 0
     task-manager:
         status: started
         enabled: true
@@ -67,26 +94,20 @@ main:
         download: null
         lazaret: null
         caption: null
-    bridge:
+
-        youtube:
-            enabled: false
-            client_id: null
-            client_secret: null
-            developer_key: null
-        flickr:
-            enabled: false
-            client_id: null
-            client_secret: null
-        dailymotion:
-            enabled: false
-            client_id: null
-            client_secret: null
 trusted-proxies: []
 debugger:
     allowed-ips: []
 border-manager:
     enabled: true
-    extension-mapping: { }
+    extension-mapping:
+        otc: application/vnd.oasis.opendocument.chart-template
+        ttc: application/x-font-ttf
+        xlsx: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+        docx: application/msword
+        pptx: application/vnd.ms-powerpoint
+        mxf: application/mxf
+        mp4: video/mp4
     checkers:
         -
             type: Checker\Sha256
@@ -120,6 +141,9 @@ border-manager:
             enabled: false
             options:
                 mediatypes: [Audio, Document, Flash, Image, Video]
+user_account:
+    deleting_policies:
+        email_confirmation: true
 authentication:
     auto-create:
         templates: {  }
@@ -201,8 +225,9 @@ embed_bundle:
     video:
         player: videojs
         autoplay: false
-        coverSubdef: thumbnail
+        cover_subdef: thumbnail
-        available-speeds:
+        message_start: StartOfMessage
+        available_speeds:
             - 1
             - 1.5
             - 3
@@ -210,33 +235,68 @@ embed_bundle:
         player: videojs
         autoplay: false
     document:
-        player: flexpaper
+        #player: flexpaper
-        enable-pdfjs: true
+        enable_pdfjs: true
 geocoding-providers:
     -
-        name: 'mapBox'
+        map-provider: 'mapboxWebGL'
         enabled: true
         public-key: ''
+        map-layers:
+            -
+                name: Light
+                value: 'mapbox://styles/mapbox/light-v9'
+            -
+                name: Streets
+                value: 'mapbox://styles/mapbox/streets-v9'
+            -
+                name: Basic
+                value: 'mapbox://styles/mapbox/basic-v9'
+            -
+                name: Satellite
+                value: 'mapbox://styles/mapbox/satellite-v9'
+            -
+                name: Dark
+                value: 'mapbox://styles/mapbox/dark-v9'
+        transition-mapboxgl:
+            -
+                animate: true
+                speed: '2.2'
+                curve: '1.42'
         default-position:
             - 2.335062
             - 48.879162
         default-zoom: 2
         marker-default-zoom: 11
-        position-fields:
+        position-fields: []
-            -
+            #-
-                name: GpsCompositePosition
+            #   name: GpsCompositePosition
-                type: latlng
+            #   type: latlng
             # -
             #    name: Longitude
             #    type: lng
             # -
             #    name: Latitude
             #    type: lat
+        geonames-field-mapping: true
+        cityfields: 'City, Ville'
+        provincefields: Province
+        countryfields: 'Country, Pays'
 video-editor:
     vttFieldName: VideoTextTrackChapters
-    seekBackwardStep: 1000 # in ms
+    seekBackwardStep: 500 # in ms
-    seekForwardStep: 1000  # in ms
+    seekForwardStep: 500  # in ms
     playbackRates:
         - 1
         - '1.5'
         - 3
+rabbitmq:
+    server:
+        host: localhost
+        port: 5672
+        user: ''
+        password: ''
+        vhost: /
+        
+Console_logger_enabled_environments: [test]
+

lib/conf.d/data_templates/DublinCore.xml

@@ -182,26 +182,26 @@
     </subdefs>
 
     <description>
-        <Title src="XMP-dc:Title" thumbtitle="1" report="1" />
+        <Title src="XMP-dc:Title" type="string" thumbtitle="1" report="1" />
-        <Creator src="XMP-dc:Creator" report="1" />
+        <Creator src="XMP-dc:Creator" type="string" report="1" />
-        <Subject src="XMP-dc:Subject" multi="1"/>
+        <Subject src="XMP-dc:Subject" type="string" multi="1"/>
-        <Description src="XMP-dc:Description" report="0" />
+        <Description src="XMP-dc:Description" type="string" report="0" />
         <Publisher src="XMP-dc:Publisher" type="date" report="0" />
-        <Contributor src="XMP-dc:Contributor" report="0"/>
+        <Contributor src="XMP-dc:Contributor" type="string" report="0"/>
         <Date src="XMP-dc:Date" type="date" report="0" />
-        <Type src="XMP-dc:Type" report="1" />
+        <Type src="XMP-dc:Type" type="string" report="1" />
-        <Format src="XMP-dc:Format" report="0" />
+        <Format src="XMP-dc:Format" type="string" report="0" />
-        <Identifier src="XMP-dc:Identifier" report="1" />
+        <Identifier src="XMP-dc:Identifier" type="string" report="1" />
-        <Source src="XMP-dc:Source" report="0" />
+        <Source src="XMP-dc:Source" type="string" report="0" />
-        <Language src="XMP-dc:Language" report="0" />
+        <Language src="XMP-dc:Language" type="string" report="0" />
-        <Relation src="XMP-dc:Relation" report="0" />
+        <Relation src="XMP-dc:Relation" type="string" report="0" />
-        <Coverage src="XMP-dc:Coverage" report="1" />
+        <Coverage src="XMP-dc:Coverage" type="string" report="1" />
-        <Rights src="XMP-dc:Rights" report="0" />
+        <Rights src="XMP-dc:Rights" type="string" report="0" />
-        <Comments src="" business="1" report="0" />
+        <Comments src="" business="1" type="string" report="0" />
         <Filename src="Phraseanet:tf-basename" readonly="1" type="string" report="1"/>
-        <CameraDevice src="IFD0:Model" readonly="1" report="0" />
+        <CameraDevice src="IFD0:Model" type="string" readonly="1" report="0" />
-        <Latitude src="GPS:GPSLatitude" readonly="1" report="0" />
+        <Latitude src="GPS:GPSLatitude" type="number" readonly="1" report="0" />
-        <Longitude src="GPS:GPSLongitude" readonly="1" report="0"/>
+        <Longitude src="GPS:GPSLongitude"  type="number" readonly="1" report="0"/>
         <ArchiveDate src="Phraseanet:tf-archivedate" readonly="1" type="date" report="0" />
         <LastEditDate src="Phraseanet:tf-editdate" readonly="1" type="date" report="0" />
     </description>

lib/conf.d/data_templates/en-simple.xml

@@ -182,27 +182,27 @@
     </subdefs>
 
     <description>
-        <Object src="IPTC:ObjectName" />
+        <Object src="IPTC:ObjectName" type="string"/>
-        <Category src="IPTC:Category"/>
+        <Category src="IPTC:Category" type="string"/>
-        <SupplCategory src="IPTC:SupplementalCategories" multi="1"/>
+        <SupplCategory src="IPTC:SupplementalCategories" type="string" multi="1"/>
-        <Keywords src="IPTC:Keywords" multi="1"/>
+        <Keywords src="IPTC:Keywords" type="string" multi="1"/>
-        <SpecialInstruct src="IPTC:SpecialInstructions"/>
+        <SpecialInstruct src="IPTC:SpecialInstructions" type="string"/>
         <Date src="IPTC:DateCreated" type="date" />
-        <Byline src="IPTC:By-line"/>
+        <Byline src="IPTC:By-line" type="string"/>
-        <BylineTitle src="IPTC:By-lineTitle"/>
+        <BylineTitle src="IPTC:By-lineTitle" type="string"/>
-        <City src="IPTC:City" />
+        <City src="IPTC:City" type="string"/>
-        <Province src="IPTC:Province-State" />
+        <Province src="IPTC:Province-State" type="string"/>
-        <Country src="IPTC:Country-PrimaryLocationName" />
+        <Country src="IPTC:Country-PrimaryLocationName" type="string"/>
-        <OriginalRef src="IPTC:OriginalTransmissionReference" />
+        <OriginalRef src="IPTC:OriginalTransmissionReference" type="string"/>
-        <Headline src="IPTC:Headline" report="1" thumbtitle="1" />
+        <Headline src="IPTC:Headline" type="string" report="1" thumbtitle="1"/>
-        <Credit src="IPTC:Credit" report="1" />
+        <Credit src="IPTC:Credit" type="string" report="1"/>
-        <Source src="IPTC:Source" />
+        <Source src="IPTC:Source" type="string"/>
-        <Caption src="IPTC:Caption-Abstract" />
+        <Caption src="IPTC:Caption-Abstract" type="string"/>
-        <CaptionWriter src="IPTC:Writer-Editor" />
+        <CaptionWriter src="IPTC:Writer-Editor" type="string"/>
-        <Longitude src="GPS:GPSLongitude" readonly="1"/>
+        <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
-        <Latitude src="GPS:GPSLatitude" readonly="1"/>
+        <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
-        <CameraModel src="IFD0:Model" readonly="1"/>
+        <CameraModel src="IFD0:Model" type="string" readonly="1"/>
-        <FileName src="Phraseanet:tf-basename" readonly="1" type="string" />
+        <FileName src="Phraseanet:tf-basename" type="string" readonly="1"/>
     </description>
 
     <statbits>

lib/conf.d/data_templates/fr-simple.xml

@@ -182,27 +182,27 @@
     </subdefs>
 
     <description>
-        <Objet src="IPTC:ObjectName" />
+        <Objet src="IPTC:ObjectName" type="string"/>
-        <Categorie src="IPTC:Category"/>
+        <Categorie src="IPTC:Category" type="string"/>
-        <AutresCategories src="IPTC:SupplementalCategories" multi="1"/>
+        <AutresCategories src="IPTC:SupplementalCategories" type="string" multi="1"/>
-        <MotsCles src="IPTC:Keywords" multi="1"/>
+        <MotsCles src="IPTC:Keywords" type="string" multi="1"/>
-        <Observations src="IPTC:SpecialInstructions"/>
+        <Observations src="IPTC:SpecialInstructions" type="string"/>
-        <Date src="IPTC:DateCreated" type="date" />
+        <Date src="IPTC:DateCreated" type="date"/>
-        <Signature src="IPTC:By-line"/>
+        <Signature src="IPTC:By-line" type="string"/>
-        <TitreCredits src="IPTC:By-lineTitle"/>
+        <TitreCredits src="IPTC:By-lineTitle" type="string"/>
-        <Ville src="IPTC:City" />
+        <Ville src="IPTC:City" type="string" />
-        <Province src="IPTC:Province-State" />
+        <Province src="IPTC:Province-State" type="string"/>
-        <Pays src="IPTC:Country-PrimaryLocationName" />
+        <Pays src="IPTC:Country-PrimaryLocationName" type="string"/>
-        <ReferencesOriginales src="IPTC:OriginalTransmissionReference" />
+        <ReferencesOriginales src="IPTC:OriginalTransmissionReference" type="string"/>
-        <Titre src="IPTC:Headline" report="1" thumbtitle="1" />
+        <Titre src="IPTC:Headline" type="string" report="1" thumbtitle="1" />
-        <Credit src="IPTC:Credit" report="1" />
+        <Credit src="IPTC:Credit" type="string" report="1" />
-        <Source src="IPTC:Source" />
+        <Source src="IPTC:Source" type="string"/>
-        <Legende src="IPTC:Caption-Abstract" />
+        <Legende src="IPTC:Caption-Abstract" type="string"/>
-        <Redacteur src="IPTC:Writer-Editor" />
+        <Redacteur src="IPTC:Writer-Editor" type="string"/>
-        <Longitude src="GPS:GPSLongitude" readonly="1"/>
+        <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
-        <Latitude src="GPS:GPSLatitude" readonly="1"/>
+        <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
-        <AppareilPhoto src="IFD0:Model" readonly="1"/>
+        <AppareilPhoto src="IFD0:Model" type="string" readonly="1"/>
-        <NomDeFichier src="Phraseanet:tf-basename" readonly="1" type="string" />
+        <NomDeFichier src="Phraseanet:tf-basename" type="string" readonly="1"/>
     </description>
 
     <statbits>

package.json

@@ -42,7 +42,6 @@
   },
   "dependencies": {
     "JSON2": "^0.1.0",
-    "alchemy-embed-medias": "^0.5.1",
     "backbone": "^1.3.3",
     "blueimp-file-upload": "^8.3.0",
     "blueimp-load-image": "^2.17.1",
@@ -66,7 +65,7 @@
     "normalize-css": "^2.1.0",
     "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.33.84",
+    "phraseanet-production-client": "^0.34.16-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",

resources/ansible/playbook.yml

@@ -4,18 +4,18 @@
   vars_files:
     - vars/all.yml
   roles:
-    - server
+#    - server
-    - repositories
+#    - repositories
-    - vagrant_local
+#    - vagrant_local
     - nginx
-    - mariadb
+#    - mariadb
-    - elasticsearch
+#    - elasticsearch
-    - rabbitmq
+#    - rabbitmq
-    - php
+#    - php
     - xdebug
-    - composer
+#    - composer
-    - mailcatcher
+#    - mailcatcher
-    - node
+#    - node
-    - yarn
+#    - yarn
+#    - ffmpeg
     - app
-    - ffmpeg

resources/ansible/roles/php/tasks/mod-php.yml

@@ -28,3 +28,13 @@
   lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
+
+- name: set session.hash_bits_per_character apache2
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
+              regexp=';?session.hash_bits_per_character\s*=\s*'
+              line='session.hash_bits_per_character = 6'
+
+- name: set session.hash_function apache2
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
+              regexp=';?session.hash_function\s*=\s*'
+              line='session.hash_function = 1'

resources/ansible/roles/php/tasks/php-cli.yml

@@ -28,3 +28,13 @@
   lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
+
+- name: set session.hash_function cli
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
+              regexp=';?session.hash_function\s*=\s*'
+              line='session.hash_function = 1'
+
+- name: set session.hash_bits_per_character cli
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
+              regexp=';?session.hash_bits_per_character\s*=\s*'
+              line='session.hash_bits_per_character = 6'

resources/ansible/roles/php/tasks/php-fpm.yml

@@ -46,3 +46,16 @@
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
   notify: restart php{{ phpversion }}-fpm
+
+- name: set session.hash_function fpm
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
+              regexp=';?session.hash_function\s*=\s*'
+              line='session.hash_function = 1'
+  notify: restart php{{ phpversion }}-fpm
+
+
+- name: set session.hash_bits_per_character fpm
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
+              regexp=';?session.hash_bits_per_character\s*=\s*'
+              line='session.hash_bits_per_character = 6'
+  notify: restart php{{ phpversion }}-fpm

resources/ansible/roles/vagrant_local/tasks/docker-hosts-container.yml

@@ -0,0 +1,4 @@
+---
+- name: Update /etc/hosts
+  lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.docker_hosts_container|default('') }}' owner=root group=root mode=0644
+  when: vagrant_local.vm.docker_hosts_container is defined

resources/ansible/roles/vagrant_local/tasks/main.yml

@@ -10,3 +10,5 @@
 - name: Update /etc/hosts
   lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.hostname|default('') }}' owner=root group=root mode=0644
   when: vagrant_local.vm.hostname is defined
+
+- include: docker-hosts-container.yml

resources/ansible/vars/all.yml

@@ -48,6 +48,8 @@ vagrant_local:
         sharedfolder: ./
         useVagrantCloud: '1'
         syncType: nfs
+        hostname: ''
+        docker_hosts_container: 'db elasticsearch redis rabbitmq'
 nginx:
     install: '1'
     docroot: /vagrant

resources/gulp/components/vendors/alchemy-embed.js

@@ -11,12 +11,16 @@ gulp.task('copy-alchemy-embed-debug', function(){
 
 gulp.task('copy-alchemy-embed', function(){
     // copy all dist folder:
-    if( debugMode === true) {
+    return gulp.src('vendor/alchemy/embed-bundle/dist/**/*')
-        return gulp.src('vendor/alchemy/embed-bundle/dist/**/*')
+        .pipe(gulp.dest( config.paths.build + 'vendors/alchemy-embed-medias'));
+
+    
+   /* if( debugMode === true) {
+        return gulp.src('vendor/alchemy/embed-bundle/dist/!**!/!*')
             .pipe(gulp.dest( config.paths.build + 'vendors/alchemy-embed-medias'));
     }
-    return gulp.src(config.paths.nodes + 'alchemy-embed-medias/dist/**/*')
+    return gulp.src(config.paths.nodes + 'alchemy-embed-medias/dist/!**!/!*')
-        .pipe(gulp.dest( config.paths.build + 'vendors/alchemy-embed-medias'));
+        .pipe(gulp.dest( config.paths.build + 'vendors/alchemy-embed-medias'));*/
 });
 gulp.task('watch-alchemy-embed-js', function() {
     debugMode = true;

resources/locales/validators.de.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2018-12-11T12:17:04Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2019-05-21T05:53:02Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -10,8 +10,8 @@
         <source>Please provide the same passwords.</source>
         <target state="translated">Bitte geben Sie diesselbe Passwörter ein.</target>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
         <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
         <source>The token provided is not valid anymore</source>

resources/locales/validators.en.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2018-12-11T12:19:04Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2019-05-21T05:54:16Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -10,8 +10,8 @@
         <source>Please provide the same passwords.</source>
         <target state="translated">Please provide the same passwords.</target>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
         <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
         <source>The token provided is not valid anymore</source>

resources/locales/validators.fr.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2018-12-11T12:20:50Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2019-05-21T05:55:28Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -10,8 +10,8 @@
         <source>Please provide the same passwords.</source>
         <target state="translated">Veuillez indiquer des mots de passe identiques.</target>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
         <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
         <source>The token provided is not valid anymore</source>

resources/locales/validators.nl.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2018-12-11T12:22:28Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2019-05-21T05:56:47Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -10,8 +10,8 @@
         <source>Please provide the same passwords.</source>
         <target state="new">Please provide the same passwords.</target>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
         <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
         <source>The token provided is not valid anymore</source>

resources/proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php

@@ -0,0 +1,235 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class AggregateToken extends \Alchemy\Phrasea\Model\Entities\AggregateToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'value'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'value'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (AggregateToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValue($value)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', [$value]);
+
+        return parent::setValue($value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', []);
+
+        return parent::getValue();
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesApiAccount.php

@@ -0,0 +1,312 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiAccount extends \Alchemy\Phrasea\Model\Entities\ApiAccount implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'revoked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'apiVersion', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'application', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'tokens', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'revoked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'apiVersion', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'application', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'tokens', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiAccount' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiAccount $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setApiVersion($apiVersion)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setApiVersion', [$apiVersion]);
+
+        return parent::setApiVersion($apiVersion);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getApiVersion()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getApiVersion', []);
+
+        return parent::getApiVersion();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setApplication(\Alchemy\Phrasea\Model\Entities\ApiApplication $application)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setApplication', [$application]);
+
+        return parent::setApplication($application);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getApplication()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getApplication', []);
+
+        return parent::getApplication();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRevoked($revoked)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRevoked', [$revoked]);
+
+        return parent::setRevoked($revoked);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isRevoked()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isRevoked', []);
+
+        return parent::isRevoked();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addTokens(\Alchemy\Phrasea\Model\Entities\ApiOauthToken $token)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addTokens', [$token]);
+
+        return parent::addTokens($token);
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesApiApplication.php

@@ -0,0 +1,510 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiApplication extends \Alchemy\Phrasea\Model\Entities\ApiApplication implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'creator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'website', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientSecret', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'activated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'grantPassword', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'accounts', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'webhookUrl'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'creator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'type', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'website', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'clientSecret', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'activated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'grantPassword', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'accounts', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiApplication' . "\0" . 'webhookUrl'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiApplication $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setActivated($activated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setActivated', [$activated]);
+
+        return parent::setActivated($activated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isActivated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isActivated', []);
+
+        return parent::isActivated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setClientId($clientId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setClientId', [$clientId]);
+
+        return parent::setClientId($clientId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getClientId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getClientId', []);
+
+        return parent::getClientId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setClientSecret($clientSecret)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setClientSecret', [$clientSecret]);
+
+        return parent::setClientSecret($clientSecret);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getClientSecret()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getClientSecret', []);
+
+        return parent::getClientSecret();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreator(\Alchemy\Phrasea\Model\Entities\User $creator = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreator', [$creator]);
+
+        return parent::setCreator($creator);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreator()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreator', []);
+
+        return parent::getCreator();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDescription($description)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDescription', [$description]);
+
+        return parent::setDescription($description);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDescription()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDescription', []);
+
+        return parent::getDescription();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setGrantPassword($grantPassword)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGrantPassword', [$grantPassword]);
+
+        return parent::setGrantPassword($grantPassword);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPasswordGranted()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPasswordGranted', []);
+
+        return parent::isPasswordGranted();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setNonce($nonce)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNonce', [$nonce]);
+
+        return parent::setNonce($nonce);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNonce()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNonce', []);
+
+        return parent::getNonce();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRedirectUri($redirectUri)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRedirectUri', [$redirectUri]);
+
+        return parent::setRedirectUri($redirectUri);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRedirectUri()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRedirectUri', []);
+
+        return parent::getRedirectUri();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setType($type)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setType', [$type]);
+
+        return parent::setType($type);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getType()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getType', []);
+
+        return parent::getType();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setWebsite($website)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setWebsite', [$website]);
+
+        return parent::setWebsite($website);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWebsite()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getWebsite', []);
+
+        return parent::getWebsite();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setWebhookUrl($webhookUrl)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setWebhookUrl', [$webhookUrl]);
+
+        return parent::setWebhookUrl($webhookUrl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWebhookUrl()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getWebhookUrl', []);
+
+        return parent::getWebhookUrl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addAccount', [$account]);
+
+        return parent::addAccount($account);
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesApiLog.php

@@ -0,0 +1,455 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiLog extends \Alchemy\Phrasea\Model\Entities\ApiLog implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'route', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'method', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'statusCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'format', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'resource', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'general', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'aspect', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'action', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorMessage'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'route', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'method', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'statusCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'format', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'resource', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'general', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'aspect', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'action', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiLog' . "\0" . 'errorMessage'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiLog $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAction($action)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAction', [$action]);
+
+        return parent::setAction($action);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAction()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAction', []);
+
+        return parent::getAction();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setAspect($aspect)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAspect', [$aspect]);
+
+        return parent::setAspect($aspect);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAspect()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAspect', []);
+
+        return parent::getAspect();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setErrorCode($errorCode)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setErrorCode', [$errorCode]);
+
+        return parent::setErrorCode($errorCode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getErrorCode()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getErrorCode', []);
+
+        return parent::getErrorCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setErrorMessage($errorMessage)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setErrorMessage', [$errorMessage]);
+
+        return parent::setErrorMessage($errorMessage);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getErrorMessage()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getErrorMessage', []);
+
+        return parent::getErrorMessage();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setFormat($format)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFormat', [$format]);
+
+        return parent::setFormat($format);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFormat()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFormat', []);
+
+        return parent::getFormat();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setGeneral($general)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGeneral', [$general]);
+
+        return parent::setGeneral($general);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getGeneral()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getGeneral', []);
+
+        return parent::getGeneral();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setResource($resource)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResource', [$resource]);
+
+        return parent::setResource($resource);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getResource()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResource', []);
+
+        return parent::getResource();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRoute($route)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRoute', [$route]);
+
+        return parent::setRoute($route);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRoute()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRoute', []);
+
+        return parent::getRoute();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setStatusCode($statusCode)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setStatusCode', [$statusCode]);
+
+        return parent::setStatusCode($statusCode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatusCode()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getStatusCode', []);
+
+        return parent::getStatusCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setMethod($method)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMethod', [$method]);
+
+        return parent::setMethod($method);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMethod()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMethod', []);
+
+        return parent::getMethod();
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesApiOauthCode.php

@@ -0,0 +1,334 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiOauthCode extends \Alchemy\Phrasea\Model\Entities\ApiOauthCode implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'code', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'code', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'redirectUri', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthCode' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiOauthCode $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCode($code)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCode', [$code]);
+
+        return parent::setCode($code);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCode()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getCode();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCode', []);
+
+        return parent::getCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($timestamp)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$timestamp]);
+
+        return parent::setExpires($timestamp);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRedirectUri($redirectUri)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRedirectUri', [$redirectUri]);
+
+        return parent::setRedirectUri($redirectUri);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRedirectUri()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRedirectUri', []);
+
+        return parent::getRedirectUri();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScope($scope)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScope', [$scope]);
+
+        return parent::setScope($scope);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScope()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScope', []);
+
+        return parent::getScope();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesApiOauthRefreshToken.php

@@ -0,0 +1,312 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiOauthRefreshToken extends \Alchemy\Phrasea\Model\Entities\ApiOauthRefreshToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'refreshToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'refreshToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthRefreshToken' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiOauthRefreshToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($expires)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$expires]);
+
+        return parent::setExpires($expires);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRefreshToken($refreshToken)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRefreshToken', [$refreshToken]);
+
+        return parent::setRefreshToken($refreshToken);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRefreshToken()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getRefreshToken();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRefreshToken', []);
+
+        return parent::getRefreshToken();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScope($scope)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScope', [$scope]);
+
+        return parent::setScope($scope);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScope()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScope', []);
+
+        return parent::getScope();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesApiOauthToken.php

@@ -0,0 +1,356 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class ApiOauthToken extends \Alchemy\Phrasea\Model\Entities\ApiOauthToken implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'oauthToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'sessionId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'lastUsed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'updated'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'oauthToken', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'sessionId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'account', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'lastUsed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'scope', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ApiOauthToken' . "\0" . 'updated'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (ApiOauthToken $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function setAccount(\Alchemy\Phrasea\Model\Entities\ApiAccount $account)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAccount', [$account]);
+
+        return parent::setAccount($account);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAccount()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAccount', []);
+
+        return parent::getAccount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setExpires($expires = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', [$expires]);
+
+        return parent::setExpires($expires);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpires()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', []);
+
+        return parent::getExpires();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOauthToken($oauthToken)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOauthToken', [$oauthToken]);
+
+        return parent::setOauthToken($oauthToken);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOauthToken()
+    {
+        if ($this->__isInitialized__ === false) {
+            return  parent::getOauthToken();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOauthToken', []);
+
+        return parent::getOauthToken();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setScope($scope)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScope', [$scope]);
+
+        return parent::setScope($scope);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getScope()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScope', []);
+
+        return parent::getScope();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSessionId($sessionId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSessionId', [$sessionId]);
+
+        return parent::setSessionId($sessionId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSessionId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSessionId', []);
+
+        return parent::getSessionId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLastUsed(\DateTime $lastUsed)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastUsed', [$lastUsed]);
+
+        return parent::setLastUsed($lastUsed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLastUsed()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastUsed', []);
+
+        return parent::getLastUsed();
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php

@@ -0,0 +1,279 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class AuthFailure extends \Alchemy\Phrasea\Model\Entities\AuthFailure implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'username', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'ip', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'locked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'created'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'username', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'ip', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'locked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'created'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (AuthFailure $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUsername($username)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUsername', [$username]);
+
+        return parent::setUsername($username);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUsername()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUsername', []);
+
+        return parent::getUsername();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIp($ip)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIp', [$ip]);
+
+        return parent::setIp($ip);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIp()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIp', []);
+
+        return parent::getIp();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLocked($locked)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLocked', [$locked]);
+
+        return parent::setLocked($locked);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLocked()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLocked', []);
+
+        return parent::getLocked();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php

@@ -0,0 +1,488 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Basket extends \Alchemy\Phrasea\Model\Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'isRead', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'pusher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'archived', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'validation', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'order'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'isRead', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'pusher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'archived', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'validation', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'order'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Basket $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setName($name)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', [$name]);
+
+        return parent::setName($name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', []);
+
+        return parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setDescription($description)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDescription', [$description]);
+
+        return parent::setDescription($description);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDescription()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDescription', []);
+
+        return parent::getDescription();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', [$user]);
+
+        return parent::setUser($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUser()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', []);
+
+        return parent::getUser();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function markRead()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'markRead', []);
+
+        return parent::markRead();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function markUnread()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'markUnread', []);
+
+        return parent::markUnread();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isRead()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isRead', []);
+
+        return parent::isRead();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPusher(\Alchemy\Phrasea\Model\Entities\User $user = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPusher', [$user]);
+
+        return parent::setPusher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPusher()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPusher', []);
+
+        return parent::getPusher();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setArchived($archived)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setArchived', [$archived]);
+
+        return parent::setArchived($archived);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getArchived()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getArchived', []);
+
+        return parent::getArchived();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setValidation(\Alchemy\Phrasea\Model\Entities\ValidationSession $validation = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValidation', [$validation]);
+
+        return parent::setValidation($validation);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValidation()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidation', []);
+
+        return parent::getValidation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addElement(\Alchemy\Phrasea\Model\Entities\BasketElement $element)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', [$element]);
+
+        return parent::addElement($element);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\BasketElement $element)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', [$element]);
+
+        return parent::removeElement($element);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrder', [$order]);
+
+        return parent::setOrder($order);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrder()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrder', []);
+
+        return parent::getOrder();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getElements()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', []);
+
+        return parent::getElements();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getElementsByOrder($order)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElementsByOrder', [$order]);
+
+        return parent::getElementsByOrder($order);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasRecord(\Alchemy\Phrasea\Application $app, \record_adapter $record)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasRecord', [$app, $record]);
+
+        return parent::hasRecord($app, $record);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSize(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSize', [$app]);
+
+        return parent::getSize($app);
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php

@@ -0,0 +1,389 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class BasketElement extends \Alchemy\Phrasea\Model\Entities\BasketElement implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'validation_datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'basket'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'validation_datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'basket'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (BasketElement $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecordId($recordId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', [$recordId]);
+
+        return parent::setRecordId($recordId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecordId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', []);
+
+        return parent::getRecordId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSbasId($sbasId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', [$sbasId]);
+
+        return parent::setSbasId($sbasId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSbasId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', []);
+
+        return parent::getSbasId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRecord(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', [$app]);
+
+        return parent::getRecord($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setRecord(\record_adapter $record)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecord', [$record]);
+
+        return parent::setRecord($record);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOrd($ord)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrd', [$ord]);
+
+        return parent::setOrd($ord);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOrd()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrd', []);
+
+        return parent::getOrd();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreated(\DateTime $created)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', [$created]);
+
+        return parent::setCreated($created);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', []);
+
+        return parent::getCreated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdated(\DateTime $updated)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', [$updated]);
+
+        return parent::setUpdated($updated);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', []);
+
+        return parent::getUpdated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addValidationData', [$validationDatas]);
+
+        return parent::addValidationData($validationDatas);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeValidationData', [$validationDatas]);
+
+        return parent::removeValidationData($validationDatas);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValidationDatas()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidationDatas', []);
+
+        return parent::getValidationDatas();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', [$basket]);
+
+        return parent::setBasket($basket);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBasket()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', []);
+
+        return parent::getBasket();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUserValidationDatas(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUserValidationDatas', [$user]);
+
+        return parent::getUserValidationDatas($user);
+    }
+
+}

resources/proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php

@@ -0,0 +1,587 @@
+<?php
+
+namespace Alchemy\Phrasea\Model\Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
+
+/**
+ * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
+ */
+class Feed extends \Alchemy\Phrasea\Model\Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
+{
+    /**
+     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
+     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
+     *      initialization process and an array of ordered parameters that were passed to that method.
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     */
+    public $__initializer__;
+
+    /**
+     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     */
+    public $__cloner__;
+
+    /**
+     * @var boolean flag indicating if this object was already initialized
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
+     */
+    public $__isInitialized__ = false;
+
+    /**
+     * @var array properties to be lazy loaded, with keys being the property
+     *            names and values being their default values
+     *
+     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     */
+    public static $lazyPropertiesDefaults = [];
+
+
+
+    /**
+     * @param \Closure $initializer
+     * @param \Closure $cloner
+     */
+    public function __construct($initializer = null, $cloner = null)
+    {
+
+        $this->__initializer__ = $initializer;
+        $this->__cloner__      = $cloner;
+    }
+
+
+
+
+
+
+
+    /**
+     * 
+     * @return array
+     */
+    public function __sleep()
+    {
+        if ($this->__isInitialized__) {
+            return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'public', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'iconUrl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'publishers', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'entries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'tokens'];
+        }
+
+        return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'public', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'iconUrl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'publishers', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'entries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'tokens'];
+    }
+
+    /**
+     * 
+     */
+    public function __wakeup()
+    {
+        if ( ! $this->__isInitialized__) {
+            $this->__initializer__ = function (Feed $proxy) {
+                $proxy->__setInitializer(null);
+                $proxy->__setCloner(null);
+
+                $existingProperties = get_object_vars($proxy);
+
+                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                    if ( ! array_key_exists($property, $existingProperties)) {
+                        $proxy->$property = $defaultValue;
+                    }
+                }
+            };
+
+        }
+    }
+
+    /**
+     * 
+     */
+    public function __clone()
+    {
+        $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
+    }
+
+    /**
+     * Forces initialization of the proxy
+     */
+    public function __load()
+    {
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __isInitialized()
+    {
+        return $this->__isInitialized__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitialized($initialized)
+    {
+        $this->__isInitialized__ = $initialized;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setInitializer(\Closure $initializer = null)
+    {
+        $this->__initializer__ = $initializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __getInitializer()
+    {
+        return $this->__initializer__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     */
+    public function __setCloner(\Closure $cloner = null)
+    {
+        $this->__cloner__ = $cloner;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific cloning logic
+     */
+    public function __getCloner()
+    {
+        return $this->__cloner__;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @static
+     */
+    public function __getLazyProperties()
+    {
+        return self::$lazyPropertiesDefaults;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        if ($this->__isInitialized__ === false) {
+            return (int)  parent::getId();
+        }
+
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', []);
+
+        return parent::getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIsPublic($public)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsPublic', [$public]);
+
+        return parent::setIsPublic($public);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPublic()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublic', []);
+
+        return parent::isPublic();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIconUrl($iconUrl)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIconUrl', [$iconUrl]);
+
+        return parent::setIconUrl($iconUrl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIconUrl()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIconUrl', []);
+
+        return parent::getIconUrl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setBaseId($baseId)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', [$baseId]);
+
+        return parent::setBaseId($baseId);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBaseId()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', []);
+
+        return parent::getBaseId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setTitle($title)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', [$title]);
+
+        return parent::setTitle($title);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', []);
+
+        return parent::getTitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addPublisher', [$publishers]);
+
+        return parent::addPublisher($publishers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removePublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removePublisher', [$publishers]);
+
+        return parent::removePublisher($publishers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPublishers()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublishers', []);
+
+        return parent::getPublishers();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntry', [$entries]);
+
+        return parent::addEntry($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntry', [$entries]);
+
+        return parent::removeEntry($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getEntries()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntries', []);
+
+        return parent::getEntries();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOwner()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwner', []);
+
+        return parent::getOwner();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isOwner(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isOwner', [$user]);
+
+        return parent::isOwner($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCollection(\Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', [$app]);
+
+        return parent::getCollection($app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCollection(\collection $collection = NULL)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCollection', [$collection]);
+
+        return parent::setCollection($collection);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setCreatedOn($createdOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', [$createdOn]);
+
+        return parent::setCreatedOn($createdOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCreatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', []);
+
+        return parent::getCreatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUpdatedOn($updatedOn)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', [$updatedOn]);
+
+        return parent::setUpdatedOn($updatedOn);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getUpdatedOn()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', []);
+
+        return parent::getUpdatedOn();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isPublisher(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublisher', [$user]);
+
+        return parent::isPublisher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPublisher(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublisher', [$user]);
+
+        return parent::getPublisher($user);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setSubtitle($subtitle)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubtitle', [$subtitle]);
+
+        return parent::setSubtitle($subtitle);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubtitle()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubtitle', []);
+
+        return parent::getSubtitle();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAggregated()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAggregated', []);
+
+        return parent::isAggregated();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCountTotalEntries()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCountTotalEntries', []);
+
+        return parent::getCountTotalEntries();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccess(\Alchemy\Phrasea\Model\Entities\User $user, \Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasAccess', [$user, $app]);
+
+        return parent::hasAccess($user, $app);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addToken', [$tokens]);
+
+        return parent::addToken($tokens);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeToken', [$tokens]);
+
+        return parent::removeToken($tokens);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getTokens()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTokens', []);
+
+        return parent::getTokens();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntrie', [$entries]);
+
+        return parent::addEntrie($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntrie', [$entries]);
+
+        return parent::removeEntrie($entries);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasPage($pageNumber, $nbEntriesByPage)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasPage', [$pageNumber, $nbEntriesByPage]);
+
+        return parent::hasPage($pageNumber, $nbEntriesByPage);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAccessible(\Alchemy\Phrasea\Model\Entities\User $user, \Alchemy\Phrasea\Application $app)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAccessible', [$user, $app]);
+
+        return parent::isAccessible($user, $app);
+    }
+
+}