This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6534).
Commits
-------
a5e7fdf Fixed missing plural message in portuguese validator
Discussion
----------
[Validator] Fixed missing plural message
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: #6151
Todo: -
License of the code: -
Documentation PR: -
This PR was squashed before being merged into the 2.1 branch (closes#6471).
Commits
-------
87b6cc2 Fix Expires when the header is -1
Discussion
----------
Fix Expires when the header is -1
This fixes the issue described in #6469.
Let me know if I've missed something.
Thanks.
---------------------------------------------------------------------------
by blaugueux at 2012-12-27T20:22:23Z
@dlsniper how can i help here, i really need to fix this issue
---------------------------------------------------------------------------
by dlsniper at 2012-12-27T20:28:53Z
I think @fabpot needs to get me some feedback on this but meanwhile you should try the proposed patch and let me know if it fixes the problem for you or I should add more tests to this.
Thanks!
---------------------------------------------------------------------------
by blaugueux at 2012-12-30T14:37:58Z
@dlsniper your patch is working great for me but it breaks tests. I agree that @fabpot point of view is required.
---------------------------------------------------------------------------
by dlsniper at 2012-12-30T18:38:38Z
@blaugueux Can you let me know what tests are failing? the one included in this PR or some custom ones from you? If it's the later, can you share some so that I can add them?
Thanks!
---------------------------------------------------------------------------
by arendjantetteroo at 2013-01-02T12:45:48Z
The headerbag fix works here. I'm not sure if the extra check in Response is really necessary, it works here without it.
This PR was merged into the 2.1 branch.
Commits
-------
c282a2b [DoctrineBridge] Allowing memcache port to be 0 to support memcache unix domain sockets.
Discussion
----------
[DoctrineBridge] Allowing memcache port to be 0 to support memcache unix domain sockets.
[DoctrineBridge] Allowing memcache port to be 0 to support memcache unix domain sockets.
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: #6527
Todo: -
License of the code: MIT
Documentation PR: ~
This PR was merged into the 2.1 branch.
Commits
-------
bfccd28 HttpUtils must handle RequestMatcher too
Discussion
----------
HttpUtils must handle RequestMatcher too
2.1 introduced the RequestMatcher as alternative to UrlMatcher. but HttpUtils was not adjusted.
---------------------------------------------------------------------------
by lsmith77 at 2013-01-01T18:15:13Z
@fabpot could you have a look at this PR? would like to know if this will be addressed in core or if we need to find another solution inside the CMF routing.
This PR was merged into the 2.1 branch.
Commits
-------
a5aeb21 [Process] Prevented test from failing when pcntl extension is not enabled.
Discussion
----------
[Process] Prevented test from failing when pcntl extension is not enabled
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: -
*SIGTERM* constant is only defined if pcntl extension is present. Extension is not needed to use the Process component though.
This PR was merged into the 2.1 branch.
Commits
-------
ef6f241 [Locale] Fixed the StubLocaleTest for ICU versions lower than 4.8.
Discussion
----------
[Locale] Fixed the StubLocaleTest for ICU versions lower than 4.8
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: no but for other reason in an another component
Fixes the following tickets: #5517
Todo: -
License of the code: MIT
Documentation PR: -
Symbol for Brazilian Real is BR$ only in ICU 4.8. All previous and later versions use R$.
Links to the relevant data files:
* http://source.icu-project.org/repos/icu/icu/tags/release-4-8/source/data/curr/en.txt
* http://source.icu-project.org/repos/icu/icu/tags/release-4-4/source/data/curr/en.txt
* http://source.icu-project.org/repos/icu/icu/tags/release-49-1/source/data/curr/en.txt
---------------------------------------------------------------------------
by jakzal at 2012-12-29T19:23:25Z
Note that currently *USE_ICU_DATA_VERSION* is required for some tests to pass. This is inconsistent with *Locale::getIcuDataVersion()* which returns *Locale::ICU_DATA_VERSION* if *USE_ICU_DATA_VERSION* is not set. Technically intl extension shouldn't be needed to run the stub tests.
Following code could fix the issue for StubLocale tests:
```php
class StubLocaleTest extends LocaleTestCase
{
// ...
protected function getIntlExtensionIcuVersion()
{
// Locale::getIcuDataVersion(), which is used to determine the directory of stubs,
// uses Locale::ICU_DATA_VERSION if USE_INTL_ICU_DATA_VERSION is not given
if (!getenv('USE_INTL_ICU_DATA_VERSION')) {
return Locale::ICU_DATA_VERSION;
}
return parent::getIntlExtensionIcuVersion();
}
}
```
This code cannot be placed in the LocaleTestCase as intl tests need the icu data version from the intl extension.
I'm not sure if this is desired and therefore I didn't include it in my PR. Let me know your thoughts and wether I should create another PR for this, use the current PR or forget about it.
This PR was merged into the 2.1 branch.
Commits
-------
81967f6 [Form] Fixed failing tests for DateTimeToStringTransformer.
Discussion
----------
[Form] Fixed failing tests for DateTimeToStringTransformer
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: -
Tests were only failing at the end of the month. Since February was used in the test cases, date was being moved to the next month (February has less days than other months).
If a day is not passed, \DateTime's constructor will set it to the first day of the month:
```php
var_dump(new \DateTime('2010-02'));
object(DateTime)#1 (3) {
["date"]=>
string(19) "2010-02-01 00:00:00"
["timezone_type"]=>
int(3)
["timezone"]=>
string(13) "Europe/London"
}
```
\DateTime is used in the test assertions.
However, DateTimeToStringTransformer::reverseTransform() uses \DateTime::createFromFormat(), which sets a missing day to the current day:
```php
var_dump(\DateTime::createFromFormat("Y-m", '2010-02'));
object(DateTime)#1 (3) {
["date"]=>
string(19) "2010-03-01 20:09:26"
["timezone_type"]=>
int(3)
["timezone"]=>
string(13) "Europe/London"
}
```
I changed the date in the test case to avoid failures. If we need to be sure that month's not going to be changed, I'll update my PR.
Tests were only failing at the end of the month. PHP uses current day if it is not passed. Since February was used in the test cases, date was being moved to the next month (February has less days than other months).
This PR was merged into the 2.1 branch.
Commits
-------
87dcf25 [Form] Fixed test regression introduced in #6440
Discussion
----------
[Form] Fixed test regression introduced in #6440
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
-------
05fca6d use preferred_choices in favor of preferred_query
6855cff add preferred_query option to ModelType
Discussion
----------
[Propel1] add preferred_choices option to ModelType
This enables the ModelChoiceList to use 'preferred_choices' of the parent ChoiceType.
Ping @willdurand
---------------------------------------------------------------------------
by willdurand at 2012-12-22T09:39:39Z
👍
This PR was merged into the 2.1 branch.
Commits
-------
abf5e51 [EventDispatcher] Fixed php doc of GenericEvent::__construct
Discussion
----------
[EventDispatcher] Fixed php doc of GenericEvent::__construct
```
Bug fix: yes (doc)
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes (no modified)
Fixes the following tickets: -
Todo: -
License of the code: MIT
```
---------------------------------------------------------------------------
by drak at 2012-12-26T21:51:54Z
Well spotted.
This PR was merged into the 2.1 branch.
Commits
-------
8beee64 [Form] Fix for `DateTimeToStringTransformer`
Discussion
----------
[Form] Fix for `DateTimeToStringTransformer`
Closes: #6429
---------------------------------------------------------------------------
by stloyd at 2012-12-21T08:19:11Z
@fabpot @bschussek Could you review this ? Thanks =)
---------------------------------------------------------------------------
by stloyd at 2012-12-23T13:51:36Z
Ping @fabpot (without this every PR gets false fail results from Travis-CI)
* 2.0:
bumped Symfony version to 2.0.21-DEV
[FrameworkBundle] fixed trusted_proxies configuration for some edge cases
[FrameworkBundle] fixed XSD for the trusted-proxies setting
updated VERSION for 2.0.20
update CONTRIBUTORS for 2.0.20
updated CHANGELOG for 2.0.20
Conflicts:
CONTRIBUTORS.md
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
src/Symfony/Component/HttpKernel/Kernel.php
* 2.0:
[FrameworkBundle] added support for URIs as an argument to HttpKernel::render()
[FrameworkBundle] restricted the type of controllers that can be executed by InternalController
Making it easier to grab the PR template.
fix double-decoding in the routing system
Conflicts:
README.md
src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
src/Symfony/Component/Security/Http/HttpUtils.php
This PR was merged into the 2.0 branch.
Commits
-------
8b2c17f fix double-decoding in the routing system
Discussion
----------
fix double-decoding in the routing system
@fabpot @vicb This should fix it. You know what ;) Don't want to leak more information.
And the good thing, it's no hack nor does it break BC.
This PR was squashed before being merged into the 2.1 branch (closes#6411).
Commits
-------
2cd43da [Process] Allow non-blocking start with PhpProcess
Discussion
----------
[Process] Allow non-blocking start with PhpProcess
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6410
Todo: -
License of the code: MIT
Documentation PR: -
This PR was merged into the 2.0 branch.
Commits
-------
df0623f Making it easier to grab the PR template.
Discussion
----------
Making it easier to grab the PR template.
