Merge remote-tracking branch 'upstream/master'

.env

@@ -16,7 +16,7 @@ MYSQL_IMAGE=healthcheck/mariadb
 SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.4.0
 REDIS_IMAGE=healthcheck/redis
 
-APP_DOCKER_FILE=Dockerfile
+APP_DOCKER_FILE=doc/docker/Dockerfile-app
 
 DATASET_VARDIR=my-ez-app
 

composer.json

@@ -27,14 +27,14 @@
         "php": "^7.1",
         "symfony/symfony": "^3.4.2",
         "twig/twig": "^1.0||^2.0",
-        "twig/extensions": "^1.5.0",
-        "symfony/assetic-bundle": "~2.8",
-        "symfony/swiftmailer-bundle": "^3.0",
-        "symfony/monolog-bundle": "^3.1.0",
-        "doctrine/doctrine-bundle": "^1.6",
+        "twig/extensions": "^1.5.1",
+        "symfony/assetic-bundle": "^2.8.2",
+        "symfony/swiftmailer-bundle": "^3.2.2",
+        "symfony/monolog-bundle": "^3.3.0",
+        "doctrine/doctrine-bundle": "^1.9.1",
         "doctrine/orm": "^2.5",
-        "sensio/distribution-bundle": "^5.0.19",
-        "incenteev/composer-parameter-handler": "~2.1",
+        "sensio/distribution-bundle": "^5.0.22",
+        "incenteev/composer-parameter-handler": "^2.1.3",
         "ezsystems/ezpublish-kernel": "^7.2@dev",
         "ezsystems/repository-forms": "^2.2@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
@@ -45,24 +45,24 @@
         "ezsystems/ezplatform-admin-ui-assets": "^3.0@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
         "ezsystems/ezplatform-cron": "^2.0@dev",
-        "knplabs/knp-menu-bundle": "^2.1",
-        "willdurand/js-translation-bundle": "^2.6.4",
-        "friendsofsymfony/jsrouting-bundle": "^1.4",
-        "white-october/pagerfanta-bundle": "^1.1",
+        "knplabs/knp-menu-bundle": "^2.2.1",
+        "willdurand/js-translation-bundle": "^2.6.6",
+        "friendsofsymfony/jsrouting-bundle": "^1.6.3",
+        "white-october/pagerfanta-bundle": "^1.2",
         "roave/security-advisories": "dev-master",
-        "leafo/scssphp": "^0.7",
-        "symfony/thanks": "^1.0"
+        "leafo/scssphp": "^0.7.6",
+        "symfony/thanks": "^1.0.7"
     },
     "require-dev": {
-        "behat/behat": "~3.2",
-        "behat/symfony2-extension": "~2.0",
-        "behat/mink-extension": "~2.0",
-        "behat/mink-goutte-driver": "~1.0",
-        "behat/mink-selenium2-driver": "~1.0",
-        "ezsystems/behatbundle": "^6.5",
-        "phpunit/phpunit": "^6.4",
-        "sensio/generator-bundle": "~3.1",
-        "symfony/phpunit-bridge": "~3.2"
+        "behat/behat": "^3.4.3",
+        "behat/symfony2-extension": "^2.1.5",
+        "behat/mink-extension": "^2.3.1",
+        "behat/mink-goutte-driver": "^1.2.1",
+        "behat/mink-selenium2-driver": "^1.3.1",
+        "ezsystems/behatbundle": "^6.5.3",
+        "phpunit/phpunit": "^6.4.4",
+        "sensio/generator-bundle": "^3.1.7",
+        "symfony/phpunit-bridge": "^3.4.11"
     },
     "conflict": {
         "symfony/symfony": "3.4.9",