Fabien Potencier
7ae26ed5f1
Merge branch '2.8' into 3.1
...
* 2.8:
fixed obsolete getMock() usage
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
do not remove the Twig ExceptionController service
removed obsolete condition
do not try to register incomplete definitions
2016-12-19 16:53:49 +01:00
Fabien Potencier
84e75a78b3
Merge branch '2.7' into 2.8
...
* 2.7:
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
2016-12-19 16:38:44 +01:00
Fabien Potencier
71d059cad1
fixed obsolete getMock() usage
2016-12-19 16:22:46 +01:00
Nicolas Grekas
2e11b8b2cb
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
2015-10-10 12:22:50 +02:00
Nicolas Grekas
3ecf2062b8
Merge branch '2.7' into 2.8
...
* 2.7:
[tests] Use @requires annotation when possible
[tests] Use @requires annotation when possible
[ci] Enable collecting and replaying skipped tests
[Process] Workaround buggy PHP warning
[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/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/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/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/composer.json
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/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
2015-10-10 11:36:22 +02:00
Nicolas Grekas
b028aeaa04
[tests] Use @requires annotation when possible
2015-10-10 11:00:45 +02:00
Nicolas Grekas
6005fe53f7
Merge branch '2.8'
...
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
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/Translation/PluralizationRules.php
src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
2015-10-07 09:44:07 +02:00
Pierre du Plessis
f02973acd8
Deprecate the SecureRandom class
2015-10-06 20:09:25 +02:00
Fabien Potencier
dcc80c7b8a
Merge branch '2.8'
...
* 2.8:
fixes CS
fixed CS
[DependencyInjection] Add missing file headers
fixed typo
made Symfony compatible with both Twig 1.x and 2.x
[FrameworkBundle] Fix precedence of xdebug.file_link_format
2015-08-24 09:21:16 +02:00
Fabien Potencier
c0e4495b66
fixes CS
2015-08-24 09:13:45 +02:00
Graham Campbell
35e0845f23
[3.0] Removed some old hacks
2014-12-30 11:17:11 +01:00
Fabien Potencier
d1a97da846
No global state for isolated tests and other fixes
2014-12-29 11:03:03 +01:00
Christian Flothmann
d2f846b453
compare version using PHP_VERSION_ID
...
This continues the work started in #12497 on the `2.3` branch.
2014-11-23 21:10:39 +01:00
Fabien Potencier
23f12faa53
fixed CS
2013-10-30 09:33:58 +01:00
Tobias Schultze
d7eb8ff64a
[Csrf] component fixes
2013-10-17 23:29:16 +02:00
Bernhard Schussek
d4bb5f4e3c
[Security\Csrf] Split CsrfTokenGenerator into CsrfTokenManager and TokenGenerator
2013-10-07 14:50:43 +02:00
Bernhard Schussek
7c7d86e369
[Security] Fixed test cases of the Csrf sub-component
2013-10-01 10:18:52 +02:00
Bernhard Schussek
1bf16400fb
[Security] Added CSRF sub-component
2013-09-27 10:08:54 +02:00