This PR was merged into the master branch.
Commits
-------
d5e73e5 [SecurityBundle] changed includes to use the new Twig notation
Discussion
----------
[SecurityBundle] changed includes to use the new Twig notation
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | no - couple of unrelated failures
| Fixed tickets | N/A
| License | MIT
| Doc PR | N/A
This PR was merged into the master branch.
Commits
-------
3d762dd [HttpKernel] Fixed the Redis profiler storage return value
44fe249 Fixed some tests on Windows
Discussion
----------
Fix tests
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR | n/a
This fixes the testsuite in master.
For the Redis storage, the test failure seems to come from a bad resolution when merging 2.1 into master.
---------------------------------------------------------------------------
by stof at 2013-01-18T20:58:59Z
I still have some failing tests in master locally:
- some tests with the incremental output tests in the Process component
- a timing test for the Stopwatch component (but passing when running only the Stopwatch tests)
- some mock expectations in the Form component.
However, all these tests are passing on Travis so it looks weird.
This PR was merged into the master branch.
Commits
-------
94cb13d [FrameworkBundle] fixed circular reference for service templating (closes#6730, closes#6762)
Discussion
----------
[FrameworkBundle] fixed circular reference for service templating (closes#6730, closes#6762)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6730, #6762
| License | MIT
| Doc PR | n/a
---------------------------------------------------------------------------
by tristanbes at 2013-01-18T14:55:39Z
@fabpot Do you have an idea when you'll merge it please ?
This PR was squashed before being merged into the master branch (closes#6789).
Commits
-------
917f473 [Console] Removing unnecessary sprintf in Application->getHelp
Discussion
----------
[Console] Removing unnecessary sprintf in Application->getHelp
Minor change of the `Symfony\Component\Console\Application->getHelp()` method.
I have spotted:
1. an unnecessary `sprintf` call (no `args` arguments);
2. two ways of adding a new line in the help (an empty string as new entry of the array and a `\n` at the end of the string).
It seems to be there since the begining and it looks like a forgoten change to me, so I fixed them by removing the `sprintf` call and using a new array entry (empty string) instead of the `\n`.
| Q | A
| ------------- | ---
| License | MIT
* 2.1:
[Yaml] fixed unneeded BC break
[DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
[Yaml] fixed typo
updated VERSION for 2.1.7
updated CHANGELOG for 2.1.7
updated VERSION for 2.0.22
update CONTRIBUTORS for 2.0.22
updated CHANGELOG for 2.0.22
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
* 2.0:
[Yaml] fixed unneeded BC break
[DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
[Yaml] fixed typo
updated VERSION for 2.0.22
update CONTRIBUTORS for 2.0.22
updated CHANGELOG for 2.0.22
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
* 2.1:
[Yaml] fixed default value
Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
added a way to enable/disable object support when parsing/dumping
added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
fixed CS
[Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
fixes a bug when output/error output contains a % character
[Console] fixed input bug when the value of an option is empty (closes#6649, closes#6689)
[Profiler] [Redis] Fix sort of profiler rows.
Fix version_compare() calls for PHP 5.5.
Removed underscores from test method names to be consistent with other components.
[Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
Fix version_compare() calls for PHP 5.5.
Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
removed the .gitattributes files (closes#6605, reverts #5674)
[HttpKernel] Clarify misleading comment in ExceptionListener
Conflicts:
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
src/Symfony/Component/Process/Process.php
* 2.0:
[Yaml] fixed default value
Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
added a way to enable/disable object support when parsing/dumping
added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
[Console] fixed input bug when the value of an option is empty (closes#6649, closes#6689)
Conflicts:
src/Symfony/Component/Yaml/Dumper.php
src/Symfony/Component/Yaml/Parser.php
src/Symfony/Component/Yaml/Tests/DumperTest.php
src/Symfony/Component/Yaml/Tests/ParserTest.php
src/Symfony/Component/Yaml/Yaml.php
YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/
Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.
The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).
Conflicts:
src/Symfony/Component/Yaml/Dumper.php
src/Symfony/Component/Yaml/Yaml.php
By default, object support is disabled, and instead of throwing an
exception when an object is handled, null is returned.
If you do need object support, enable it via:
Yaml::dump($data, false, true);
If you want an exception to be thrown in case an invalid type is handled
(a PHP resource or a PHP object), pass true as the second argument:
Yaml::dump($data, true, true);
The same can be done when parsing:
Yaml::parse($data, 2, false, true);
PHP support when parsing a file has been disabled by default.
If you do need PHP support when parsing a YAML file, enable it via:
Yaml::setPhpParsing(true);
As of Symfony 2.1, PHP support is disabled by default, and support will
be removed in Symfony 2.3.
This PR was merged into the master branch.
Commits
-------
2a7ecf7 Merge branch 'master' of github:MaksSlesarenko/symfony into added-support-for-propel-enum-types-forms
3ae5b55 added support for propel enum types in PropelTypeGuesser
Discussion
----------
added support for propel enum types in PropelTypeGuesser
added support for propel enum and mysql enum field types
---------------------------------------------------------------------------
by willdurand at 2013-01-14T19:06:06Z
The build status is a Travis-CI issue. Should be green.
---------------------------------------------------------------------------
by MaksSlesarenko at 2013-01-16T23:11:52Z
"The build status is a Travis-CI issue. Should be green."
It definitely should...
PHPUnit 3.7.10 by Sebastian Bergmann.
Configuration read from ../symfony/symfony/src/Symfony/Bridge/Propel1/phpunit.xml.dist
.......................................
Time: 0 seconds, Memory: 8.50Mb
OK (39 tests, 96 assertions)
This PR was merged into the master branch.
Commits
-------
2d53698 Make last toolbar info box right-aligned
Discussion
----------
[WebProfilerBundle] Make last toolbar info box right-aligned
Content is less likely to go off the edge of the screen if the last box is aligned right instead of left:
This PR was merged into the master branch.
Commits
-------
41d3953 Fix regression in WDT path/pattern naming
Discussion
----------
[WDT] Fix regression in WDT path/pattern naming
Bug fix: yes (master only)
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: ~
Todo: see below
License of the code: MIT
Documentation PR: ~
This fixes a regression in WDT where clicking routing panel triggers an error.
Let me know if this should be fixed in collector as well as it could be considered a regression.
---------------------------------------------------------------------------
by fabpot at 2013-01-16T16:12:27Z
It should be also fixed in the collector as the profiler data are not compatible between versions anyway.
---------------------------------------------------------------------------
by dlsniper at 2013-01-16T18:21:42Z
@fabpot everything needed seems to be done. Either that or I'm missing something, if you can point me in the right direction, let me know. Thank you!
This PR was merged into the master branch.
Commits
-------
1c5d74c Fixed coding standards issues in invalid-xml-resources.xlf file.
552a806 Fixed coding standards issues.
293991d [Translation] Added some tests to QtFileLoader.
Discussion
----------
[Translation] Added some tests to QtFileLoader.
Added one test for testing exception is thrown if resource is not local.
Added one test for testing exception is thrown if xml resource is invalid.
QtFileLoader has now 100% code coverage.
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
This PR was merged into the master branch.
Commits
-------
68ac23f [Security] Added Danish translation
Discussion
----------
[Security] Added Danish translation
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Deprecations: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
This PR was merged into the master branch.
Commits
-------
ed2d542 Added Serbian Latin tanslation for security component
Discussion
----------
[Security] Added Serbian Latin tanslation for security component
This PR was merged into the 2.1 branch.
Commits
-------
a62e04f [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
Discussion
----------
[2.1][Process] Fix docblocks, remove `return` from `PhpProcess#start()`
This PR was merged into the master branch.
Commits
-------
27d9385 wrap the exception to get information about where the exception comes from
Discussion
----------
Wrap the exception to get more information about where the exception comes from
Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
This patch add more information about where the exception comes from.
Actual you get one exception
```
The service definition "fos_user.registration.form" does not exist.
```
After the patch you get
```
[2/2] Try to replace alias "fos_user.registration.form" with "hwi_oauth.registration.form".
[1/2] The service definition "fos_user.registration.form" does not exist.
```
---------------------------------------------------------------------------
by gimler at 2013-01-16T08:38:36Z
@fabpot i have changed the wording
---------------------------------------------------------------------------
by stloyd at 2013-01-16T08:40:53Z
@gimler Maybe you add [test too](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php) ? Anyway 👍
Fabien Potencier
Dave Marshall
Christophe Coevoet
Loic Chardonnet
sun
Lee McDermott
umpirsky
Florin Patan
Antoine Corcy
Gordon Franke
vicentgodella
