Commit Graph

17380 Commits

Author SHA1 Message Date
Fabien Potencier
135c174ee1 bug #10809 Fixed composer to include config component for mocks in phpunit (jpauli)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fixed composer to include config component for mocks in phpunit

Commits
-------

939e92d Fixed composer to include config component for mocks in phpunit
2014-04-30 08:46:20 +02:00
Fabien Potencier
93926cae34 bug #10815 Fixed issue #5427 (umpirsky)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10815).

Discussion
----------

Fixed issue #5427

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

Commits
-------

f308f52 Fixed issue #5427
2014-04-30 08:40:38 +02:00
umpirsky
f308f521a6 Fixed issue #5427 2014-04-30 08:40:38 +02:00
Fabien Potencier
afca3cdf2d Revert "bug #10817 [Debug] fix #10313: FlattenException not found (nicolas-grekas)"
reverted in 2.5 as it does not make sense here.

This reverts commit c18bf19016, reversing
changes made to 585b61db95.
2014-04-30 08:24:35 +02:00
Fabien Potencier
49bc4f1469 Merge branch '2.4'
* 2.4:
  [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
2014-04-30 08:22:38 +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
Ruben Kruiswijk
e40153354d Use absolute URLs to assets on Symfony its internal pages. 2014-04-29 13:32:21 +02:00
Fabien Potencier
89f7907c4f bumped Symfony version to 2.5.0 2014-04-29 12:38:03 +02:00
Julien Pauli
939e92d3ca Fixed composer to include config component for mocks in phpunit 2014-04-29 12:13:57 +02:00
Fabien Potencier
aea2c6427e updated VERSION for 2.5.0-BETA2 2014-04-29 09:08:19 +02:00
Fabien Potencier
0126c56dd3 updated CHANGELOG for 2.5.0-BETA2 2014-04-29 09:08:09 +02:00
Fabien Potencier
9c202eacbc Merge branch '2.4'
* 2.4:
  [Debug] fix ErrorHandlerTest when context is not an array
2014-04-29 08:56:05 +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
63d1255078 Merge branch '2.4'
* 2.4:
  [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
  [ExpressionLanguage] Test for the non-strict in_array check in parsePrimaryExpression in Parser.php
  Strict in_array check in Parser.php
  Updated Serbian latin validation translation

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
2014-04-28 19:44:51 +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
21ea0383db bug #10799 [Debug] less intrusive work around for https://bugs.php.net/54275 (nicolas-grekas)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Debug] less intrusive work around for https://bugs.php.net/54275

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

- This PR supersedes the behavior introduced in https://github.com/symfony/symfony/pull/10725 :
  Instead of building some complicated code to work around https://bugs.php.net/54275, the code is now as
  straightforward as possible, with a conditional fallback work around.
- The handling of fatal errors is also made more robust/fail-safe.
- Last but not least, ErrorsLoggerListener and FatalErrorExceptionsListener are now registered earlier and
  are now cleaning up their handler/logger once set to prevent setting again and again for sub-requests
  (+remove one refcount for these handler and logger).

Commits
-------

d7a186f [Debug] less intrusive work around for https://bugs.php.net/54275
2014-04-28 18:50:00 +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
Nicolas Grekas
d7a186f5ca [Debug] less intrusive work around for https://bugs.php.net/54275 2014-04-28 18:08:18 +02:00
Fabien Potencier
f4f09d176b bug #10798 [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Console] Fix #10795: Allow instancing Console Application when STDIN is not declared

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

Commits
-------

3a5a525 [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared
2014-04-28 15:26:08 +02:00
Romain Neutron
3a5a525aee [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared 2014-04-28 14:32:01 +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
23286bc512 Merge branch '2.4'
* 2.4:
  bumped Symfony version to 2.4.5
  updated VERSION for 2.4.4
  updated CHANGELOG for 2.4.4
  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
  Updated Serbian validation translation
  [Console] Fixed the rendering of exceptions on HHVM with a terminal width
  [WebProfilerBundle ] Fixed an edge case on WDT loading
  [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument
  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
2014-04-28 07:15:04 +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