diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-09 20:59:30 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-09 20:59:30 +0100 |
commit | 5a21091f4faa5965beacc32fe3379f8a09ada0c0 (patch) | |
tree | e07162b6f910d97742cd3e17b62ab235bc471cfa /Csrf | |
parent | 95438f940c687d4efbc8162b2c8ff2a8e6a92cd1 (diff) | |
parent | 000c29c2deaea9e4ea3e30ee7ac5409a7090b2da (diff) | |
download | symfony-security-5a21091f4faa5965beacc32fe3379f8a09ada0c0.zip symfony-security-5a21091f4faa5965beacc32fe3379f8a09ada0c0.tar.gz symfony-security-5a21091f4faa5965beacc32fe3379f8a09ada0c0.tar.bz2 |
Merge branch '2.7'
* 2.7: (22 commits)
[DependencyInjection] deprecated synchronized services
[FrameworkBundle] adds legacy tests for deprecated configuration keys.
[TwigBundle] adds legacy tests for deprecated configuration keys.
[PropertyAccessor] Added test to allow null value for a array
[Yaml] Fixed #10597: Improved Yaml directive parsing
[Validator] always use the lazy loading metadata factory
[Validator] removed usage of deprecated getMessageParameters() and getMessagePluralization() in unit tests
[Validator] fixed deprecation notices for BuildViolation() calls in constraints
[Validator] fixed usage of deprecate Validator features
[Validator] removed obsolete code
removed the Validator BC layer for PHP < 5.3.9
removed code for PHP < 5.3.9
bumped min PHP version to 5.3.9
fixed deprecation summary and missing error_reporting() in tests
[Form] Fixed check of violation constraint #12792
[FrameworkBundle] adds deprecation notice on framework.csrf_protection.field_name configuration key.
[TwigBundle] adds missing deprecation notice for the twig.form.resources configuration key.
[FrameworkBundle] avoid using deprecated classes for reflection
[FrameworkBundle] Add a test case for service aliases used with AddExpressionLanguageProviderPass.
[FrameworkBundle] fixed #12847 AddExpressionLanguageProviderPass
...
Conflicts:
.travis.yml
composer.json
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/Propel1/composer.json
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/Tests/DependencyInjection/FrameworkExtensionTest.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/Config/composer.json
src/Symfony/Component/Console/composer.json
src/Symfony/Component/CssSelector/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/ExpressionLanguage/composer.json
src/Symfony/Component/Filesystem/composer.json
src/Symfony/Component/Finder/composer.json
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/OptionsResolver/composer.json
src/Symfony/Component/Process/composer.json
src/Symfony/Component/PropertyAccess/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/Acl/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/Stopwatch/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
Diffstat (limited to 'Csrf')
-rw-r--r-- | Csrf/composer.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Csrf/composer.json b/Csrf/composer.json index 805b63e..58bef11 100644 --- a/Csrf/composer.json +++ b/Csrf/composer.json @@ -16,8 +16,8 @@ } ], "require": { - "php": ">=5.5.9", - "symfony/security-core": "~2.7|~3.0" + "php": ">=5.3.9", + "symfony/security-core": "~2.4|~3.0.0" }, "require-dev": { "symfony/http-foundation": "~2.7|~3.0" |