Merge branch '3.2'

* 3.2:
  Use PHPUnit 6.0 on PHP 7.* test lines

Author: nicolas-grekas

Tests/DependencyInjection/FormPassTest.php

@@ -195,7 +195,12 @@ public function testPrivateTaggedServices($id, $tagName, $expectedExceptionMessa
         $container->setDefinition('form.extension', $extDefinition);
         $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
 
-        $this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage($expectedExceptionMessage);
+        } else {
+            $this->setExpectedException('InvalidArgumentException', $expectedExceptionMessage);
+        }
 
         $container->compile();
     }

composer.json

@@ -18,14 +18,14 @@
     "require": {
         "php": ">=5.5.9",
         "symfony/event-dispatcher": "~2.8|~3.0",
-        "symfony/intl": "~2.8|~3.0",
+        "symfony/intl": "^2.8.18|^3.2.5",
         "symfony/options-resolver": "~2.8|~3.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/property-access": "~2.8|~3.0"
     },
     "require-dev": {
         "doctrine/collections": "~1.0",
-        "symfony/validator": "~2.8|~3.0",
+        "symfony/validator": "^2.8.18|^3.2.5",
         "symfony/dependency-injection": "~3.2",
         "symfony/config": "~2.7|~3.0",
         "symfony/http-foundation": "~2.8|~3.0",