Commit Graph

16998 Commits

Author SHA1 Message Date
Nicolas Grekas
6ab671361b Lower mbstring dependency 2014-05-12 11:22:51 +02:00
Fabien Potencier
b3ec567224 minor #10840 [Security] fixed wrong PHPDoc of the TokenGeneratorInterface (hhamon)
This PR was merged into the 2.4 branch.

Discussion
----------

[Security] fixed wrong PHPDoc of the TokenGeneratorInterface

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

Commits
-------

0e32676 [Security] fixed wrong PHPDoc of the TokenGeneratorInterface
2014-05-02 17:36:34 +02:00
Hugo Hamon
0e32676032 [Security] fixed wrong PHPDoc of the TokenGeneratorInterface 2014-05-02 15:46:37 +02:00
Fabien Potencier
272490312a Merge branch '2.3' into 2.4
* 2.3:
  [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
2014-04-30 08:22:28 +02:00
Fabien Potencier
c18bf19016 bug #10817 [Debug] fix #10313: FlattenException not found (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] fix #10313: FlattenException not found

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

Note that this patch should be ignored while merging into 2.5/master (it will conflict because 2.5/master has a much stronger workaround, not suitable for a minor release IMHO).

Commits
-------

b147cfa [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
2014-04-30 08:22:14 +02:00
Nicolas Grekas
b147cfaf15 [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098 2014-04-29 21:42:43 +02:00
Fabien Potencier
f800ade034 Merge branch '2.3' into 2.4
* 2.3:
  [Debug] fix ErrorHandlerTest when context is not an array

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
2014-04-29 08:55:57 +02:00
Fabien Potencier
585b61db95 bug #10803 [Debug] fix ErrorHandlerTest when context is not an array (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] fix ErrorHandlerTest when context is not an array

| 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
-------

988a5dc [Debug] fix ErrorHandlerTest when context is not an array
2014-04-28 22:25:34 +02:00
Nicolas Grekas
988a5dc937 [Debug] fix ErrorHandlerTest when context is not an array 2014-04-28 20:50:14 +02:00
Fabien Potencier
b1c4ece2d5 Merge branch '2.3' into 2.4
* 2.3:
  [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292
  Allow File instance to be passed to BinaryFileResponse
  Add upgrade instructions for the LoggerInterface
  fixed CS
  Removed strict check when found variables inside a translation
2014-04-28 19:43:58 +02:00
Fabien Potencier
48f26f7e94 bug #10801 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292

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

Commits
-------

ed0ed80 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292
2014-04-28 18:51:21 +02:00
Fabien Potencier
9e2a834582 bug #10797 [HttpFoundation] Allow File instance to be passed to BinaryFileResponse (anlutro)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Allow File instance to be passed to BinaryFileResponse

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

See https://github.com/symfony/symfony/issues/10608 for discussion and reasoning.

The docblocks get rather long with this change. The File class does extend SplFileObject so technically it could be left out of the docblock if that is more desirable.

Commits
-------

fc04ad2 Allow File instance to be passed to BinaryFileResponse
2014-04-28 18:47:48 +02:00
Nicolas Grekas
ed0ed80286 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292 2014-04-28 18:43:50 +02:00
Andreas Lutro
fc04ad2134 Allow File instance to be passed to BinaryFileResponse 2014-04-28 18:17:17 +02:00
Fabien Potencier
37a4876d8b minor #10644 Add upgrade instructions for the LoggerInterface that changed in Symfony 2.2 (ch3ric)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #10644).

Discussion
----------

Add upgrade instructions for the LoggerInterface that changed in Symfony 2.2

Commits
-------

6daa295 Add upgrade instructions for the LoggerInterface
2014-04-28 12:01:28 +02:00
Charles-Eric Gorron
6daa2951fc Add upgrade instructions for the LoggerInterface 2014-04-28 12:01:28 +02:00
Fabien Potencier
17d7186cf8 fixed CS 2014-04-28 11:30:24 +02:00
Fabien Potencier
11f9497e50 bug #10643 [TwigBridge] Removed strict check when found variables inside a translation (goetas)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10643).

Discussion
----------

[TwigBridge] Removed strict check when found variables inside a translation

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

Commits
-------

074191e Removed strict check when found variables inside a translation
2014-04-28 11:28:59 +02:00
Asmir Mustafic
074191e705 Removed strict check when found variables inside a translation 2014-04-28 11:28:59 +02:00
Fabien Potencier
e210082b2c bug #10605 [ExpressionLanguage] Strict in_array check in Parser.php (parnas)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #10605).

Discussion
----------

[ExpressionLanguage] Strict in_array check in Parser.php

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

Otherwise it doesn't throw an exception for the cases when passed parameters array includes zero key (and that will result in the PHP Notice down the road).

Commits
-------

154c4a5 [ExpressionLanguage] Test for the non-strict in_array check in parsePrimaryExpression in Parser.php
e465135 Strict in_array check in Parser.php
2014-04-28 11:05:24 +02:00
Dmitry Parnas
154c4a598a [ExpressionLanguage] Test for the non-strict in_array check in parsePrimaryExpression in Parser.php 2014-04-28 11:05:23 +02:00
parnas
e46513557a Strict in_array check in Parser.php
Otherwise it doesn't throw an error for the cases when passed parameters array includes zero key.
2014-04-28 11:05:23 +02:00
Fabien Potencier
0515fe3eff minor #10796 Updated Serbian latin validation translation (umpirsky)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #10796).

Discussion
----------

Updated Serbian latin validation translation

Commits
-------

43e65de Updated Serbian latin validation translation
2014-04-28 07:16:03 +02:00
umpirsky
43e65dea9a Updated Serbian latin validation translation 2014-04-28 07:16:03 +02:00
Fabien Potencier
47d1af1ef1 bumped Symfony version to 2.4.5 2014-04-27 20:41:56 +02:00
Fabien Potencier
4697c33cdf updated VERSION for 2.4.4 2014-04-27 15:39:18 +02:00
Fabien Potencier
66b9df0c1b updated CHANGELOG for 2.4.4 2014-04-27 15:39:07 +02:00
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
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
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
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
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