Commit Graph

17465 Commits

Author SHA1 Message Date
Romain Neutron
6d9fd62730 [FrameworkBundle] Redirect server output to /dev/null in case no verbosity is needed 2014-06-17 01:42:56 +02:00
Fabien Potencier
349549cd17 Merge branch '2.4' into 2.5
* 2.4:
  PHP Fatal error when getContainer method of ContainerAwareCommand has be...
  [HttpFoundation] Fixed isSecure() check to be compliant with the docs
  Update MimeTypeExtensionGuesser.php
  fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
  Fixed the Travis build on PHP 5.3.3
2014-06-16 11:30:12 +02:00
Fabien Potencier
75179c78a0 Merge branch '2.3' into 2.4
* 2.3:
  PHP Fatal error when getContainer method of ContainerAwareCommand has be...
  [HttpFoundation] Fixed isSecure() check to be compliant with the docs
  Update MimeTypeExtensionGuesser.php
  fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
  Fixed the Travis build on PHP 5.3.3
2014-06-16 11:30:02 +02:00
Fabien Potencier
fd1bfd4e85 bug #11121 [2.5][Process] Do not redirect output to file handles when output is disabled, simply discard it (romainneutron)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5][Process] Do not redirect output to file handles when output is disabled, simply discard it

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

Commits
-------

b35250f [Process] Do not redirect output to file handles when output is disabled
2014-06-16 11:29:32 +02:00
Fabien Potencier
92d93cea80 bug #10966 PHP Fatal error when getContainer method of ContainerAwareCommand has be... (kevinvergauwen)
This PR was squashed before being merged into the 2.3 branch (closes #10966).

Discussion
----------

PHP Fatal error when getContainer method of ContainerAwareCommand has be...

PHP Fatal error when getContainer method of ContainerAwareCommand has been called within the configure method of a Command (application property is not been set yet at that time)

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

Commits
-------

8ea5c4c PHP Fatal error when getContainer method of ContainerAwareCommand has be...
2014-06-16 10:10:36 +02:00
Kevin Vergauwen
8ea5c4c0f6 PHP Fatal error when getContainer method of ContainerAwareCommand has be... 2014-06-16 10:10:33 +02:00
Fabien Potencier
efaa6ea8e6 bug #10981 [HttpFoundation] Fixed isSecure() check to be compliant with the docs (Jannik Zschiesche)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10981).

Discussion
----------

[HttpFoundation] Fixed isSecure() check to be compliant with the docs

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

According to the [php docs](http://www.php.net/manual/en/reserved.variables.server.php) the `HTTPS` field will be non-empty when the query was issued via HTTPS.

It isn't restricted to only "on" and 1.
Exception: "off" is sent by IIS

BC breaks: no, because old behavior was not conform with the docs.

Commits
-------

7bc37bd [HttpFoundation] Fixed isSecure() check to be compliant with the docs
2014-06-16 09:30:49 +02:00
Jannik Zschiesche
7bc37bd899 [HttpFoundation] Fixed isSecure() check to be compliant with the docs 2014-06-16 09:30:49 +02:00
Fabien Potencier
eca7915a1e minor #11128 Update MimeTypeExtensionGuesser.php (kevinklika)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11128).

Discussion
----------

Update MimeTypeExtensionGuesser.php

Add ```'text/rtf' => 'rtf'``` type, as it is a valid type specification for rtf documents.

Commits
-------

c986b91 Update MimeTypeExtensionGuesser.php
2014-06-16 08:02:36 +02:00
kevinklika
c986b912a9 Update MimeTypeExtensionGuesser.php
Add ```'text/rtf' => 'rtf'``` type, as it is a valid type specification for rtf documents.
2014-06-16 08:02:36 +02:00
Fabien Potencier
dd6c6a304d minor #11118 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php (1emming)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11118).

Discussion
----------

fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php

src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php

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

When running the tests in the HTTPFoundation package these failed. I felt like fixen these so I can start working with all tests green in the package.

Commits
-------

9247ef5 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
2014-06-15 10:49:34 +02:00
Seb Koelen
9247ef5e27 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php 2014-06-15 10:49:34 +02:00
Romain Neutron
b35250fd3b [Process] Do not redirect output to file handles when output is disabled 2014-06-14 14:57:30 +02:00
Fabien Potencier
88a954cf9f bug #11117 [Validator] Fix array notation in the PropertyPath::append() (jakzal)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11117).

Discussion
----------

[Validator] Fix array notation in the PropertyPath::append()

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | related  #11072 #11046 (not fixed yet)
| License       | MIT
| Doc PR        | -

Commits
-------

aa6b08d [Validator] Fix array notation in the PropertyPath::append()
2014-06-13 15:18:45 +02:00
Jakub Zalas
aa6b08df97 [Validator] Fix array notation in the PropertyPath::append() 2014-06-13 15:18:45 +02:00
Fabien Potencier
057c2745ef bug #11113 [HttpKernel] Fix event dispatcher dependency (hacfi)
This PR was merged into the 2.5 branch.

Discussion
----------

[HttpKernel] Fix event dispatcher dependency

Update composer.json to account for #9792.

[Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass](https://github.com/symfony/symfony/blob/2.5/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php#L14) extends `Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass` which exists only in 2.5

Commits
-------

3d2dd81 [HttpKernel] Fix event dispatcher dependency
2014-06-12 22:10:11 +02:00
Fabien Potencier
267eaa3beb bug #11111 Fixed undefined ImageValidator::$suffices property when uploading an image during functional tests (OwlyCode)
This PR was squashed before being merged into the 2.5 branch (closes #11111).

Discussion
----------

Fixed undefined ImageValidator::$suffices property when uploading an image during functional tests

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

This will make the FileValidator::$suffices attribute protected so ImageValidator or any inherited class can access it. It fixes #11110 in the most simple way possible.

Commits
-------

859f34e Fixed undefined ImageValidator:: property when uploading an image during functional tests
2014-06-12 22:09:07 +02:00
Tristan Maindron
859f34e1c4 Fixed undefined ImageValidator:: property when uploading an image during functional tests 2014-06-12 22:09:04 +02:00
Fabien Potencier
faa5c499ff minor #11107 Fixed the Travis build on PHP 5.3.3 (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the Travis build on PHP 5.3.3

Updating PHPUnit requires OpenSSL which is not available on 5.3.3 on Travis.

Commits
-------

84561d2 Fixed the Travis build on PHP 5.3.3
2014-06-12 22:08:08 +02:00
hacfi
3d2dd81855 [HttpKernel] Fix event dispatcher dependency
Update composer.json to account for #9792
2014-06-12 19:00:29 +02:00
Christophe Coevoet
84561d2a6f Fixed the Travis build on PHP 5.3.3
Updating PHPUnit requires OpenSSL which is not available on 5.3.3 on
Travis.
2014-06-12 12:13:44 +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