This PR was merged into the 2.2 branch.
Commits
-------
4052865 Update time.html.twig
Discussion
----------
[WebprofilerBundle] Update time.html.twig
the "max" variable seems to be unused
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7333).
Commits
-------
6992a9e [DependencyInjection] fixed id case when setting a service (also slightly enhanced an error message)
Discussion
----------
[DependencyInjection] fixed id case when setting a service (also slightly enhanced an error message)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n/a
| License | MIT
| Doc PR | n/a
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7320).
Commits
-------
7ff2d52 Property accessor custom array object fix
Discussion
----------
Property accessor custom array object fix
Copied `Symfony\Component\Form\Tests\Fixtures\CustomArrayObject` to Fixtures dir, and used it in tests to be able run tests separately from Form component,
This PR was squashed before being merged into the 2.2 branch (closes#7321).
Commits
-------
4f3771d [2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions
Discussion
----------
[2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/7309
---------------------------------------------------------------------------
by Aitboudad at 2013-03-10T11:38:59Z
Hi @fabpot,
can you see why all commits has failed on Travis ?
---------------------------------------------------------------------------
by henrikbjorn at 2013-03-10T11:42:25Z
The test expects the option to be called `renderer` and not `strategy` so you need to change the tests.
---------------------------------------------------------------------------
by Aitboudad at 2013-03-10T12:19:19Z
@henrikbjorn thanks it's ok, but there is still 1 test :( in Symfony\Component\Form\Tests\Extension\Core\Type\TimeTypeTest::testSetDataDifferentTimezones
@bschussek Can you see why :).
This PR was merged into the 2.2 branch.
Commits
-------
a735cbd fix xargs pipe to work with spaces in dir names
Discussion
----------
[Finder] fix xargs pipe to work with spaces in dir names
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
.. otherwise grep fails:
````
grep: : No such file or directory
grep: /Users/havvg/Web: No such file or directory
grep: Development/symfony2/src/Symfony/Component/Finder/Tests/Fixtures/dolor.txt: No such file or directory
```
* 2.1:
[FrameworkBundle] Fix code status in dockblock
Fixed test to use Reflection
[Finder] fixed a potential issue on Solaris where INF value is wrong (refs #7269)
Update RouteCompiler.php
[FrameworkBundle] avoids cache:clear to break if new/old folders already exist
[HttpKernel] Fixed possible profiler token collision (closes#7272, closes#7171)
[ClassLoader] tweaked test
[ClassLoader] made DebugClassLoader idempotent
[DomCrawler] Fix relative path handling in links
Conflicts:
src/Symfony/Component/DomCrawler/Link.php
src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
src/Symfony/Component/Routing/RouteCompiler.php
This PR was merged into the 2.1 branch.
Commits
-------
547350c [FrameworkBundle] Fix code status in dockblock
Discussion
----------
[FrameworkBundle] Fixed code status in docblock
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
---------------------------------------------------------------------------
by Tobion at 2013-03-09T15:23:46Z
👍
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7302).
Commits
-------
3f3cf0c fix xargs pipe to work with spaces in dir names
Discussion
----------
[Finder] fix xargs pipe to work with spaces in dir names
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
.. otherwise grep fails:
````
grep: : No such file or directory
grep: /Users/havvg/Web: No such file or directory
grep: Development/symfony2/src/Symfony/Component/Finder/Tests/Fixtures/dolor.txt: No such file or directory
```
This PR was merged into the 2.1 branch.
Commits
-------
27cc0df Merge pull request #1 from merk/class-loader/idempotent
95af84c Fixed test to use Reflection
bb08247 [ClassLoader] tweaked test
73bead7 [ClassLoader] made DebugClassLoader idempotent
Discussion
----------
[ClassLoader] made DebugClassLoader idempotent
The DebugClassLoader will wrap itself if `enable()` is called multiple time, such as when running functional tests.
Please merge to 2.2 and master ASAP.
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | ~
| License | MIT
| Doc PR | ~
---------------------------------------------------------------------------
by kriswallsmith at 2013-03-07T16:38:55Z
ping @fabpot: this will speed up lots of functional tests :)
---------------------------------------------------------------------------
by kriswallsmith at 2013-03-08T04:51:51Z
@fabpot fixed by @merk
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7292).
Commits
-------
4ffe234 Fix warning for buildXml method
Discussion
----------
Fix missing argument
This PR was submitted on the symfony/Serializer read-only repository and moved automatically to the main Symfony repository (closessymfony/Serializer#4).
Fix "Warning: Missing argument 3" for XmlEncoder::buildXml() called several times in XmlEncoder::selectNodeType()
This PR was merged into the 2.2 branch.
Commits
-------
a59e5e4 [Finder] Unified tests
Discussion
----------
[Finder] Unified tests
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Tests for `Finder` are very difficult to read because they contain calls to:
sys_get_temp_dir() . '/symfony2_finder/'
This improved version simplifies adding and removing new dirs and files.
This PR was merged into the 2.2 branch.
Commits
-------
54c333d [Routing] unify and fix the loader tests
41ad9d8 [Routing] make xml loader more tolerant
Discussion
----------
[Routing] make xml loader more tolerant
schemes and methods may also be delimited by whitespace, comma or pipe.
Fixes https://github.com/symfony/symfony/pull/6049#issuecomment-11315698
this eases migration as now `methods="GET|POST"` also works
the second commit unifies the tests and fixes some strange assertions that were useless
| Q | A
| ------------- | ---
| Bug fix? | [yes]
| New feature? | [yes but not really]
| BC breaks? | [no]
| Deprecations? | [no]
| Tests pass? | [yes]
| License | MIT
This PR was merged into the 2.1 branch.
Commits
-------
a4ec677 [DomCrawler] Fix relative path handling in links
Discussion
----------
[2.1][DomCrawler] Fix relative path handling in links
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7219
| License | MIT
| Doc PR | n/a
Added relative path canonicalization according to RFC 3986, section 5.2.4
---------------------------------------------------------------------------
by vicb at 2013-03-02T14:48:46Z
@fabpot seems like 2.1 as a deps issue if you look at travis logs
This PR was squashed before being merged into the 2.1 branch (closes#7260).
Commits
-------
1d3da29 [FrameworkBundle] avoids cache:clear to break if new/old folders already exist
Discussion
----------
[FrameworkBundle] avoids cache:clear to break if new/old folders already exist
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6502
---------------------------------------------------------------------------
by mahmouds at 2013-03-04T19:07:20Z
👍
This PR was merged into the 2.2 branch.
Commits
-------
ac0c4ce Fixed typo in UPGRADE-2.2
Discussion
----------
Fixed typos in UPGRADE-2.2
| Q | A
| ------------- | ---
| Fixed tickets | -
| License | MIT
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7264).
Commits
-------
edda254 remove dead code in yaml component
Discussion
----------
remove dead code in yaml component
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
Cleanup unused code.
---------------------------------------------------------------------------
by fabpot at 2013-03-06T16:27:57Z
Can you explain why it is not needed anymore?
---------------------------------------------------------------------------
by igorw at 2013-03-06T16:44:30Z
`$subject` is no longer used anywhere. The `substr` is now done inline in the `preg_match` call. This code is effectively dead.
This PR was squashed before being merged into the 2.1 branch (closes#7177).
Commits
-------
c82c754 RedisProfilerStorage wrong db-number/index-number selected
Discussion
----------
RedisProfilerStorage wrong db-number/index-number selected
bug: in the webprofiler the wrong database (0) is selected when storage should not go to index 0. on redis connect the default behaviour is to select index/database number 0, but it is necessary to select a special index/database.
see: http://rediscookbook.org/multiple_databases.html
[HttpKernel] [Profiler] [RedisProfilerStorage] added select for a db-number/db-index to dsn-patttern
| Q | A
| ------------- | ---
| Bug fix? | [yes]
| New feature? | [no]
| BC breaks? | [no]
| Deprecations? | [no]
| Tests pass? | [yes]
| Fixed tickets |
| License | MIT
Usage with index/db-number = 7 :
```xml
<!-- config_dev.xml -->
<symfony:profiler only-exceptions="false" dsn="redis://127.0.0.1:6379/7" lifetime="3600" />
```
```yml
#config_dev.yml
framework:
...
profiler:
...
dsn: redis://127.0.0.1:6379/7
```
---------------------------------------------------------------------------
by fabpot at 2013-02-27T07:21:02Z
Can you also add some unit tests?
---------------------------------------------------------------------------
by JohnDoe007 at 2013-02-27T09:36:28Z
@fabpot the function getRedis() is currently not testable, I think. this means I have to do a bigger change to the class, add a public function initRedis() or something and move initialize code there to make the initialization process, where my change is, testable. is this ok to do it in that bugfix/pull request? or should I add this test change to master and only adding this small bugfix to the 2.1-branch?
---------------------------------------------------------------------------
by fabpot at 2013-03-06T16:47:37Z
Thanks, I've merged the fix. Can you work on the changes needed to allow the code to be testable (on the master branch)?
This PR was merged into the 2.1 branch.
Commits
-------
6681df0 [Console] fixed StringInput binding
6b98883 [Console] added string input test
32f1904 Revert "merged branch jfsimon/issue-6749 (PR #7220)"
Discussion
----------
[Console] fixes tests
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7231
---------------------------------------------------------------------------
by gigablah at 2013-03-02T13:25:10Z
Apparently 5b19c892cf broke the console shell. I was wondering why all commands executed through the shell in 2.2.0 were throwing "Too many arguments" exception.
---------------------------------------------------------------------------
by stof at 2013-03-02T13:27:09Z
@gigablah This is already fixed in the 2.2 branch as this PR has already been merged in 2.2 (but the revert is also needed in 2.1)
---------------------------------------------------------------------------
by gigablah at 2013-03-02T13:51:44Z
Ah, guess I'll have to wait for it to be pushed to the symfony/console repository then.
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7261).
Commits
-------
ff8c5ca Unset loading[$id] in ContainerBuilder on exception
Discussion
----------
Unset loading[$id] in ContainerBuilder on exception
This is the same functionality that Container provides.
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
---------------------------------------------------------------------------
by vicb at 2013-03-04T22:43:07Z
could you add a unit test and use the standard PR header (symfony.com > doc > contributing). thanks.
---------------------------------------------------------------------------
by igorw at 2013-03-04T22:48:02Z
Can you add a test case? EDIT: I guess someone beat me to that comment. :)
This PR was merged into the 2.2 branch.
Commits
-------
c0687cd remove() should not use deprecated getParent() so it does not trigger deprecation internally
708c0d3 adjust routing tests to not use prefix in addCollection
6180c5b add test for uniqueness of resources
c0de07b added tests for addDefaults, addRequirements, addOptions
0a1cfcd adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component
ea694e4 added tests for remove() that wasnt covered yet and special route name
9e2bcb5 refactor interator test that was still assuming a tree
ceb9ab4 adjust tests to no use addPrefix with options
2b8bf6b adjusted tests to not use RouteCollection::getPrefix
acff735 [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3
Discussion
----------
[2.2][Routing] Trigger deprecation and refactor tests to not use deprecated methods
| Q | A
| ------------- | ---
| Bug fix? | [yes]
| New feature? | [no]
| BC breaks? | [no]
| Deprecations? | [no]
| Tests pass? | [yes]
| License | MIT
@fabpot please don't squash because it also added new tests
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7278).
Commits
-------
0cf2656 Default validation message translation fix.
Discussion
----------
Default validation message translation fix.
Add 'validators' for $translationDomain. Detailed discussion https://github.com/fabpot/Silex/pull/641
---------------------------------------------------------------------------
by fabpot at 2013-03-06T08:17:43Z
ping @bschussek
---------------------------------------------------------------------------
by stof at 2013-03-06T08:43:53Z
@fabpot Using ``null`` as translation domain would make weird things in the Translator component. So this change is needed IMO to have a sensible default.
---------------------------------------------------------------------------
by bschussek at 2013-03-06T10:42:59Z
👍
