Commit Graph

16949 Commits

Author SHA1 Message Date
Fabien Potencier
2a947953d5 Merge branch '2.3' into 2.4
* 2.3:
  added @Target annotations
2014-04-23 16:04:21 +02:00
Fabien Potencier
3d14556bd9 minor #10767 added @Target annotations (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

added @Target annotations

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

Commits
-------

542d6fa added @Target annotations
2014-04-23 16:03:45 +02:00
Fabien Potencier
542d6fa580 added @Target annotations 2014-04-23 15:35:47 +02:00
Fabien Potencier
c87cfa2f5c Merge branch '2.3' into 2.4
* 2.3:
  [Process] Add missing docblocks, remove variable declarations

Conflicts:
	src/Symfony/Component/Process/ProcessBuilder.php
2014-04-23 08:33:25 +02:00
Fabien Potencier
5947eec36f minor #10756 [2.3][Process] Add missing docblocks, remove variable declarations (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Add missing docblocks, remove variable declarations

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

Commits
-------

ff77f24 [Process] Add missing docblocks, remove variable declarations
2014-04-23 08:32:13 +02:00
Romain Neutron
ff77f24092 [Process] Add missing docblocks, remove variable declarations 2014-04-22 10:47:56 +02:00
Fabien Potencier
0deaceb2ff Merge branch '2.3' into 2.4
* 2.3:
  fix docblock
  Fixed incompatibility of x509 auth with nginx
  [Process] Setting STDIN while running should not be possible
  [FrameworkBundle] improve English in RouterMatchCommand
  [Doctrine Bridge] simplify session handler by using main connection

Conflicts:
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2014-04-22 10:11:06 +02:00
Fabien Potencier
1ad7d05524 minor #10750 [Config] fix docblock (pyrech)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10750).

Discussion
----------

[Config] fix docblock

| Q             | A
| ------------- | ---
| Fixed tickets | none
| License       | MIT
Some phpdoc are wrong in the Config component after the PR #10701 was merged.
eg:
    IntegerNode was changed to intNode
    BooleanNodeDefinition was changed to boolNodeDefinition

Commits
-------

68debfb fix docblock
2014-04-22 10:09:28 +02:00
Loick Piera
68debfb190 fix docblock 2014-04-22 10:09:28 +02:00
Fabien Potencier
5cae63f084 minor #10752 [FrameworkBundle] improve English in RouterMatchCommand (shieldo)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] improve English in RouterMatchCommand

Improve English in command output.

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

Commits
-------

dd26d1e [FrameworkBundle] improve English in RouterMatchCommand
2014-04-22 09:21:18 +02:00
Fabien Potencier
acb4f10044 minor #10755 [Validator] slovenian translation updated (peterkokot)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] slovenian translation updated

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

Commits
-------

c6c5cad [Validator] slovenian translation updated
2014-04-22 09:19:52 +02:00
Fabien Potencier
882e9bac1e bug #10757 [2.3][Process] Setting STDIN while running should not be possible (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Setting STDIN while running should not be possible

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

Commits
-------

3e3517a [Process] Setting STDIN while running should not be possible
2014-04-22 09:18:13 +02:00
Fabien Potencier
4dcb158ba1 bug #10749 Fixed incompatibility of x509 auth with nginx (alcaeus)
This PR was squashed before being merged into the 2.3 branch (closes #10749).

Discussion
----------

Fixed incompatibility of x509 auth with nginx

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

This commit fixes x509 authentication when using nginx as web server.
X509AuthenticationListener depends on the SSL_CLIENT_S_DN_Email field being set.
As is, this field is specific to Apache and cannot be provided by nginx. nginx
can provide the DN of the certificate in SSL_CLIENT_S_DN. If the email field is
not set, the listener tries to extract the email address from the DN.

Commits
-------

ba8fc16 Fixed incompatibility of x509 auth with nginx
2014-04-22 09:12:34 +02:00
alcaeus
ba8fc166ca Fixed incompatibility of x509 auth with nginx 2014-04-22 09:12:31 +02:00
Romain Neutron
3e3517abfd [Process] Setting STDIN while running should not be possible 2014-04-21 23:11:42 +02:00
Peter Kokot
c6c5cad5a3 [Validator] slovenian translation updated 2014-04-21 21:16:29 +02:00
Douglas Greenshields
dd26d1e50a [FrameworkBundle] improve English in RouterMatchCommand 2014-04-21 15:42:14 +01:00
Fabien Potencier
ba55b1ed18 minor #10743 [Doctrine Bridge] simplify session handler (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Doctrine Bridge] simplify session handler

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no because the driver connection could not be used anyway before
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT

Use main connection as discussed in #10720

Commits
-------

6518b74 [Doctrine Bridge] simplify session handler by using main connection
2014-04-21 12:44:14 +02:00
Fabien Potencier
3c4b73391c minor #10751 [Validator] Updated Hungarian translations (1ed)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Updated Hungarian translations

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

Commits
-------

e9e09fd [Validator] Updated Hungarian translations
2014-04-21 12:41:26 +02:00
Gábor Egyed
e9e09fd48a [Validator] Updated Hungarian translations 2014-04-21 03:18:54 +02:00
Tobias Schultze
6518b74995 [Doctrine Bridge] simplify session handler by using main connection 2014-04-20 18:21:59 +02:00
Fabien Potencier
526fe1e53a minor #10748 [Validator] Fixed typos in German translation (mweimerskirch)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Fixed typos in German translation

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

Fixes for typos in #10745 as reported by @craue

Commits
-------

5e1ee8a [Validator] Fixed typos in German translation
2014-04-20 13:21:41 +02:00
Michel Weimerskirch
5e1ee8aa3c [Validator] Fixed typos in German translation 2014-04-20 11:40:39 +02:00
Fabien Potencier
a594e46199 minor #10744 [Validator] Completed Luxembourgish translations (mweimerskirch)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Completed Luxembourgish translations

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

Commits
-------

bc66e8f [Validator] Completed Luxembourgish translations
2014-04-20 09:33:50 +02:00
Fabien Potencier
00d779e120 minor #10745 [Validator] Completed German translations (mweimerskirch)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Completed German translations

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

Commits
-------

47e5a4b [Validator] Completed German translations
2014-04-20 09:32:46 +02:00
Fabien Potencier
0dd3098a8f minor #10746 [Validator] Completed French translations (mweimerskirch)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Completed French translations

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

Commits
-------

dcc34c1 [Validator] Completed French translations
2014-04-20 09:31:40 +02:00
Michel Weimerskirch
dcc34c1698 [Validator] Completed French translations
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | n/a
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2014-04-20 01:24:43 +02:00
Michel Weimerskirch
47e5a4b198 [Validator] Completed German translations 2014-04-20 01:08:17 +02:00
Michel Weimerskirch
bc66e8f158 [Validator] Completed Luxembourgish translations 2014-04-20 01:07:01 +02:00
Fabien Potencier
bbadcfd01b Merge branch '2.3' into 2.4
* 2.3:
  Little correction for case 'ar'
  No need to use mb functions here
  [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
  [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
  [Finder] Marked test skipped when ftp stream wrapper is not available
2014-04-18 23:02:05 +02:00
Fabien Potencier
567213fea9 bug #10735 [Translation] [PluralizationRules] Little correction for case 'ar' (klyk50)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10735).

Discussion
----------

[Translation] [PluralizationRules] Little correction for case 'ar'

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

Commits
-------

ef85f4c Little correction for case 'ar'
2014-04-18 23:01:09 +02:00
klyk50
ef85f4cd97 Little correction for case 'ar' 2014-04-18 23:01:08 +02:00
Fabien Potencier
7b7a0efce2 minor #10719 [Finder] Marked test skipped when ftp stream wrapper is not available (deguif)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] Marked test skipped when ftp stream wrapper is not available

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

This should prevent test from failing on hhvm as ftp stream wrapper is not currently implemented.
See https://github.com/facebook/hhvm/issues/2108 for more details.

Commits
-------

f35fc81 [Finder] Marked test skipped when ftp stream wrapper is not available
2014-04-18 22:56:28 +02:00
Fabien Potencier
5eacace321 bug #10720 [HttpFoundation] Fix DbalSessionHandler (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix DbalSessionHandler

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

This is basically the same as #10652 for the DbalSessionHandler.

- First commit fixes fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite).
- Second commit updates phpdoc of SessionHandlerInterface and unifies parameters of all handlers according to interface (so inheritdoc actually makes sense).

Commits
-------

524bf84 [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
ccdfbe6 [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
2014-04-18 22:55:02 +02:00
Fabien Potencier
186020677e minor #10739 [2.4] Fix doc-blocks (romainneutron)
This PR was merged into the 2.4 branch.

Discussion
----------

[2.4] Fix doc-blocks

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

last one has been merged too quickly

Commits
-------

7fab25e Fix doc-blocks
2014-04-18 22:52:32 +02:00
Fabien Potencier
b2b9bbe09d minor #10730 No need to use mb functions here (mvrhov)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10730).

Discussion
----------

No need to use mb functions here

When mb functions are used and a large response is given the OOM happens as mb functions will use large quantities of memory.

In my example the response is approximately 27M in size and a php has a memory consumption of about 150M... When mb functions are used the memory shoots over 250M

Commits
-------

4e8ba13 No need to use mb functions here
2014-04-18 22:46:02 +02:00
Miha Vrhovnik
4e8ba13874 No need to use mb functions here
When mb functions are used and a large response is given the OOM happens as mb functions will use large quantities of memory.
2014-04-18 22:46:01 +02:00
Romain Neutron
7fab25e48d Fix doc-blocks 2014-04-18 22:45:55 +02:00
Fabien Potencier
7505c19dec minor #10738 [2.4] Fix doc blocks (romainneutron)
This PR was merged into the 2.4 branch.

Discussion
----------

[2.4] Fix doc blocks

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

this follows #10737

Commits
-------

c01915d Fix doc blocks
2014-04-18 22:41:38 +02:00
Fabien Potencier
e50d263f7a unified return null usages 2014-04-18 22:38:54 +02:00
Romain Neutron
c01915da95 Fix doc blocks 2014-04-18 22:37:14 +02:00
Fabien Potencier
2827747108 Merge branch '2.3' into 2.4
* 2.3:
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/Console/Helper/DescriptorHelper.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
	src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
2014-04-18 22:37:09 +02:00
Fabien Potencier
5b72e5ab04 minor #10717 unified return null usages (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

unified return null usages

| Q             | A
| ------------- | ---
| License       | MIT

This PR unifies the way we return `null` from a function or method:

 * always use `return;` instead of `return null;` (the current code base uses both);
 * never use `return;` at the end of a function/method.

Commits
-------

d1d569b unified return null usages
2014-04-18 22:35:25 +02:00
Fabien Potencier
78e72fe3bf bug #10721 [HttpFoundation] status 201 is allowed to have a body (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] status 201 is allowed to have a body

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | only if someone relied on wrong behavior
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10673
| License       | MIT

Status 201 is allowed to have a response body.

Commits
-------

1761f64 [HttpFoundation] status 201 is allowed to have a body
2014-04-18 22:26:13 +02:00
Fabien Potencier
45184aac06 bug #10728 [2.3][Process] Fix #10681, process are failing on Windows Server 2003 (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Fix #10681, process are failing on Windows Server 2003

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

Commits
-------

46fdfbb [Process] Fix #10681, process are failing on Windows Server 2003
2014-04-18 22:23:17 +02:00
Fabien Potencier
b551f9f4ad minor #10732 [Validator] added Japanese translation (issei-m)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #10732).

Discussion
----------

[Validator] added Japanese translation

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

Commits
-------

7b91e03 [Validator] added Japanese translation
2014-04-18 22:22:10 +02:00
Issei.M
7b91e03251 [Validator] added Japanese translation 2014-04-18 22:22:10 +02:00
Fabien Potencier
4f9e05cb55 minor #10737 [2.3] Fix doc blocks (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix doc blocks

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

Commits
-------

de5d627 Fix doc blocks
2014-04-18 22:20:50 +02:00
Fabien Potencier
6f62416b20 bug #10733 [DomCrawler] Textarea value should default to empty string instead of null. (Berdir)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10733).

Discussion
----------

[DomCrawler] Textarea value should default to empty string instead of null.

Noticed this when working on Updating Behat/Mink/Goutte to Guzzle 4, see https://github.com/fabpot/Goutte/pull/140 and https://github.com/Behat/MinkGoutteDriver/pull/34.

Testing this with Drupal 8, trying to submit a Form which has empty form elements, the $value in a TextArea form elements defaults to null, then we end up with those in getValues() and then http_build_query() creates an empty string for those. That results in array keys like ['' => false]. This is then passed through to Guzzle, which ends up in MessageFactory::addPostData(), goes into the else creates and tries to create file with those values, which will throw an exception in GuzzleHttp\Stream::create(): with "Invalid resource type false".

I think the correct fix is to default to an empty string instead of null.

Will also need tests,

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

Commits
-------

f672564 Textarea value should default to empty string instead of null.
2014-04-18 22:19:23 +02:00
Sascha Grossenbacher
f6725648cc Textarea value should default to empty string instead of null. 2014-04-18 22:19:23 +02:00