Commit Graph

17445 Commits

Author SHA1 Message Date
hacfi
3d2dd81855 [HttpKernel] Fix event dispatcher dependency
Update composer.json to account for #9792
2014-06-12 19:00:29 +02:00
Fabien Potencier
e74d37b864 Merge branch '2.4' into 2.5
* 2.4:
  Minor doc fix.
  Simplified the way to update PHPUnit to the latest version
  [Process] Minor README update
  [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
  Fixed a html error "Element ul is not closed" in logger.html.twig
  [HttpFoundation] Officialize the 308 redirect RFC
  Officialize the 308 redirect RFC
  issue #10808 crawler test
  Empty select with attribute name="foo[]" bug fix
  Fixed contextually wrong translation
2014-06-12 12:01:04 +02:00
Fabien Potencier
ec1065ac97 Merge branch '2.3' into 2.4
* 2.3:
  Minor doc fix.
  Simplified the way to update PHPUnit to the latest version
  [Process] Minor README update
  [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
  Fixed a html error "Element ul is not closed" in logger.html.twig
  [HttpFoundation] Officialize the 308 redirect RFC
  issue #10808 crawler test
  Empty select with attribute name="foo[]" bug fix
  Fixed contextually wrong translation
2014-06-12 12:00:57 +02:00
Fabien Potencier
64ca6c3e68 bug #11099 [Debug] work-around https://bugs.php.net/61272 (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] work-around https://bugs.php.net/61272

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8703
| License       | MIT

https://bugs.php.net/61272 is the real offender.
Using ob_end_flush() instead of ob_end_clean() is the fix.

Commits
-------

cb8aff3 [Debug] work-around https://bugs.php.net/61272
2014-06-12 11:59:30 +02:00
Fabien Potencier
d629bf6e52 minor #11105 Simplified the way to update PHPUnit to the latest version (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Simplified the way to update PHPUnit to the latest version

Commits
-------

ba37394 Simplified the way to update PHPUnit to the latest version
2014-06-12 11:58:42 +02:00
Fabien Potencier
c150409d04 minor #11106 Minor doc fix in FormTypeInterface (hansnilsson)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11106).

Discussion
----------

Minor doc fix in FormTypeInterface

Commits
-------

bf21d1a Minor doc fix.
2014-06-12 11:58:07 +02:00
Hans N. Hjort
bf21d1a0f1 Minor doc fix. 2014-06-12 11:58:07 +02:00
Christophe Coevoet
ba37394562 Simplified the way to update PHPUnit to the latest version 2014-06-12 11:36:14 +02:00
Fabien Potencier
cf28fd40b5 bug #11092 [HttpFoundation] Fix basic authentication in url with PHP-FPM (Kdecherf)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix basic authentication in url with PHP-FPM

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | dispute
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

`getUser()` and `getPassword()` from `Request` are broken when using PHP-FPM because of the lack of `$_SERVER['PHP_AUTH_USER']` and `$_SERVER['PHP_AUTH_PW']`. This PR fixes the issue.

However, now an empty password will return an empty string (which is the expected behavior of `ServerBag`) instead of `NULL`. The test is updated accordingly, but should we consider this as a breakage?

This issue was spotted by using basic auth via the Illuminate component of Laravel and is present from v2.1.0 to master.

Commits
-------

7a75adf [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
2014-06-12 10:56:53 +02:00
Fabien Potencier
90eeadb303 minor #11095 [2.3][Process] Minor README update (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Minor README update

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

c7d6bbb [Process] Minor README update
2014-06-12 10:26:30 +02:00
Nicolas Grekas
cb8aff323e [Debug] work-around https://bugs.php.net/61272 2014-06-11 20:54:02 +02:00
Fabien Potencier
19856aaeeb bug #11097 [Debug] simplify code path to remove potential blank pages (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] simplify code path to remove potential blank pages

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8703
| License       | MIT
| Doc PR        | none

This should reduce the probability of hitting #8703 by removing an ob_start() from the error page output code path at bootstrap.

Commits
-------

ecefccd [Debug] simplify code path to remove potential blank pages
2014-06-11 15:32:26 +02:00
Nicolas Grekas
ecefccd8ba [Debug] simplify code path to remove potential blank pages 2014-06-11 12:05:25 +02:00
Romain Neutron
c7d6bbbacc [Process] Minor README update 2014-06-11 09:56:44 +02:00
Kevin Decherf
7a75adf6f1 [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
Request#getUser() and Request#getPassword() introduced in
aecfd0a891 do not handle the lack of
PHP_AUTH_USER and PHP_AUTH_PW in $this->server when using PHP-FPM. Use
$this->headers instead.
Furthermore, the test of empty password now expects an empty string
instead of NULL according to a450d002f2.
2014-06-10 23:31:45 +02:00
Fabien Potencier
6bd80277f1 minor #11085 Fixed a html error "Element ul is not closed" in logger.html.twig (hason)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed a html error "Element ul is not closed" in logger.html.twig

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

e3bf86f Fixed a html error "Element ul is not closed" in logger.html.twig
2014-06-10 15:39:20 +02:00
Martin Hasoň
e3bf86f31c Fixed a html error "Element ul is not closed" in logger.html.twig 2014-06-09 21:13:04 +02:00
Fabien Potencier
3e62ad8e53 [HttpFoundation] Officialize the 308 redirect RFC 2014-06-07 17:46:10 +02:00
Fabien Potencier
157aabd893 minor #11075 Officialize the 308 redirect RFC (Seldaek)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #11075).

Discussion
----------

Officialize the 308 redirect RFC

Commits
-------

9834670 Officialize the 308 redirect RFC
2014-06-07 17:45:35 +02:00
Jordi Boggiano
9834670d18 Officialize the 308 redirect RFC 2014-06-07 17:45:34 +02:00
Fabien Potencier
fddd010e49 phpunit src/Symfony/Component/DomCrawler/Tests/FormTest.php #11066 #10808 crawler test (defrag)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11066).

Discussion
----------

#10808 crawler test

 Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |#10808
| License       | MIT

Adds test for #10808

Commits
-------

876d6ca issue #10808 crawler test
2014-06-06 07:27:57 +02:00
Michal Dabrowski
876d6caacb issue #10808 crawler test 2014-06-06 07:27:49 +02:00
Fabien Potencier
297d6501d7 bug #10808 [DomCrawler] Empty select with attribute name="foo[]" bug fix (darles)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10808).

Discussion
----------

[DomCrawler] Empty select with attribute name="foo[]" bug fix

If you have a select with attribute name="foo[]", and you submit your form, http_build_query returns empty string as a result. In this case you get a form extra field validation error, because your field "foo" converts to
'' => bool(false)

Commits
-------

15f081d Empty select with attribute name="foo[]" bug fix
2014-06-06 07:26:43 +02:00
Darius
15f081d80a Empty select with attribute name="foo[]" bug fix
If you have a select with attribute name="foo[]", and you submit your form, http_build_query returns empty string as a result. In this case you get a form extra field validation error, because your field "foo" converts to
'' => bool(false)
2014-06-06 07:26:43 +02:00
Fabien Potencier
c2ba96ee8a minor #11065 Fixed contextually wrong translation (lashae)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11065).

Discussion
----------

Fixed contextually wrong translation

This PR was submitted on the symfony/Validator read-only repository and moved automatically to the main Symfony repository (closes symfony/Validator#9).

"This value should not be blank." was translated as "Bu değer boşluk olamaz." However,  the word "boşluk" means "space" in Turkish, therefore reverse translation implies "This value should not be space." and obviously this is wrong. The corrected translation should be "Bu değer boş bırakılmamalıdır."

Commits
-------

96518b4 Fixed contextually wrong translation
2014-06-06 06:58:09 +02:00
Alaattin Kahramanlar
96518b4a0b Fixed contextually wrong translation 2014-06-06 06:58:08 +02:00
Fabien Potencier
c558887cdf Merge branch '2.4' into 2.5
* 2.4:
  [Bridge][Twig] Replace deprecated features
  [HttpFoundation] fix switch statement
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  Remove undefined variable $e
  bumped Symfony version to 2.4.7
  bumped Symfony version to 2.3.17
  Fix a parameter name in a test
  updated VERSION for 2.4.6
  updated CHANGELOG for 2.4.6
  updated VERSION for 2.3.16
  update CONTRIBUTORS for 2.3.16
  updated CHANGELOG for 2.3.16
  [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-06-06 05:57:03 +02:00
Fabien Potencier
b85c68d38a Merge branch '2.3' into 2.4
* 2.3:
  [Bridge][Twig] Replace deprecated features
  [HttpFoundation] fix switch statement
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  Remove undefined variable $e
  bumped Symfony version to 2.3.17
  Fix a parameter name in a test
  updated VERSION for 2.3.16
  update CONTRIBUTORS for 2.3.16
  updated CHANGELOG for 2.3.16
  [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php
2014-06-06 05:56:41 +02:00
Fabien Potencier
d8397b0f80 minor #11016 [Bridge][Twig] Replace deprecated features (egeloen)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11016).

Discussion
----------

[Bridge][Twig] Replace deprecated features

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This PR replaces the deprecated classes `Twig_Function_Node` and `Twig_Function_Method` by the`Twig_SimpleFunction`.

Commits
-------

14a4e4d [Bridge][Twig] Replace deprecated features
2014-06-06 05:23:41 +02:00
Eric GELOEN
14a4e4de27 [Bridge][Twig] Replace deprecated features 2014-06-06 05:23:41 +02:00
Fabien Potencier
49bdf80efc minor #11062 UPGRADE-2.5.md: Yaml component change in 2.5 (nikita2206)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11062).

Discussion
----------

UPGRADE-2.5.md: Yaml component change in 2.5

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

We had a very hard to find bug when I was trying to upgrading symfony from 2.4 to 2.5, I think it's worth mentioning in the UPGRADE file. I understand we shouldn't have had duplicated keys in yaml but that was it...
BTW maybe we should raise an error in cases like this?

PS I figured I shouldn't include the PR template with table here because it's just a UPGRADE-* file change, I will add it if you say

Commits
-------

3931723 Yaml component change in 2.5
2014-06-06 05:02:05 +02:00
Nikita Nefedov
3931723ccb Yaml component change in 2.5
We had a very hard to find bug when I was trying to upgrading symfony from 2.4 to 2.5, I think it's worth mentioning in the UPGRADE file. I understand we shouldn't have had duplicated keys in yaml but that was it...

BTW maybe we should raise an error in cases like this?
2014-06-06 05:02:05 +02:00
Fabien Potencier
b2f96a09f6 bug #11063 [HttpFoundation] fix switch statement (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] fix switch statement

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #11009
| License       | MIT

Commits
-------

da24bc9 [HttpFoundation] fix switch statement
2014-06-06 04:58:40 +02:00
Tobias Schultze
da24bc9d13 [HttpFoundation] fix switch statement 2014-06-05 14:50:34 +02:00
Fabien Potencier
0e5468f518 bug #11054 [Serializer] Xml encoder whitespace fix (fieg)
This PR was merged into the 2.5 branch.

Discussion
----------

[Serializer] Xml encoder whitespace fix

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Hi, after #11044 I'm back with more: A fix for another BC-break issue regarding decoding xml since PR #10668.

The problem is that I was getting more `#cdata-section` keys in deeper levels of the decoded xml:

```php
  'str' =>
      array(2) {
        '#text' =>
        array(2) {
          ...
        }
        '#cdata-section' =>
        string(228) "Some text"
      }
```

//cc @csarrazi

Commits
-------

466a3d7 [serializer] fixed whitespace issue when decoding xml
2014-06-04 19:29:25 +02:00
Fabien Potencier
fe01d10735 bug #11009 [HttpFoundation] smaller fixes for PdoSessionHandler (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] smaller fixes for PdoSessionHandler

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10652
| License       | MIT

For both the PdoSessionHandler and DbalSessionHandler
- https://github.com/symfony/symfony/pull/10652#issuecomment-42370425: Transactional DELETE + INSERT does not work as expected
- https://github.com/symfony/symfony/pull/10652#issuecomment-44359784: sqlsrv 2005 does not support the MERGE SQL, and if used it requires an HOLDLOCK
- missing time update for sqlsrv and oracle

Commits
-------

a0e1d4d [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
00d707f [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle
2014-06-04 19:27:41 +02:00
fieg
466a3d70b7 [serializer] fixed whitespace issue when decoding xml 2014-06-04 12:17:52 +02:00
Tobias Schultze
a0e1d4d5d7 [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler 2014-06-04 11:55:45 +02:00
Fabien Potencier
0a177805bc bug #11047 #10862 loadClassMetadata vs loadValidatorMetadata: revert default config (phramz)
This PR was squashed before being merged into the 2.5 branch (closes #11047).

Discussion
----------

#10862 loadClassMetadata vs loadValidatorMetadata: revert default config

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10862
| License       | MIT
| Doc PR        |

Commits
-------

3bde718 #10862 loadClassMetadata vs loadValidatorMetadata: revert default config
2014-06-03 23:45:50 +02:00
Maximilian Reichel
3bde718411 #10862 loadClassMetadata vs loadValidatorMetadata: revert default config 2014-06-03 23:45:48 +02:00
Fabien Potencier
ceb4e0e369 fixed previous merge 2014-06-03 22:40:26 +02:00
Fabien Potencier
636f0d5d99 minor #10974 [HttpFoundation] Added PHPDoc for Cache-Control directives methods (tony-co)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10974).

Discussion
----------

[HttpFoundation] Added PHPDoc for Cache-Control directives methods

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

58b0aef Added phpdoc for Cache-Control directives methods
2014-06-03 22:39:50 +02:00
Tony Cosentino
58b0aefa16 Added phpdoc for Cache-Control directives methods 2014-06-03 22:39:50 +02:00
Fabien Potencier
f2721ddace bug #11042 [Debug] fix debug handlers config (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fix debug handlers config

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Commits
-------

e1ba70e [Debug] fix debug handlers config
2014-06-03 22:37:38 +02:00
Fabien Potencier
2eedd43ca2 bug #11043 [Console] OutputFormatter Unset Bold has wrong id (DZunke)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11043).

Discussion
----------

[Console] OutputFormatter Unset Bold has wrong id

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

The Unsetter for Bold in *nix Console is the 22 not the 21. Problem is that the 21 is invalid and so no style will be unsetted. Don't look very nice. Also fixed small Typo with Vars in apply()

Commits
-------

724bb50 [Console] OutputFormatter Unset Bold has wrong id
2014-06-03 22:33:46 +02:00
Denis Zunke
724bb50942 [Console] OutputFormatter Unset Bold has wrong id 2014-06-03 22:33:46 +02:00
Nicolas Grekas
e1ba70ecb9 [Debug] fix debug handlers config 2014-06-03 17:24:49 +02:00
Fabien Potencier
315c3e50d8 bug #11033 [Debug] fix wrong case mismatch exception (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fix wrong case mismatch exception

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #11030
| License       | MIT
| Doc PR        | none

Commits
-------

8e9cc35 [Debug] fix wrong case mismatch exception
2014-06-03 17:09:24 +02:00
Fabien Potencier
4086ab57c5 bug #11044 [Serializer] Fix BC break since 2.5 (fieg)
This PR was merged into the 2.5 branch.

Discussion
----------

[Serializer] Fix BC break since 2.5

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

We spotted a BC break after upgrading to 2.5. The break seems to originate from PR #10668 and I hereby submit a test that passes if I revert the XmlEncoder.php back to before the PR.

The result of the given decode call currently is (notice the "#cdata-section"):

```php
array(1) {
  'firstname' =>
  array(1) {
    '#cdata-section' =>
    string(12) "Paul <or Me>"
  }
}
```

I am looking for help fixing the issue, because so far I wasn't able to come up with a fix. @csarrazi as an author of the PR, do you perhaps have any thoughts on this matter?

Commits
-------

48d9f36 [Serializer] fixed bc-break with cdata-section nodes
2014-06-03 14:29:40 +02:00
fieg
48d9f36ea0 [Serializer] fixed bc-break with cdata-section nodes 2014-06-03 14:01:38 +02:00