diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-25 11:26:10 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-25 11:26:10 +0100 |
| commit | 8d6c4e20afe24a18f6d54bf38f910e27d7abe615 (patch) | |
| tree | db0835a812f53e35d9eb203f72d86936288134c6 | |
| parent | 080ac3294fac8b217afe620230600fb427bd2f51 (diff) | |
| parent | 1362197c7127234310faf2c6ebae6876fa28966e (diff) | |
| download | symfony-security-8d6c4e20afe24a18f6d54bf38f910e27d7abe615.zip symfony-security-8d6c4e20afe24a18f6d54bf38f910e27d7abe615.tar.gz symfony-security-8d6c4e20afe24a18f6d54bf38f910e27d7abe615.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
[2.5] silence deprecation notices in new components
[TwigBundle] added missing absolute URL in Twig exceptions
| -rw-r--r-- | Acl/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Core/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Csrf/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Acl/phpunit.xml.dist b/Acl/phpunit.xml.dist index 6520948..50d0448 100644 --- 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 index f085b72..7bdf5cb 100644 --- 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 index 0718c76..0606071 100644 --- 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 index a735efd..a152839 100644 --- 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> |