From 927bb3a515559cd95da87bc6cc753e8166369930 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 10:48:28 +0100
Subject: [PATCH 01/12] Upd: Adding Symfony 4 Compatibility

#SymfonyConHackday2017
---
 .travis.yml                   |  4 +++-
 Resources/config/services.xml | 16 ++++++++--------
 composer.json                 |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82ffdaf3..e186fb54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,12 +19,14 @@ env:
     - SYMFONY_VERSION=3.1.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=3.2.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=3.3.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-
+    - SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
+    - DEPENDENCIES=beta
 cache:
     directories:
         - $HOME/.composer/cache
 
 before_install:
+    - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
     - if [ -x .travis/before_install.sh ]; then .travis/before_install.sh; fi;
 
 install:
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 97f68f69..44d81496 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -62,7 +62,7 @@
         </service>
 
         <!-- Managers -->
-        <service id="lexik_translation.trans_unit.manager" class="%lexik_translation.trans_unit.manager.class%">
+        <service id="lexik_translation.trans_unit.manager" class="%lexik_translation.trans_unit.manager.class%" public="true">
             <argument type="service" id="lexik_translation.translation_storage" />
             <argument type="service" id="lexik_translation.file.manager" />
             <argument>%kernel.root_dir%</argument>
@@ -73,12 +73,12 @@
             <argument>%kernel.root_dir%</argument>
         </service>
 
-        <service id="lexik_translation.locale.manager" class="%lexik_translation.locale.manager.class%">
+        <service id="lexik_translation.locale.manager" class="%lexik_translation.locale.manager.class%" public="true">
             <argument>%lexik_translation.managed_locales%</argument>
         </service>
 
         <!-- Importer -->
-        <service id="lexik_translation.importer.file" class="%lexik_translation.importer.file.class%">
+        <service id="lexik_translation.importer.file" class="%lexik_translation.importer.file.class%" public="true">
             <argument type="collection" /> <!-- translation loaders -->
             <argument type="service" id="lexik_translation.translation_storage" />
             <argument type="service" id="lexik_translation.trans_unit.manager" />
@@ -89,7 +89,7 @@
         </service>
 
         <!-- Exporter -->
-        <service id="lexik_translation.exporter_collector" class="%lexik_translation.exporter_collector.class%" />
+        <service id="lexik_translation.exporter_collector" class="%lexik_translation.exporter_collector.class%" public="true"/>
 
         <service id="lexik_translation.exporter.xliff" class="%lexik_translation.exporter.xliff.class%">
             <tag name="lexik_translation.exporter" alias="xlf" />
@@ -110,12 +110,12 @@
         </service>
 
         <!-- Data grid -->
-        <service id="lexik_translation.data_grid.formatter" class="%lexik_translation.data_grid.formatter.class%">
+        <service id="lexik_translation.data_grid.formatter" class="%lexik_translation.data_grid.formatter.class%" public="true">
             <argument type="service" id="lexik_translation.locale.manager" />
             <argument>%lexik_translation.storage.type%</argument>
         </service>
 
-        <service id="lexik_translation.data_grid.request_handler" class="%lexik_translation.data_grid.request_handler.class%">
+        <service id="lexik_translation.data_grid.request_handler" class="%lexik_translation.data_grid.request_handler.class%" public="true">
             <argument type="service" id="lexik_translation.trans_unit.manager" />
             <argument type="service" id="lexik_translation.file.manager" />
             <argument type="service" id="lexik_translation.translation_storage" />
@@ -129,13 +129,13 @@
         </service>
 
         <!-- Overview -->
-        <service id="lexik_translation.overview.stats_aggregator" class="%lexik_translation.overview.stats_aggregator.class%">
+        <service id="lexik_translation.overview.stats_aggregator" class="%lexik_translation.overview.stats_aggregator.class%" public="true">
             <argument type="service" id="lexik_translation.translation_storage" />
             <argument type="service" id="lexik_translation.locale.manager" />
         </service>
 
         <!-- Form -->
-        <service id="lexik_translation.form.handler.trans_unit" class="%lexik_translation.form.handler.trans_unit.class%">
+        <service id="lexik_translation.form.handler.trans_unit" class="%lexik_translation.form.handler.trans_unit.class%" public="true">
             <argument type="service" id="lexik_translation.trans_unit.manager" />
             <argument type="service" id="lexik_translation.file.manager" />
             <argument type="service" id="lexik_translation.translation_storage" />
diff --git a/composer.json b/composer.json
index 1d9d5a44..9af126ed 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^5.6 || ^7.0",
-        "symfony/framework-bundle": "~2.8|~3.0"
+        "symfony/framework-bundle": "~2.8|~3.0|~4.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.2.3",

From 0744e6e623bc49c27640de03d26ce6681199e492 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 11:56:37 +0100
Subject: [PATCH 02/12] Upd: Update PHP compatibility version with Symfony
 versions

---
 .travis.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e186fb54..e6e9f60a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,17 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
 matrix:
     fast_finish: true
+    exclude:
+    - php: 5.6
+      env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
+    - php: 7.0
+      env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
+    - php: 7.2
+      env: SYMFONY_VERSION=2.8.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
 
 services:
     - mongodb
@@ -19,8 +27,7 @@ env:
     - SYMFONY_VERSION=3.1.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=3.2.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=3.3.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - DEPENDENCIES=beta
+    - SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
 cache:
     directories:
         - $HOME/.composer/cache
@@ -33,4 +40,4 @@ install:
     - if [ -x .travis/install.sh ]; then .travis/install.sh; fi;
 
 script:
-    - php vendor/bin/phpunit -v
\ No newline at end of file
+    - php vendor/bin/phpunit -v

From f1a7c7ba9349bee0ddc0b610d4e3f4650d5f7ac0 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 13:37:21 +0100
Subject: [PATCH 03/12] Upd: Update install script

---
 .travis/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 41ac0ee5..c58b3eb7 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -3,4 +3,4 @@
 # https://github.com/composer/composer/issues/5030
 composer update --prefer-dist --no-interaction --prefer-stable --quiet --ignore-platform-reqs
 
-composer update --prefer-dist --no-interaction --prefer-stable
+#composer update --prefer-dist --no-interaction --prefer-stable

From 512d01220134f5a059d16d220c6c9f80b53e0233 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 13:44:49 +0100
Subject: [PATCH 04/12] Upd: Revert travis install script

---
 .travis/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index c58b3eb7..41ac0ee5 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -3,4 +3,4 @@
 # https://github.com/composer/composer/issues/5030
 composer update --prefer-dist --no-interaction --prefer-stable --quiet --ignore-platform-reqs
 
-#composer update --prefer-dist --no-interaction --prefer-stable
+composer update --prefer-dist --no-interaction --prefer-stable

From 44e23aa794205d7ff93ded2c9b9e4018605d748e Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 13:47:19 +0100
Subject: [PATCH 05/12] Upd: Align travis before install script

---
 .travis/before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index afc744df..6e3658aa 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -10,7 +10,7 @@ if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
     TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
     echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 
-        if [ "$TRAVIS_PHP_VERSION" '<' '7.0' ]; then
+    if [ "$TRAVIS_PHP_VERSION" '<' '7.0' ]; then
         echo "extension=mongo.so" >> "$TRAVIS_INI_FILE"
     else
         echo "extension=mongodb.so" >> "$TRAVIS_INI_FILE"

From 37bb37e15e50d8e32d975b6453da52f7d85e40fa Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 13:56:45 +0100
Subject: [PATCH 06/12] Upd: Adding SF3.4 and upgrading Propel to v2

Propel on v2 at least as v1 is old and not compatible with new versions of PHP
---
 .travis.yml   | 1 +
 composer.json | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6e9f60a..85386c5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ env:
     - SYMFONY_VERSION=3.1.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=3.2.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=3.3.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
+    - SYMFONY_VERSION=3.4.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
     - SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
 cache:
     directories:
diff --git a/composer.json b/composer.json
index 9af126ed..af811f57 100644
--- a/composer.json
+++ b/composer.json
@@ -25,13 +25,13 @@
         "doctrine/doctrine-bundle": "~1.2",
         "doctrine/data-fixtures": "~1.1",
         "doctrine/mongodb-odm-bundle": "~3.0",
-        "propel/propel-bundle": "~1.5|3.0.0-alpha1@dev",
+        "propel/propel-bundle": "~2.0|3.0.0-alpha1@dev",
         "phpunit/phpunit": "^5.7"
     },
     "suggest": {
         "doctrine/orm": ">=2.4",
         "doctrine/mongodb-odm-bundle": "~3.0",
-        "propel/propel-bundle": "~1.5"
+        "propel/propel-bundle": "~2.0"
     },
     "autoload":     {
         "psr-4": { "Lexik\\Bundle\\TranslationBundle\\": "" }
@@ -40,5 +40,6 @@
         "branch-alias": {
             "dev-master": "4.x.x-dev"
         }
-    }
+    },
+    "minimum-stability": "beta"
 }

From 81b2991fd87f69814e956f7abbae9c7ae33626b5 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 14:13:10 +0100
Subject: [PATCH 07/12] Upd: Updating Propel bundle version to the last
 available

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index af811f57..81ff00b8 100644
--- a/composer.json
+++ b/composer.json
@@ -25,13 +25,13 @@
         "doctrine/doctrine-bundle": "~1.2",
         "doctrine/data-fixtures": "~1.1",
         "doctrine/mongodb-odm-bundle": "~3.0",
-        "propel/propel-bundle": "~2.0|3.0.0-alpha1@dev",
+        "propel/propel-bundle": "~3.0@dev",
         "phpunit/phpunit": "^5.7"
     },
     "suggest": {
         "doctrine/orm": ">=2.4",
         "doctrine/mongodb-odm-bundle": "~3.0",
-        "propel/propel-bundle": "~2.0"
+        "propel/propel-bundle": "~3.0@dev"
     },
     "autoload":     {
         "psr-4": { "Lexik\\Bundle\\TranslationBundle\\": "" }

From c408826ecc4fc73d2390395dd45f0346f70ebe65 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 14:20:31 +0100
Subject: [PATCH 08/12] Upd: Updating level of dependencies to alpha for Propel

---
 .travis.yml   | 15 ++++++++-------
 composer.json |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 85386c5c..d57bbbf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,19 +22,20 @@ services:
     - mongodb
 
 env:
-    - SYMFONY_VERSION=2.8.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=3.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=3.1.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=3.2.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=3.3.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=3.4.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
-    - SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
+    - SYMFONY_VERSION=2.8.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
+    - SYMFONY_VERSION=3.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
+    - SYMFONY_VERSION=3.1.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
+    - SYMFONY_VERSION=3.2.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
+    - SYMFONY_VERSION=3.3.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
+    - SYMFONY_VERSION=3.4.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
+    - SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
 cache:
     directories:
         - $HOME/.composer/cache
 
 before_install:
     - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
+    - if [ "$DEPENDENCIES" = "alpha" ]; then composer config minimum-stability alpha; fi;
     - if [ -x .travis/before_install.sh ]; then .travis/before_install.sh; fi;
 
 install:
diff --git a/composer.json b/composer.json
index 81ff00b8..1bf09e88 100644
--- a/composer.json
+++ b/composer.json
@@ -24,13 +24,13 @@
         "doctrine/orm": "^2.2.3",
         "doctrine/doctrine-bundle": "~1.2",
         "doctrine/data-fixtures": "~1.1",
-        "doctrine/mongodb-odm-bundle": "~3.0",
+        "doctrine/mongodb-odm-bundle": "~3.4",
         "propel/propel-bundle": "~3.0@dev",
         "phpunit/phpunit": "^5.7"
     },
     "suggest": {
         "doctrine/orm": ">=2.4",
-        "doctrine/mongodb-odm-bundle": "~3.0",
+        "doctrine/mongodb-odm-bundle": "~3.4",
         "propel/propel-bundle": "~3.0@dev"
     },
     "autoload":     {
@@ -41,5 +41,5 @@
             "dev-master": "4.x.x-dev"
         }
     },
-    "minimum-stability": "beta"
+    "minimum-stability": "alpha"
 }

From b58c4bd16caa950592756a189cb4bca15e8517eb Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sat, 18 Nov 2017 14:43:26 +0100
Subject: [PATCH 09/12] Upd: Setting dependencies of exclusions up to date

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d57bbbf2..b5a418d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,11 @@ matrix:
     fast_finish: true
     exclude:
     - php: 5.6
-      env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
+      env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
     - php: 7.0
-      env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=beta
+      env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
     - php: 7.2
-      env: SYMFONY_VERSION=2.8.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test
+      env: SYMFONY_VERSION=2.8.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
 
 services:
     - mongodb

From 166a65bd30e1c356002280cc2f8316e0b6dd81c2 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sun, 28 Jan 2018 00:30:04 +0100
Subject: [PATCH 10/12] Upd: Set PHP 7.2 optional as it's new

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b5a418d1..ff0396c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ php:
 
 matrix:
     fast_finish: true
+    allow_failures:
+        - php: 7.2
     exclude:
     - php: 5.6
       env: SYMFONY_VERSION=4.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha

From b1bbb53dfbf04d2ac3929ac4fccf21d05eec2217 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sun, 28 Jan 2018 00:48:14 +0100
Subject: [PATCH 11/12] Upd: Adding Propel dev-master reference

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index bb28d665..62ae1f35 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,7 @@
         "doctrine/data-fixtures": "~1.1",
         "doctrine/mongodb-odm-bundle": "~3.0",
         "propel/propel-bundle": "~3.0@dev",
+        "propel/propel": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "suggest": {

From 5425e788e1dd156a519970f2b0bd8e996e01e258 Mon Sep 17 00:00:00 2001
From: Damien AUDOUX <damien.audoux@macroprog.com>
Date: Sun, 28 Jan 2018 01:08:26 +0100
Subject: [PATCH 12/12] Upd: Managing mongoDb references

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 62ae1f35..ec95e2d2 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "doctrine/doctrine-bundle": "~1.2",
         "doctrine/data-fixtures": "~1.1",
         "doctrine/mongodb-odm-bundle": "~3.0",
+        "doctrine/mongodb": "~1.0",
         "propel/propel-bundle": "~3.0@dev",
         "propel/propel": "dev-master",
         "phpunit/phpunit": "^5.7"