Merge branch '2.5' into 3.1

.platform/varnish.vcl

@@ -3,6 +3,7 @@
 //   - Varnish xkey vmod (via varnish-modules package 0.10.2 or higher, or via Varnish Plus)
 // - eZ Platform 3.x or higher with ezplatform-http-cache (this) bundle
 //
+// WARNING: Not for us with Fastly, see documentation for where to find dedicated Fastly VCL.
 
 // Not applicable on Platform.sh:
 //vcl 4.0;

bin/.travis/trusty/setup_ezplatform.sh

@@ -81,6 +81,11 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
 
 fi
 
+if [[ -n "${DOCKER_PASSWORD}" ]]; then
+    echo "> Set up Docker credentials"
+    echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
+fi
+
 echo "> Install DB and dependencies"
 docker-compose -f doc/docker/install-dependencies.yml up --abort-on-container-exit
 

composer.json

@@ -41,7 +41,6 @@
         "php-http/guzzle6-adapter": "^2.0",
         "platformsh/symfonyflex-bridge": "^2.2",
         "sensio/framework-extra-bundle": "^5.5",
-        "sensiolabs/security-checker": "^6.0",
         "symfony/asset": "^5.0",
         "symfony/cache": "^5.0",
         "symfony/console": "^5.0",
@@ -120,12 +119,10 @@
             "ezplatform:encore:compile": "symfony-cmd"
         },
         "post-install-cmd": [
-            "@auto-scripts",
-            "@php bin/security-checker security:check || true"
+            "@auto-scripts"
         ],
         "post-update-cmd": [
-            "@auto-scripts",
-            "@php bin/security-checker security:check || true"
+            "@auto-scripts"
         ],
         "ezplatform-install": [
             "@php bin/console --ansi ezplatform:install clean",