Commit Graph

17888 Commits

Author SHA1 Message Date
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
4ab34d686b Merge branch '2.5'
* 2.5:
  Minor doc fix.
  Simplified the way to update PHPUnit to the latest version
  [Debug] work-around https://bugs.php.net/61272
  [Debug] simplify code path to remove potential blank pages
  [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:10 +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
Fabien Potencier
f5f74ae858 minor #11101 Update UPGRADE-2.5.md (cestcri)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Update UPGRADE-2.5.md

Fixing a typo

Commits
-------

cc7c1e3 Update UPGRADE-2.5.md
2014-06-12 10:01:31 +02:00
Christian Jennewein
cc7c1e3bb6 Update UPGRADE-2.5.md
Fixing a typo
2014-06-11 23:04:56 +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
Fabien Potencier
81f5cc91cb minor #11067 [Stopwatch] Added return type to Stopwatch::getSections() (umpirsky)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Stopwatch] Added return type to Stopwatch::getSections()

https://github.com/symfony/symfony/pull/10851#discussion_r13479016

Commits
-------

ab00361 Added return type to Stopwatch::getSections()
2014-06-11 15:30:39 +02:00
Nicolas Grekas
ecefccd8ba [Debug] simplify code path to remove potential blank pages 2014-06-11 12:05:25 +02:00
Fabien Potencier
44735cdd5f feature #10627 [Console] added a Process helper (fabpot, romainneutron)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[Console] added a Process helper

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/3930

This PR replaces #10609.
I've fixed minor errors, added tests and allowed to pass an array of arguments to escape as a command

Commits
-------

edc1bfe [Console] Add process helper tests
faffe7e [Console] added a Process helper
2014-06-11 10:05:31 +02:00
Romain Neutron
c7d6bbbacc [Process] Minor README update 2014-06-11 09:56:44 +02:00
Romain Neutron
edc1bfeb2b [Console] Add process helper tests 2014-06-11 08:54:52 +02:00
Peter Mitchell
36c58f84d8 [HttpFoundation] Added ParameterBag::getBoolean
Added the getBoolean method as a convenience on top of the pre-existing
ParameterBag::filter method
2014-06-10 18:08:57 -04: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
faffe7e3a8 [Console] added a Process helper 2014-06-10 19:20:02 +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
8f0b984d76 Merge branch '2.5'
* 2.5: (25 commits)
  [Bridge][Twig] Replace deprecated features
  Yaml component change in 2.5
  [HttpFoundation] fix switch statement
  [serializer] fixed whitespace issue when decoding xml
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  #10862 loadClassMetadata vs loadValidatorMetadata: revert default config
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  [Console] OutputFormatter Unset Bold has wrong id
  [Debug] fix debug handlers config
  [Serializer] fixed bc-break with cdata-section nodes
  Remove undefined variable $e
  [Debug] fix wrong case mismatch exception
  bumped Symfony version to 2.5.1
  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.5.0
  updated CHANGELOG for 2.5.0
  updated VERSION for 2.4.6
  ...

Conflicts:
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2014-06-07 17:54:31 +02:00
Fabien Potencier
44b9d84f09 feature #11068 [HttpFoundation] #11009 for master (Tobion)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[HttpFoundation] #11009 for master

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

Commits
-------

8d375ca [HttpFoundation] merge symfony/symfony#11009 into master
2014-06-07 17:51:20 +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
Tobias Schultze
8d375ca81b [HttpFoundation] merge symfony/symfony#11009 into master 2014-06-06 14:10:28 +02:00
umpirsky
ab003619b7 Added return type to Stopwatch::getSections() 2014-06-06 12:36:27 +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
97750f7b02 feature #10427 Username in UsernameNotFoundException message data (maryo)
This PR was squashed before being merged into the 2.6-dev branch (closes #10427).

Discussion
----------

Username in UsernameNotFoundException message data

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

Added username in UsernameNotFoundException message data

Commits
-------

3dfaa19 Username in UsernameNotFoundException message data
2014-06-06 05:53:34 +02:00
Marek Štípek
3dfaa19518 Username in UsernameNotFoundException message data 2014-06-06 05:53:30 +02:00
Fabien Potencier
5925780d5f feature #10660 [RFC][WebProfilerBundle] Add simple placeholders into search form (stloyd)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[RFC][WebProfilerBundle] Add simple placeholders into search form

This is an RFC mostly, it's not a real feature, it's more like little helper for the profiler form, I guess that would mostly useful for _newcomers_, but sometimes even _old dogs_ could find it useful sometimes =)

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

![form](https://cloud.githubusercontent.com/assets/67402/2655386/4637aa0c-bfe5-11e3-958e-84308217b52e.png)

Commits
-------

be65226 [WebProfilerBundle] Add simple placeholders into search form
2014-06-06 05:49:45 +02:00
Fabien Potencier
12d44bcf6c feature #10851 Added retrieval of sections (umpirsky)
This PR was squashed before being merged into the 2.3-dev branch (closes #10851).

Discussion
----------

Added retrieval of sections

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

Commits
-------

7928767 Added retrieval of sections
2014-06-06 05:26:07 +02:00
umpirsky
7928767b3e Added retrieval of sections 2014-06-06 05:26:05 +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