Merge branch '4.3' into 4.4

xabbuh · xabbuh · commit 9a5003eeeec0 · 2019-07-24T23:18:55.000+02:00
* 4.3:
  relax some assertions to make tests forward compatible
  fix typo
diff --git a/.travis.yml b/.travis.yml
@@ -222,7 +222,7 @@ install:
       composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
 
     - |
-      # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number than the next one
+      # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
       [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && LEGACY=,legacy
 
       export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
