Merge branch '2.5' into 2.6

nicolas-grekas · nicolas-grekas · commit 8d6c4e20afe2 · 2014-12-25T11:26:10.000+01:00
* 2.5:
  [2.5] silence deprecation notices in new components
  [TwigBundle] added missing absolute URL in Twig exceptions
diff --git a/Acl/phpunit.xml.dist b/Acl/phpunit.xml.dist
@@ -11,6 +11,10 @@
          syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
+        <ini name="error_reporting" value="-16385"/>
+    </php>
     <testsuites>
         <testsuite name="Symfony Security Component ACL Test Suite">
             <directory>./Tests/</directory>
diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist
@@ -11,6 +11,10 @@
          syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
+        <ini name="error_reporting" value="-16385"/>
+    </php>
     <testsuites>
         <testsuite name="Symfony Security Component Core Test Suite">
             <directory>./Tests/</directory>
diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist
@@ -11,6 +11,10 @@
          syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
+        <ini name="error_reporting" value="-16385"/>
+    </php>
     <testsuites>
         <testsuite name="Symfony Security Component CSRF Test Suite">
             <directory>./Tests/</directory>
diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist
@@ -11,6 +11,10 @@
          syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
+        <ini name="error_reporting" value="-16385"/>
+    </php>
     <testsuites>
         <testsuite name="Symfony Security Component HTTP Test Suite">
             <directory>./Tests/</directory>
