This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6240).
Commits
-------
0f6d534 Fixed a typo
Discussion
----------
Fixed a typo
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6252).
Commits
-------
97d9bf0 Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
Discussion
----------
Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
When having a Cache-Control header like:
max-age="0"
```isset($match[2])``` is true but ```$match[2]``` containing: ```"0"```, it is evaluated
as ```false```. The result is that ```true``` will be set to "max-age" entry instead of ```"0"```.
When having a Cache-Control header like:
max-age="0"
isset($match[2]) is true but $match[2] containing: "0", it is evaluated
as false and 'true' will be set to "max-age" entry instead of "0".
This PR was merged into the 2.1 branch.
Commits
-------
a37e5e3 [Form] Fix const inside an anonymous function
Discussion
----------
[Form] Fix const inside an anonymous function for PHP5.3
Related with the comment in #6217
---------------------------------------------------------------------------
by lsmith77 at 2012-12-10T09:14:20Z
+1 .. would be good to get this merged ASAP // @fabpot @bschussek
This PR was merged into the 2.1 branch.
Commits
-------
6e7e08f [Form] Fixed the default value of "format" in DateType to DateType::DEFAULT_FORMAT if "widget" is not "single_text"
Discussion
----------
[Form] Fixed the "format" option in DateType
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6141
Todo: -
License of the code: MIT
Documentation PR: -
This PR fixes a regression introduced in #4839. To quote that PR:
> This PR changes DateType and DateTimeType to support HTML5 by default when setting the option "widget" to "single_text".
In reality, the "format" option now defaults to the HTML5 format always, not just when "widget" is "single_text". This is fixed here.
The second commit in this PR removes special characters between select/text fields. What, with German locale, was
```
<day input>.<month input>.<year input>
```
before is now
```
<day input><month input><year input>
```
This is the way date fields are represented on the majority of websites. If you *need* separators, you can have them by setting the "format" option to a custom value:
```php
$builder->add('myDate', 'date', array(
'format' => 'dd.MM.yyyy',
));
```
---------------------------------------------------------------------------
by fabpot at 2012-12-07T08:52:21Z
The second commit should probably be done on master and it changes the behavior.
---------------------------------------------------------------------------
by bschussek at 2012-12-07T12:23:22Z
Ok, I removed the second commit now and removed the entries from the CHANGELOG.
This PR was merged into the 2.1 branch.
Commits
-------
ca5d9ac [DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed
Discussion
----------
[DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6190
Todo: -
License of the code: MIT
Documentation PR: n/a
---------------------------------------------------------------------------
by craue at 2012-12-06T18:31:43Z
👍
---------------------------------------------------------------------------
by lstrojny at 2012-12-06T18:35:04Z
What about a test?
---------------------------------------------------------------------------
by bschussek at 2012-12-07T12:39:51Z
Removed CHANGELOG entries and added tests.
---------------------------------------------------------------------------
by craue at 2012-12-07T13:14:02Z
I'm not sure if @fabpot is objected to the changelog entry entirely or just the version number. What is the segfault about for PHP 5.4 in Travis?
* 2.0:
[HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes#5878, closes#6185)
[HttpFoundation] added a check for the host header value
Conflicts:
src/Symfony/Component/HttpFoundation/File/File.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
This PR was merged into the 2.0 branch.
Commits
-------
447ff91 [HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes#5878, closes#6185)
Discussion
----------
[HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes#5878, closes#6185)
An alternative for #5878 and it fixes#6185.
This PR was merged into the 2.0 branch.
Commits
-------
0489799 [HttpFoundation] added a check for the host header value
Discussion
----------
[HttpFoundation] added a check for the host header value
alternative for #3865
This PR was merged into the 2.1 branch.
Commits
-------
b604eb7 [DoctrineBridge] Improved performance of the EntityType when used with the "query_builder" option
db2ee54 [DoctrineBridge] Improved exception message
99321cb [DoctrineBridge] Fixed: Exception is thrown if the entity class is not known to Doctrine
Discussion
----------
[DoctrineBridge] fixed caching when EntityType is used with the "query_builder" option
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
This PR was merged into the 2.1 branch.
Commits
-------
10e5f3b Removed useless branch alias for dev-master in composer.json
Discussion
----------
[2.1] Fixed composer.json
---------------------------------------------------------------------------
by fabpot at 2012-12-06T08:23:35Z
Why is is useless?
---------------------------------------------------------------------------
by hason at 2012-12-06T08:30:58Z
Because the ``dev-master`` branch is alias for ``2.2-dev`` as mentioned @stof in https://github.com/symfony/symfony/pull/6196#discussion_r2320254.
---------------------------------------------------------------------------
by fabpot at 2012-12-06T08:33:42Z
got it now. Can you fix your PR as there are some unrelated commits? Thanks.
---------------------------------------------------------------------------
by hason at 2012-12-06T09:02:50Z
I backported some "unrelated" commits for better usage with composer. Should I remove these?
---------------------------------------------------------------------------
by fabpot at 2012-12-06T09:05:45Z
We do not backport things. So, please, remove them.
---------------------------------------------------------------------------
by hason at 2012-12-06T10:02:08Z
done
This PR was merged into the 2.0 branch.
Commits
-------
5fe58bf [Locale] fixed tests
500cc3c [Config] Fixed tests on Windows
Discussion
----------
[2.0] Fixed tests
---------------------------------------------------------------------------
by fabpot at 2012-12-05T15:25:23Z
Is it a backport of some commits that were merged in 2.1/master?
---------------------------------------------------------------------------
by hason at 2012-12-05T22:17:15Z
I backported 65281fb56c and modified 90d6dc3791
This PR was merged into the 2.1 branch.
Commits
-------
d03281b [Security] Move DigestDataTest.php inside the Security component
Discussion
----------
[Security] Move DigestDataTest.php inside the Security component
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Todo: -
License of the code: MIT
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6155).
Commits
-------
88811f4 [FrameworkBundle] Fixed DefaultValue for session.auto_start in NodeDefinition
Discussion
----------
[FrameworkBundle] Fixed DefaultValue for session.auto_start in NodeDefinition
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets:
Todo: -
License of the code: MIT
Documentation PR: -
This is just for consistency with the node type.
---------------------------------------------------------------------------
by fabpot at 2012-11-30T07:17:33Z
I don't see the need to change the default value as this is deprecated anyway.
---------------------------------------------------------------------------
by franmomu at 2012-11-30T07:35:35Z
I was trying to validate default values in Config Component and if I do this throws an exception
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6177).
Commits
-------
964074a Fix namespace of Validator and BrowserKit Tests
Discussion
----------
Fix namespace of Validator and BrowserKit Tests
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Todo: -
License of the code: MIT
* 2.0:
[TwigBundle] Moved the registration of the app global to the environment
needs to use simpleContent in xsd to allow empty elements
bumped Symfony version to 2.0.19-DEV
removed wrong routing xsd statement `mixed="true"`
removed unused attribute from routing.xsd
updated VERSION for 2.0.19
update CONTRIBUTORS for 2.0.19
updated CHANGELOG for 2.0.19
Conflicts:
CONTRIBUTORS.md
src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
src/Symfony/Bundle/TwigBundle/TwigEngine.php
src/Symfony/Component/HttpKernel/Kernel.php
This makes the app global variable available also when accessing the Twig
environment directly instead of using the TwigEngine.
Conflicts:
src/Symfony/Bridge/Twig/CHANGELOG.md
src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
src/Symfony/Bundle/TwigBundle/TwigEngine.php
This PR was merged into the 2.0 branch.
Commits
-------
eec7885 needs to use simpleContent in xsd to allow empty elements
Discussion
----------
needs to use simpleContent in xsd to allow empty elements
This PR was merged into the 2.0 branch.
Commits
-------
57edf56 removed wrong routing xsd statement `mixed="true"`
Discussion
----------
removed wrong routing xsd statement `mixed="true"`
mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
This PR was merged into the 2.0 branch.
Commits
-------
d5623b4 removed unused attribute from routing.xsd
Discussion
----------
removed unused attribute from routing.xsd
mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
