This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6297).
Commits
-------
444fea4 [FrameworkBundle] refactor ControllerNameParser
Discussion
----------
[FrameworkBundle] refactor ControllerNameParser
bc break: no
---------------------------------------------------------------------------
by Tobion at 2012-12-12T16:38:12Z
Maybe merge into 2.1 instead? So master and 2.1 do not drift apart by pure refactorings? It also includes a phpdoc fix.
This PR was merged into the 2.1 branch.
Commits
-------
21a59ca [Form] Fixed FileType not to throw an exception when bound empty
Discussion
----------
[Form] Fixed FileType not to throw an exception when bound empty
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6134
Todo: -
License of the code: MIT
Documentation PR: -
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6302).
Commits
-------
d9b75a3 [Serializer] - Test undefined index #
1a3b985 Maintain array structure
0b9a831 Check if key # is defined in $value
Discussion
----------
[Serializer] - undefined index #
replaces #6293
This PR was merged into the 2.1 branch.
Commits
-------
6a9a8c0 Update src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
Discussion
----------
[2.1] Fixed polish translation
* 2.0:
fixed CS
removed the Travis icon (as this is not stable enough -- many false positive, closes#6186)
[Config] Loader::import must return imported data
[HttpFoundation] fixed a small regression
Conflicts:
README.md
src/Symfony/Bridge/Twig/Extension/FormExtension.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5394).
Commits
-------
08bd95e Fix to allow null values in labels array
Discussion
----------
Fix to allow null values in labels array
Fixed false positives on array key is null
---------------------------------------------------------------------------
by stof at 2012-08-30T19:03:02Z
@kaywalker This is still throwing a notice
---------------------------------------------------------------------------
by bschussek at 2012-08-31T09:13:33Z
Could you please add a test?
---------------------------------------------------------------------------
by fabpot at 2012-10-05T16:52:11Z
@bschussek Is it mergeable now?
---------------------------------------------------------------------------
by bschussek at 2012-10-05T16:58:34Z
The coding conventions in the test are not correct (too much indentation). Also, please reference this PR in a comment to the test. Last, the test should contain assertions to actually check something. Example:
```
// https://github.com/symfony/symfony/pull/5394
public function testLabelsContainingNull()
{
$this->list = new ChoiceList(
array($this->obj1, $this->obj2),
array('A', null)
);
$this->assertEquals(array(0 => new ChoiceView($this->obj1, '0', 'A'), 1 => new ChoiceView($this->obj2, '1', null)), $this->list->getRemainingViews());
}
```
---------------------------------------------------------------------------
by fmeynard at 2012-11-13T17:36:59Z
I just tried the last commit and everything works correctly.
This PR was merged into the 2.0 branch.
Commits
-------
8bb3208 [Config] Loader::import must return imported data
Discussion
----------
[2.0][2.1][2.2] [Config] Loader::import must return imported data
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
---------------------------------------------------------------------------
by fabpot at 2012-12-07T13:40:58Z
why?
---------------------------------------------------------------------------
by hason at 2012-12-07T20:57:06Z
We should support both approaches to importing. The first case assumes shared object accross all the loaders (loading DI configuration) and the second case requires returning of imported object (merging route collections).
---------------------------------------------------------------------------
by stof at 2012-12-07T21:38:42Z
@fabpot As ``load`` can have a return value, this PR makes sense IMO
---------------------------------------------------------------------------
by fabpot at 2012-12-10T12:44:09Z
This change should be done in master then.
---------------------------------------------------------------------------
by stof at 2012-12-10T14:43:18Z
@fabpot I would consider it as a bugfix. The routing loaders are simply broken (as of 2.0) if the loader does not extend from FileLoader (which overwrites the ``import`` method and takes care to return the value). the routing loaders expect to receive the loaded data when importing instead of loosing the imported data entirely: https://github.com/symfony/Routing/blob/2.0/Loader/XmlFileLoader.php#L80
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