Nicolas Grekas
309ad43b71
Merge branch '2.3' into 2.7
...
* 2.3:
[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
Conflicts:
composer.json
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
2015-10-10 11:26:25 +02:00
Nicolas Grekas
b47b51187e
Merge branch '2.6' into 2.7
...
* 2.6:
fix missing links to https://symfony.com
fix missing links to https://symfony.com
[travis] Don't use the cache
[DebugBundle] Remove inlined dumps on XHR
Conflicts:
src/Symfony/Component/Security/Acl/README.md
src/Symfony/Component/Security/Core/README.md
src/Symfony/Component/Security/Csrf/README.md
src/Symfony/Component/Security/Http/README.md
2015-05-13 13:34:46 +02:00
Nicolas Grekas
70e6a145c8
fix missing links to https://symfony.com
2015-05-13 13:33:56 +02:00
Tobias Schultze
4e85901380
Use PSR-4 everywhere instead of PSR-0
2015-04-11 23:38:32 +02:00
Fabien Potencier
5503804cf9
removed 3.0 constraints from 2.7 composer files
2015-04-10 09:23:38 +02:00
Nicolas Grekas
2f3692aca7
Merge branch '2.3' into 2.6
...
* 2.3:
Minor hot fix
[PROCESS] make sure /dev/tty is readable
[2.3] require-dev PHPUnit bridge
[FrameworkBundle] Fixed Shell logo
[2.3] Update CONTRIBUTING.md
[2.3][Process] Fixed PhpProcess::getCommandLine() result
[Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
Enforce UTF-8 charset for core controllers
Conflicts:
CONTRIBUTING.md
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Templating/composer.json
2015-02-24 12:52:21 +01:00
Nicolas Grekas
acac734d08
[PhpUnitBridge] new bridge for testing with PHPUnit
2015-02-18 11:38:04 +01:00
Fabien Potencier
6dc897931b
bumped min PHP version to 5.3.9
2015-01-09 07:51:41 +01:00
Nicolas Grekas
b369bb6eed
[2.7] Allow 3.0 requirements
2014-12-27 12:44:51 +01:00
Nicolas Grekas
176b175043
Merge branch '2.6' into 2.7
...
* 2.6:
[2.6] Test lowest versions of dependencies
Test lowest versions of dependencies
Fix placeholder date format
Test components using their lowest possible deps
2014-12-16 21:28:45 +01:00
Nicolas Grekas
a29ffa82d6
[2.6] Test lowest versions of dependencies
2014-12-16 19:41:39 +01:00
Fabien Potencier
d94d837e9e
updated version to 2.7
2014-11-10 19:00:54 +01:00
Fabien Potencier
a11645c637
updated version to 2.6
2014-05-23 16:36:49 +02:00
Fabien Potencier
4aab341d59
updated version to 2.5
2013-11-24 21:17:07 +01:00
Tobias Schultze
7366901691
adjust doctrine dependencies
2013-11-07 14:20:52 +01:00
Bernhard Schussek
2e04e32c8f
Updated Composer dependencies to require the Security\Csrf component where necessary
2013-09-30 14:39:06 +02:00
Bernhard Schussek
85d49597a9
[Security] Changed Security HTTP sub-component to depend on CSRF sub-component instead of Form
2013-09-27 10:08:57 +02:00
Bernhard Schussek
7826781235
[Security] Split the component into 3 sub-components Core, ACL, HTTP
2013-09-18 09:16:41 +02:00