Commit Graph

20336 Commits

Author SHA1 Message Date
Nicolas Grekas
7617492914 Merge branch '2.3' into 2.6
* 2.3:
  [2.3][Debug] Fix fatal-errors handling on HHVM
  Standardize the name of the exception variables
  [2.3] Static Code Analysis for Components
  Remove duplicated paths

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
2015-06-18 14:58:06 +02:00
Nicolas Grekas
17ffb5a81a bug #15000 [2.3][Debug] Fix fatal-errors handling on HHVM (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Debug] Fix fatal-errors handling on HHVM

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

Commits
-------

d29bfdc [2.3][Debug] Fix fatal-errors handling on HHVM
2015-06-18 14:49:57 +02:00
Nicolas Grekas
427605a5be bug #14999 [2.6][Debug] Fix fatal-errors handling on HHVM (nicolas-grekas, digitalkaoz)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Debug] Fix fatal-errors handling on HHVM

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

Commits
-------

9f346a5 Add test for HHVM FatalErrors
445de5e [2.6][Debug] Fix fatal-errors handling on HHVM
2015-06-18 14:47:30 +02:00
Robert Schönthal
9f346a5a8d Add test for HHVM FatalErrors 2015-06-18 11:59:18 +02:00
Nicolas Grekas
445de5e828 [2.6][Debug] Fix fatal-errors handling on HHVM 2015-06-18 11:42:58 +02:00
Fabien Potencier
13c5d7cd0d bug #14959 [Debug+VarDumper] Fix handling of PHP7 "Throwable" exceptions (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug+VarDumper] Fix handling of PHP7 "Throwable" exceptions

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

PHP7 may introduce the Throwable interface if the corresponding RFC is accepted (see https://wiki.php.net/rfc/throwable-interface)
This PR adds support for it. We should wait for final approval of the RFC before merging it.

Commits
-------

4dc727f [Debug+VarDumper] Fix handling of PHP7 exception/error model
edf793e [VarDumper] Cherry-pick code style fixes from 2.7
2015-06-17 23:08:37 +02:00
Fabien Potencier
704dd503a4 bug #15010 [Debug] Fix log level of stacked errors (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Fix log level of stacked errors

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

Commits
-------

d2ebd51 [Debug] Fix log level of stacked errors
2015-06-17 23:07:27 +02:00
Nicolas Grekas
d2ebd51113 [Debug] Fix log level of stacked errors 2015-06-17 21:16:58 +02:00
Fabien Potencier
aa971759d6 bug #15017 [VarDumper] Fix uninitialized id in HtmlDumper (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix uninitialized id in HtmlDumper

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

Commits
-------

00eee72 [VarDumper] Fix uninitialized id in HtmlDumper
2015-06-17 16:23:56 +02:00
Nicolas Grekas
00eee72f0e [VarDumper] Fix uninitialized id in HtmlDumper 2015-06-17 15:20:53 +02:00
Tobias Schultze
da662497f0 bug #14980 Fixed fluent interface (jaytaph)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14980).

Discussion
----------

Fixed fluent interface

Small fix for fluent interface break when adding a single `TableSeparator` instance.

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

Commits
-------

138f4a9 Fixed fluent interface
2015-06-16 20:12:58 +02:00
Joshua Thijssen
138f4a9849 Fixed fluent interface 2015-06-16 20:12:29 +02:00
Nicolas Grekas
d29bfdcc31 [2.3][Debug] Fix fatal-errors handling on HHVM 2015-06-16 14:35:43 +02:00
Nicolas Grekas
04ccdc14fe minor #14998 [Debug] fix debug class loader case test on windows (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] fix debug class loader case test on windows

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

https://github.com/symfony/symfony/blob/2.6/src/Symfony/Component/Debug/DebugClassLoader.php#L213 didn't work since $real and $tail had different directory separators.

Commits
-------

31c25d9 [Debug] fix debug class loader case test on windows
2015-06-16 13:43:55 +02:00
Tobias Schultze
31c25d9a42 [Debug] fix debug class loader case test on windows 2015-06-16 13:27:45 +02:00
Fabien Potencier
287a577b8c minor #14937 Standardize the name of the exception variables (javiereguiluz)
This PR was squashed before being merged into the 2.3 branch (closes #14937).

Discussion
----------

Standardize the name of the exception variables

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

See https://github.com/symfony/symfony-docs/pull/4491 for the context of this change.

In Symfony source code there are 410 `try ... catch` blocks. More than 95% of them use `$e` as the name of the exception variable. After applying these changes, 407 out of 410 variables are named `$e`.

These are the three cases where I didn't change the name of the `$e` variable:

  * Nested exception in https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php#L40. It uses `$e2` as the name of the nested variable.
  * Nested exception in https://github.com/symfony/symfony/blob/2.3/src/Symfony/Bundle/TwigBundle/TwigEngine.php#L82. I changed the name of the `$ex` variable to `$e2` to match the previous syntax.
  * https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Console/Helper/DialogHelper.php#L463. I don't know if it's safe to change the name of the `$error` exception variable.

Commits
-------

e8b924c Standardize the name of the exception variables
2015-06-15 18:26:37 +02:00
Javier Eguiluz
e8b924c2d3 Standardize the name of the exception variables 2015-06-15 18:26:34 +02:00
Nicolas Grekas
4dc727fa7d [Debug+VarDumper] Fix handling of PHP7 exception/error model 2015-06-15 17:25:25 +02:00
Tobias Schultze
d4b669bb63 minor #14890 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #14890).

Discussion
----------

[2.3] Static Code Analysis for Components

| 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

Static Code Analysis with Php Inspections (EA Extended):
    - not optimal regular expressions usage
    - strlen miss-use
    - not optimal conditional statements in Process and Filesystem
    - unsafe uniquid usage

PS: re-creating to no spam history log with reverts

Commits
-------

4a4fea7 [2.3] Static Code Analysis for Components
2015-06-15 15:02:12 +02:00
Vladimir Reznichenko
4a4fea742b [2.3] Static Code Analysis for Components 2015-06-15 15:02:08 +02:00
Fabien Potencier
94c7b25ceb bug #14974 [2.6][Security][Translation] #14920 update translations (vincentaubert)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Security][Translation] #14920 update translations

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

Commits
-------

dfd3e62 [2.6][Security][Translation] #14920 update translations
2015-06-14 18:51:06 +02:00
Vincent AUBERT
dfd3e62dc3 [2.6][Security][Translation] #14920 update translations 2015-06-14 13:45:05 +02:00
Tobias Schultze
11010ca691 minor #14965 [Config] Remove duplicated paths (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Remove duplicated paths

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

If someone sets the same path twice, the file locator will search for the the same file twice. We should remove duplicated paths before locate a file.

Commits
-------

97de887 Remove duplicated paths
2015-06-13 16:06:26 +02:00
Diego Saint Esteben
97de887222 Remove duplicated paths 2015-06-12 16:45:17 -03:00
Nicolas Grekas
edf793ead2 [VarDumper] Cherry-pick code style fixes from 2.7 2015-06-12 10:17:57 +02:00
Fabien Potencier
88e99d2244 bug #14930 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment fr… (Incognito)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #14930).

Discussion
----------

Bug #14836 [HttpFoundation] Moves default JSON encoding assignment fr…

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

Moves the assignment of the encoding flags to a property so the class can be extended without needing to re-write the constructor and perform the encoding of data twice.

For more information please see https://github.com/symfony/symfony/issues/14836

Commits
-------

25e0d63 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property
2015-06-12 00:49:26 +02:00
Brian Graham
25e0d630b8 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property 2015-06-12 00:49:26 +02:00
Fabien Potencier
f0045deaba Merge branch '2.3' into 2.6
* 2.3:
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [2.3] Fix tests on Windows
2015-06-11 19:26:27 +02:00
Fabien Potencier
009efb8dec fixed CS 2015-06-11 15:53:10 +02:00
Fabien Potencier
e54d7161ab bug #14897 Allow new lines in Messages translated with transchoice() (replacement for #14867) (azine)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #14897).

Discussion
----------

 Allow new lines in Messages translated with transchoice() (replacement for #14867)

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

Hi,
I found that the MessageSelector does not handle new lines in messages very well.
I suggest adding the "s" modifier to the regexp used to identify the parts and ranges.
What do you think?

PS: would be nice to have this change also in Symfony 2.6 & 2.7

Commits
-------

786b8a6  Allow new lines in Messages translated with transchoice() (replacement for #14867)
2015-06-11 15:52:49 +02:00
azine
786b8a664e Allow new lines in Messages translated with transchoice() (replacement for #14867) 2015-06-11 15:52:49 +02:00
Fabien Potencier
c95d86c9c6 minor #14926 [2.3] Fix tests on Windows (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #14926).

Discussion
----------

[2.3] Fix tests on Windows

There were quite a few tests failing when running on my Windows PC. These fixes are the ones I could easily fix.

| Q | A
| --- | ---
| License | MIT
| Fixed tickets | -

Commits
-------

e3e5f3d [2.3] Fix tests on Windows
2015-06-10 02:09:28 +02:00
WouterJ
e3e5f3d661 [2.3] Fix tests on Windows 2015-06-10 02:09:26 +02:00
Fabien Potencier
49d942a2ba Merge branch '2.3' into 2.6
* 2.3:
  [Form] Support DateTimeImmutable in transform()
  [Form] Fix call to removed method (BC broken in 2.3)
  [HttpFoundation] Get response content as resource several times for PHP >= 5.6
  Improved duplicated code in FileLocator
2015-06-09 17:06:34 +02:00
Fabien Potencier
29027eead6 minor #14911 [Validator] remove partial deprecation annotation (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] remove partial deprecation annotation

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

Commits
-------

b49c82f [Validator] remove partial deprecation annotation
2015-06-08 20:18:54 +02:00
Christian Flothmann
b49c82ff8c [Validator] remove partial deprecation annotation 2015-06-08 18:16:07 +02:00
Fabien Potencier
6fcdcb509a minor #14866 Updated UPGRADE-2.4.md (mickaelandrieu)
This PR was submitted for the 2.8 branch but it was merged into the 2.6 branch instead (closes #14866).

Discussion
----------

Updated UPGRADE-2.4.md

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

A missing deprecation in the upgrade guide.

Commits
-------

b631a56 Updated UPGRADE-2.4.md
2015-06-08 16:44:58 +02:00
Mickaël Andrieu
b631a561b6 Updated UPGRADE-2.4.md 2015-06-08 16:44:57 +02:00
Fabien Potencier
a48d36ae31 bug #14895 [Form] Support DateTimeImmutable in transform() (c960657)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Support DateTimeImmutable in transform()

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

When passing a DateTimeImmutable instance to DateTimeToLocalizedStringTransformer::transform($dateTime), it throws an exception, `TransformationFailedException('Expected a \DateTime.')`.

The method just converts a date-time object into a string, so there is no reason that it should not support all DateTimeInterface implementations.

DateTimeInterface was added in PHP 5.5, so in order to support earlier versions, we need to do instanceof checks for both DateTime and DateTimeInterface. When Symfony requires PHP 5.5 or larger, we can remove the DateTime check and only check for DateTimeInterface.

This was originally submitted as a PR against the 2.7 branch in #14676.

Commits
-------

17346c5 [Form] Support DateTimeImmutable in transform()
2015-06-08 15:59:27 +02:00
Christian Schmidt
17346c53dc [Form] Support DateTimeImmutable in transform() 2015-06-08 07:38:09 +02:00
Fabien Potencier
97050dc582 minor #14901 [Form] add test to avoid regression of #14891 (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] add test to avoid regression of #14891

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

Commits
-------

12a19c8 [Form] add test to avoid regression of #14891
2015-06-07 18:46:00 +02:00
Christian Flothmann
12a19c8980 [Form] add test to avoid regression of #14891 2015-06-07 08:50:12 +02:00
Fabien Potencier
a39dafaae3 minor #14896 [Form] Fix call to removed method (BC broken in 2.3) (taueres)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fix call to removed method (BC broken in 2.3)

ResolvedFormType#getTypeExtensions() was calling method
AbstractType#getExtensions() which has been removed in
commit b3081e85a0

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

Commits
-------

fa9da42 [Form] Fix call to removed method (BC broken in 2.3)
2015-06-06 20:32:18 +02:00
Fabien Potencier
847a3e3348 bug #14891 without this change allways the legacy code get called (dominikzogg)
This PR was submitted for the 2.8 branch but it was merged into the 2.6 branch instead (closes #14891).

Discussion
----------

without this change allways the legacy code get called

[Form] [Validator] prevent that always the legacy validator logic get called

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

Commits
-------

96a30bf without this change allways the legacy code get called
2015-06-06 20:31:04 +02:00
Dominik Zogg
96a30bf31d without this change allways the legacy code get called 2015-06-06 20:31:04 +02:00
Sergio Santoro
fa9da42c22 [Form] Fix call to removed method (BC broken in 2.3)
ResolvedFormType#getTypeExtensions() was calling method
AbstractType#getExtensions() which has been removed in
commit b3081e85a0

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2015-06-06 18:24:30 +02:00
Fabien Potencier
b1003d57f3 minor #14738 [HttpFoundation] Get response content as resource several times for PHP >= 5.6 (dunglas)
This PR was squashed before being merged into the 2.3 branch (closes #14738).

Discussion
----------

[HttpFoundation] Get response content as resource several times for PHP >= 5.6

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

Since PHP 5.6, `php://input` can be opened several times.

Commits
-------

9f9b0f7 [HttpFoundation] Get response content as resource several times for PHP >= 5.6
2015-06-05 22:09:35 +02:00
Kévin Dunglas
9f9b0f73aa [HttpFoundation] Get response content as resource several times for PHP >= 5.6 2015-06-05 22:09:27 +02:00
Fabien Potencier
75d5d547bb minor #14819 [Yaml] [Validator] Removed conditional @deprecated tags and moved their descriptions to the method description as a note (gerritdrost)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14819).

Discussion
----------

[Yaml] [Validator] Removed conditional @deprecated tags and moved their descriptions to the method description as a note

[Yaml] [Validator] Removed conditional @deprecated tags and moved their descriptions to the method description as a note.

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

Commits
-------

17b4251 Issue #14815
2015-06-05 21:54:11 +02:00
Gerrit Drost
17b4251310 Issue #14815
Removed @deprecated tags and moved their descriptions to the method description as a note.
2015-06-05 21:54:03 +02:00