Merge branch '2.5'

fabpot · fabpot · commit a469c560fbdf · 2014-09-20T08:11:16.000+02:00
* 2.5: [Debug] Restoring error handler before assertions Unit test fixes Fixed merge conflict in .travis.yml introduced in 687703a Conflicts: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
diff --git a/.travis.yml b/.travis.yml
@@ -22,10 +22,6 @@ before_install:
     - 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
-<<<<<<< HEAD
-    - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
-=======
->>>>>>> 2.4
 #    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'
 
 install:
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Validator\Constraints\Image;
 use Symfony\Component\Validator\Constraints\ImageValidator;
+use Symfony\Component\Validator\Validation;
 
 class ImageValidatorTest extends AbstractConstraintValidatorTest
 {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Validator\Constraints\Image;`
`15`	`15`	`use Symfony\Component\Validator\Constraints\ImageValidator;`
	`16`	`+use Symfony\Component\Validator\Validation;`
`16`	`17`
`17`	`18`	`class ImageValidatorTest extends AbstractConstraintValidatorTest`
`18`	`19`	`{`