Merge 2.x into master

.styleci.yml

@@ -23,6 +23,7 @@ enabled:
 finder:
   exclude:
     - 'Tests/Fixtures'
+    - 'tests/Fixtures'
     # ecommerce special case:
     - 'Resources/skeleton'
     # ignore vendor assets

.travis.yml

@@ -26,7 +26,7 @@ cache:
 env:
   global:
     - PATH="$HOME/.local/bin:$PATH"
-    - SYMFONY_DEPRECATIONS_HELPER=weak
+    - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataTranslationBundle.git
     - XMLLINT_INDENT="    "
@@ -47,25 +47,25 @@ matrix:
     - php: '7.1'
       env: SYMFONY=3.3.*
     - php: '7.1'
-      env: SYMFONY=dev-master@dev
+      env: SYMFONY='dev-master as 3.3'
     - php: '7.1'
       env: SONATA_CORE=3.*
     - php: '7.1'
-      env: SONATA_CORE=dev-master@dev
+      env: SONATA_CORE='dev-master as 3'
     - php: '7.1'
       env: SONATA_ADMIN=3.*
     - php: '7.1'
-      env: SONATA_ADMIN=dev-master@dev
+      env: SONATA_ADMIN='dev-master as 3'
     - php: '7.1'
       env: SYMFONY_DEPRECATIONS_HELPER=0
     - php: hhvm
   allow_failures:
     - php: nightly
     - php: hhvm
     - env: SYMFONY_DEPRECATIONS_HELPER=0
-    - env: SYMFONY=dev-master@dev
-    - env: SONATA_CORE=dev-master@dev
-    - env: SONATA_ADMIN=dev-master@dev
+    - env: SYMFONY='dev-master as 3.3'
+    - env: SONATA_CORE='dev-master as 3'
+    - env: SONATA_ADMIN='dev-master as 3'
 
 before_install:
   - git remote add upstream ${UPSTREAM_URL} && git fetch --all