diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-02-21 14:23:59 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-02-21 14:23:59 +0100 |
| commit | 8787e41ac6d0bc2dda6ff8aede0de30dc020f6fb (patch) | |
| tree | 62618364a024d02cb61daa9c12c76d75509213f5 /Http | |
| parent | 1becbbdab19283e5c19eb8072965865a60e33876 (diff) | |
| parent | 3f4445d6fc2a41eb27b342fbbf0a6eafeeb80b40 (diff) | |
| download | symfony-security-8787e41ac6d0bc2dda6ff8aede0de30dc020f6fb.zip symfony-security-8787e41ac6d0bc2dda6ff8aede0de30dc020f6fb.tar.gz symfony-security-8787e41ac6d0bc2dda6ff8aede0de30dc020f6fb.tar.bz2 | |
Merge branch '2.7'
* 2.7:
[PhpUnitBridge] new bridge for testing with PHPUnit
[FrameworkBundle] Check if templating is enabled.
[Filesystem] Improve exception message for copy method
[FrameworkBundle] Made ServerParams a service
[2.7] [FrameworkBundle] bugfix in configuration for assets
[FrameworkBundle] Enable assets by default.
[Form] OptionsResolver 3.0 is not BC anymore
[TwigBundle] add missing asset dependency
Add an auto_alias compiler pass
Conflicts:
.travis.yml
composer.json
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Bundle/WebProfilerBundle/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/composer.json
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DependencyInjection/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/composer.json | 1 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Http/composer.json b/Http/composer.json index a5cccca..97c4a07 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -23,6 +23,7 @@ "symfony/http-kernel": "~2.7|~3.0" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0", "symfony/routing": "~2.7|~3.0", "symfony/security-csrf": "~2.7|~3.0", "psr/log": "~1.0" diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist index 58fe58e..49b36f2 100644 --- a/Http/phpunit.xml.dist +++ b/Http/phpunit.xml.dist @@ -12,9 +12,7 @@ bootstrap="vendor/autoload.php" > <php> - <!-- Disable E_USER_DEPRECATED until 3.0 --> - <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' --> - <ini name="error_reporting" value="-16385"/> + <ini name="error_reporting" value="-1" /> </php> <testsuites> |