diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-28 17:22:14 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-28 17:22:14 +0200 |
| commit | 14ca1a79c7396ff033f094d4e8da010ecb9e5fef (patch) | |
| tree | 15329ad0526d6200f2194833b55bd9c1fbcb04d5 | |
| parent | a327d379c0fa22fe7e41e619ee71dd96ece41ae5 (diff) | |
| parent | 99161aa1eba30b0a981a876267b0ade4791d0300 (diff) | |
| download | symfony-security-14ca1a79c7396ff033f094d4e8da010ecb9e5fef.zip symfony-security-14ca1a79c7396ff033f094d4e8da010ecb9e5fef.tar.gz symfony-security-14ca1a79c7396ff033f094d4e8da010ecb9e5fef.tar.bz2 | |
Merge branch '2.4' into 2.5v2.5.5
* 2.4:
[Debug] fixed class lookup when using PSR-0 with a target dir
fixed standalone tests
fixed standalone tests
[Validator] fixed component standalone tests
fixed standalone component tests depending on Validator and Form
fixed some composer.json to make standalone component tests pass
[SecurityBundle] fixed tests when used in standalone
Conflicts:
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Validator/composer.json
| -rw-r--r-- | Core/composer.json | 2 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Core/composer.json b/Core/composer.json index 249d4c1..09e3915 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -22,7 +22,7 @@ "symfony/event-dispatcher": "~2.1", "symfony/expression-language": "~2.4", "symfony/http-foundation": "~2.4", - "symfony/validator": "~2.2", + "symfony/validator": "~2.5", "psr/log": "~1.0", "ircmaxell/password-compat": "1.0.*" }, diff --git a/composer.json b/composer.json index a8a99f5..975baba 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, "require-dev": { "symfony/routing": "~2.2", - "symfony/validator": "~2.2", + "symfony/validator": "~2.2,<2.5.0", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", "psr/log": "~1.0", |