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
MAXakaWIZARD
668c502982
[Console] [Helper] [Table] Add ability to set styles for individual columns
2015-10-06 17:25:39 +02:00
Fabien Potencier
c0e4495b66
fixes CS
2015-08-24 09:13:45 +02:00
Fabien Potencier
9f86195158
feature #14991 [Console][Table] allow multiple render() calls. (jaytaph)
...
This PR was merged into the 2.8 branch.
Discussion
----------
[Console][Table] allow multiple render() calls.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Fixed tickets | ~
| Tests pass? | yes
| License | MIT
This is a cherry-pick of #14983 .
Commits
-------
b93bcc1
Fixed colspan issues with multiple render() calls
2015-06-22 18:34:55 +02:00
Joshua Thijssen
b93bcc1153
Fixed colspan issues with multiple render() calls
2015-06-20 19:03:48 +00:00
Nicolas Grekas
b1fabf5772
Merge branch '2.6' into 2.7
...
* 2.6:
[Debug] Fix log level of stacked errors
[VarDumper] Fix uninitialized id in HtmlDumper
Fixed fluent interface
[Debug] fix debug class loader case test on windows
[Debug+VarDumper] Fix handling of PHP7 exception/error model
[2.6][Security][Translation] #14920 update translations
[VarDumper] Cherry-pick code style fixes from 2.7
Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property
Conflicts:
src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
src/Symfony/Component/VarDumper/Caster/DOMCaster.php
src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
src/Symfony/Component/VarDumper/Caster/PdoCaster.php
src/Symfony/Component/VarDumper/Caster/SplCaster.php
2015-06-18 10:00:47 +02:00
Joshua Thijssen
138f4a9849
Fixed fluent interface
2015-06-16 20:12:29 +02:00
Abdellatif Ait boudad
ed18767fbe
[Console][Table] Add support for colspan/rowspan + multiple header lines
2015-03-26 17:59:57 +01:00
Fabien Potencier
14caaec5f6
[Console] added the possibility to insert a table separator anywhere in a table output
2014-03-03 14:12:09 +01:00
Fabien Potencier
39c495f814
[Console] deprecated TableHelper in favor of Table
2014-03-03 14:12:09 +01:00