diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 12:22:50 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 12:22:50 +0200 |
| commit | 1d2585926ab63fd5b139b1f86111dd1b2cbccb1b (patch) | |
| tree | 7a89fcfac97628ecd4045466f4661cf2433490fc /Http/AccessMapInterface.php | |
| parent | e91997496707add4092403e341d6be2c7d2139ae (diff) | |
| parent | 5ebc79576c9de0dd7089d226cfb8da3be3683766 (diff) | |
| download | symfony-security-1d2585926ab63fd5b139b1f86111dd1b2cbccb1b.zip symfony-security-1d2585926ab63fd5b139b1f86111dd1b2cbccb1b.tar.gz symfony-security-1d2585926ab63fd5b139b1f86111dd1b2cbccb1b.tar.bz2 | |
Merge branch '2.8'
* 2.8:
Fix merge
[tests] Use @requires annotation when possible
[tests] Use @requires annotation when possible
[PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests
[ci] Enable collecting and replaying skipped tests
[tests] Use @requires annotation when possible
[Process] Workaround buggy PHP warning
[FrameworkBundle] Replace PhpFileCache by FilesystemCache
[FrameworkBundle] composer suggest fix
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Added more tests for PropertyAccess
Conflicts:
.travis.yml
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/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/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/Asset/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
src/Symfony/Component/ClassLoader/composer.json
src/Symfony/Component/Config/composer.json
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
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/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Ldap/composer.json
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/Locale/phpunit.xml.dist
src/Symfony/Component/OptionsResolver/composer.json
src/Symfony/Component/Process/composer.json
src/Symfony/Component/PropertyAccess/composer.json
src/Symfony/Component/PropertyInfo/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/Guard/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/Mapping/Cache/LegacyApcCacheTest.php
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
Diffstat (limited to 'Http/AccessMapInterface.php')
0 files changed, 0 insertions, 0 deletions