Commit Graph

17239 Commits

Author SHA1 Message Date
Fabien Potencier
8003cfe801 Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.14
  updated VERSION for 2.3.13
  update CONTRIBUTORS for 2.3.13
  updated CHANGELOG for 2.3.13
  [Console] Fixed the rendering of exceptions on HHVM with a terminal width
  [WebProfilerBundle ] Fixed an edge case on WDT loading
  fixed typo
  [Process] Disable TTY mode on Windows platform
  [Validator] added missing ANNOTATION config to @Target annotation
  [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Validator/Constraints/Callback.php
2014-04-27 15:34:57 +02:00
Fabien Potencier
d28149f75e bumped Symfony version to 2.3.14 2014-04-27 15:17:08 +02:00
Fabien Potencier
9c4b11915d updated VERSION for 2.3.13 2014-04-27 10:34:33 +02:00
Fabien Potencier
096d3c983c update CONTRIBUTORS for 2.3.13 2014-04-27 10:34:15 +02:00
Fabien Potencier
f096093d44 updated CHANGELOG for 2.3.13 2014-04-27 10:33:05 +02:00
Fabien Potencier
961275dc27 bug #10789 [Console] Fixed the rendering of exceptions on HHVM with a terminal width (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fixed the rendering of exceptions on HHVM with a terminal width

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

If ``getTerminalWidth`` returns a big integer (which is the case in Behat 2.5 which overwrites the method to return ``PHP_INT_MAX`` to avoid limiting the width), the fix done in #10000 for HHVM would be needed as well. So this moves it after the condition rather than having it only for the default.

Commits
-------

6e57380 [Console] Fixed the rendering of exceptions on HHVM with a terminal width
2014-04-27 10:32:45 +02:00
Fabien Potencier
0d723c31a4 minor #10791 Updated Serbian validation translation (umpirsky)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #10791).

Discussion
----------

Updated Serbian validation translation

Commits
-------

c9bb6c3 Updated Serbian validation translation
2014-04-26 20:24:00 +02:00
umpirsky
c9bb6c3990 Updated Serbian validation translation 2014-04-26 20:23:59 +02:00
Christophe Coevoet
6e57380d14 [Console] Fixed the rendering of exceptions on HHVM with a terminal width 2014-04-26 13:09:19 +02:00
Fabien Potencier
555fde54fa bug #10773 [WebProfilerBundle ] Fixed an edge case on WDT loading (tucksaun)
This PR was squashed before being merged into the 2.3 branch (closes #10773).

Discussion
----------

[WebProfilerBundle ] Fixed an edge case on WDT loading

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

In some case you can notice the WDT just disappears.
By tracking it down, I noticed that the XHR call returns an empty response with 200 as status code, but if you go directly on the _wdt/my_token URL it works correctly.
What's happening is that when you have a slow listener on `kernel.terminate` (for example the SwiftMailer one with a slow connection), you response (and therefore the WDT javascript) is sent and processed by the browser, the XHR call is done, but the Profiler storage didn't happened yet so no profiling data is available and the `ProfilerController` just sends an empty response with 200 as status code.

Here we change to instead send a specific status code, and treat it in javascript by retrying several times before failing.

The question are:
* Is 204 the most appropriate response code?
* Are 500 ms and 5 max retries good values?

Commits
-------

9d885ed [WebProfilerBundle ] Fixed an edge case on WDT loading
2014-04-25 14:19:16 +02:00
Tugdual Saunier
9d885ed898 [WebProfilerBundle ] Fixed an edge case on WDT loading 2014-04-25 14:19:13 +02:00
Fabien Potencier
9d0de5b57b feature #10786 [FrameworkBundle] removed support for HHVM built-in web server as it is deprecated now (fabpot)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle] removed support for HHVM built-in web server as it is deprecated now

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

Commits
-------

7f7e2d8 [FrameworkBundle] removed support for HHVM built-in web server as it is deprecated now
2014-04-25 14:08:25 +02:00
Fabien Potencier
7f7e2d8954 [FrameworkBundle] removed support for HHVM built-in web server as it is deprecated now 2014-04-25 13:40:15 +02:00
Fabien Potencier
9834257355 bug #10784 [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument (choonge)
This PR was merged into the 2.4 branch.

Discussion
----------

[Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument

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

Commits
-------

b020207 [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument
2014-04-25 09:12:10 +02:00
Choong Wei Tjeng
b0202077fe [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument 2014-04-25 09:06:20 +02:00
Fabien Potencier
4c2405f300 bug #10776 [Debug] fix #10771 DebugClassLoader can't load PSR4 libs (nicolas-grekas)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Debug] fix #10771 DebugClassLoader can't load PSR4 libs

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

Commits
-------

e3566c2 [Debug] fix #10771 DebugClassLoader can't load PSR4 libs
2014-04-25 09:03:21 +02:00
Fabien Potencier
763674659c minor #10782 fixed typo (ghost098)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10782).

Discussion
----------

fixed typo

[Validator] [FrameworkBundle]  fixed a typo in farsi translation of length validator when input must be of exact size.

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

Commits
-------

dc3f350 fixed typo
2014-04-25 08:54:53 +02:00
Arash Tabriziyan
dc3f3505e8 fixed typo 2014-04-25 08:54:53 +02:00
Nicolas Grekas
e3566c27b7 [Debug] fix #10771 DebugClassLoader can't load PSR4 libs 2014-04-24 17:48:28 +02:00
Fabien Potencier
544e43f5e2 bug #10763 [Process] Disable TTY mode on Windows platform (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Disable TTY mode on Windows platform

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

Commits
-------

7942c2a [Process] Disable TTY mode on Windows platform
2014-04-24 15:28:08 +02:00
Romain Neutron
7942c2a64c [Process] Disable TTY mode on Windows platform 2014-04-24 14:53:00 +02:00
Fabien Potencier
67be44737e [Validator] added missing ANNOTATION config to @Target annotation 2014-04-24 07:32:02 +02:00
Fabien Potencier
ed53afe0fe bug #10772 [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator

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

`\RecursiveDirectoryIterator::getChildren()` creates an instance of the current (overloaded) class with default constructor arguments. Therefore the `ignoreUnreadableDirs` is not passed to the child directories as @marcj suggested in #10747.

My fix relies on PHP's ability to modify private properties in objects of the same class. My reasoning behind choosing this approach, instead of using a setter, is that it's an internal detail which doesn't need to be part of a public interface.

Unfortunately, I can't really cover this case by tests.

Commits
-------

1346641 [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.
2014-04-24 07:29:16 +02:00
Jakub Zalas
13466415c4 [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator. 2014-04-23 22:00:27 +01:00
Fabien Potencier
aa5d62d8bc fixed typo 2014-04-23 17:17:21 +02:00
Fabien Potencier
61e287e0b6 Merge branch '2.4'
* 2.4:
  [Validator] added missing @Target
  [Validator] fixed @Target config
  added @Target annotations
  [Process] Add missing docblocks, remove variable declarations

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
2014-04-23 16:08:54 +02:00
Fabien Potencier
dd175cfcd8 [Validator] added missing @Target 2014-04-23 16:07:18 +02:00
Fabien Potencier
99ca3f384e [Validator] fixed @Target config 2014-04-23 16:07:13 +02:00
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
thewilkybarkid
fc1223f924 Allow URLs that don't contain a path 2014-04-22 15:58:51 +01:00
Romain Neutron
ff77f24092 [Process] Add missing docblocks, remove variable declarations 2014-04-22 10:47:56 +02:00
Fabien Potencier
6658989fb8 Merge branch '2.4'
* 2.4:
  fix docblock
  Fixed incompatibility of x509 auth with nginx
  [Process] Setting STDIN while running should not be possible
  [Validator] slovenian translation updated
  [FrameworkBundle] improve English in RouterMatchCommand
  [Validator] Updated Hungarian translations
  [Doctrine Bridge] simplify session handler by using main connection
  [Validator] Fixed typos in German translation
  [Validator] Completed French translations
  [Validator] Completed German translations
  [Validator] Completed Luxembourgish translations
2014-04-22 10:11:23 +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