Nicolas Grekas
|
3410aa6630
|
Merge branch '2.7'
* 2.7:
[PhpUnitBridge] new bridge for testing with PHPUnit
[FrameworkBundle] Check if templating is enabled.
[Filesystem] Improve exception message for copy method
[FrameworkBundle] Made ServerParams a service
[2.7] [FrameworkBundle] bugfix in configuration for assets
[FrameworkBundle] Enable assets by default.
[Form] OptionsResolver 3.0 is not BC anymore
[TwigBundle] add missing asset dependency
Add an auto_alias compiler pass
Conflicts:
.travis.yml
composer.json
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
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/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/Console/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/Form/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/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/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
|
2015-02-21 14:23:59 +01:00 |
|
Nicolas Grekas
|
acac734d08
|
[PhpUnitBridge] new bridge for testing with PHPUnit
|
2015-02-18 11:38:04 +01:00 |
|
Fabien Potencier
|
4d0adeae16
|
[Asset] added a NullContext class
|
2015-02-10 13:45:00 +01:00 |
|
Fabien Potencier
|
d33c41d436
|
[Asset] added the component
|
2015-02-10 13:45:00 +01:00 |
|