symfony · webmozart · Jul 24, 2014 · Jul 20, 2014 · Jul 25, 2014 · Jul 25, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,40 @@
 language: php
 
 php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
+    - 5.3.3
+    - 5.3
+    - 5.4
+    - 5.5
+    - 5.6
+    - hhvm-nightly
 
-before_script:
-    - sudo apt-get install parallel
-    - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-    - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
-    - php src/Symfony/Component/Locale/Resources/data/build-data.php
-    - export USE_INTL_ICU_DATA_VERSION=1
+matrix:
+    allow_failures:
+        - php: hhvm-nightly
+    include:
+        - php: 5.5
+          env: components=yes
+
+services: mongodb
+
+env:
+    global:
+        - components=no
+
+before_install:
+    - travis_retry sudo apt-get install parallel
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sudo locale-gen fr_FR.UTF-8 && sudo update-locale
+#    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'
+
+install:
+    - sh -c 'if [ "$components" = "no" ]; then sh -c "COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install"; fi;'
 
 script:
-    - ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};' || exit 1
-    - echo "Running tests requiring tty"; phpunit --group tty
+    - sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark {};'\''"; fi;'
+    - sh -c 'if [ "$components" = "no" ]; then sh -c "echo "\""Running tests requiring tty"\""; phpunit --group tty"; fi;'
+    - sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark;'\''"; fi;'
diff --git a/CHANGELOG-2.2.md b/CHANGELOG-2.2.md
@@ -263,7 +263,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
 * 2.2.1 (2013-04-06)
 
  * 751abe1: Doctrine cannot handle bare random non-utf8 strings
- * 673fd9b:  idAsIndex should be true with a smallint or bigint id field.
+ * 673fd9b: idAsIndex should be true with a smallint or bigint id field.
  * 64a1d39: Fixed long multibyte parameter logging in DbalLogger:startQuery
  * 4cf06c1: Keep the file extension in the temporary copy and test that it exists (closes #7482)
  * 64ac34d: [Security] fixed wrong interface
@@ -285,7 +285,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * 6575df6: [Security] use current request attributes to generate redirect url?
  * 7216cb0: [Validator] fix showing wrong max file size for upload errors
  * c423f16: [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge
- * 7d87ecd: [FrameworkBundle] fixed cahe:clear command's warmup
+ * 7d87ecd: [FrameworkBundle] fixed cache:clear command's warmup
  * 5ad4bd1: [TwigBridge] now enter/leave scope on Twig_Node_Module
  * fe4cc24: [TwigBridge] fixed fixed scope & trans_default_domain node visitor
  * fc47589: [BrowserKit] added ability to ignored malformed set-cookie header

diff --git a/CHANGELOG-2.3.md b/CHANGELOG-2.3.md