Commit Graph

21546 Commits

Author SHA1 Message Date
Nicolas Grekas
f3d6bbff59 Fix merge 2015-06-18 15:42:09 +02:00
Nicolas Grekas
2a1338ba19 Fix merge 2015-06-18 15:40:06 +02:00
Nicolas Grekas
2e7c2caaf2 Merge branch '2.6' into 2.7
* 2.6:
  Add test for HHVM FatalErrors
  [2.6][Debug] Fix fatal-errors handling on HHVM
  [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/Security/Http/Firewall/BasicAuthenticationListener.php
	src/Symfony/Component/Security/Http/Firewall/ContextListener.php
	src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
	src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
2015-06-18 15:03:50 +02:00
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
Nicolas Grekas
b1fabf5772 Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix log level of stacked errors
  [VarDumper] Fix uninitialized id in HtmlDumper
  Fixed fluent interface
  [Debug] fix debug class loader case test on windows
  [Debug+VarDumper] Fix handling of PHP7 exception/error model
  [2.6][Security][Translation] #14920 update translations
  [VarDumper] Cherry-pick code style fixes from 2.7
  Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property

Conflicts:
	src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
	src/Symfony/Component/VarDumper/Caster/DOMCaster.php
	src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
	src/Symfony/Component/VarDumper/Caster/PdoCaster.php
	src/Symfony/Component/VarDumper/Caster/SplCaster.php
2015-06-18 10:00:47 +02:00
Fabien Potencier
04ae391318 feature #15019 [Form] Deprecated "cascade_validation" (webmozart)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Deprecated "cascade_validation"

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #11268 (requires explicit work though)
| License       | MIT
| Doc PR        | TODO

This is #12237 rebased on 2.8.

The "cascade_validation" option was designed for a 1% use case and comparatively used way too often when the `Valid` constraint should have been used instead. Also, there seem to be bugs with that option (#5204).

The option is now deprecated. When using the 2.5 Validator API, you can set the "constraints" option of the respective child to a `Valid` constraint instead. Alternatively, set the constraint in the model (as most people hopefully do).

Commits
-------

6c554c6 [Form] Deprecated "cascade_validation"
2015-06-17 23:27:07 +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
Bernhard Schussek
6c554c6c1a [Form] Deprecated "cascade_validation" 2015-06-17 20:03:11 +02:00
Bernhard Schussek
54bd6f76f8 feature #12314 [Form] Add "prototype_data" option to collection type (kgilden)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #12314).

Discussion
----------

[Form] Add "prototype_data" option to collection type

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #5095
| License       | MIT
| Doc PR        | symfony/symfony-docs#4367

Makes it possible to have default data for collection prototypes.

Commits
-------

80b0a80 [Form] Add "prototype_data" option to collection type
2015-06-17 17:18:53 +02:00
Kristen Gilden
80b0a80852 [Form] Add "prototype_data" option to collection type 2015-06-17 17:18:53 +02:00
Fabien Potencier
bb21c7b0ab minor #14948 [Config] Add deprecation warning (dosten)
This PR was merged into the 2.7 branch.

Discussion
----------

[Config] Add deprecation warning

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

If someone extends FileLoader and do not call the parent constructor a
deprecation warning should be triggered.

Commits
-------

dbfca37 [Config] Add deprecation warning
2015-06-17 16:55:26 +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
Bernhard Schussek
09fabfeb1f feature #12067 [Form] Added the 'range' FormType (jaytaph)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #12067).

Discussion
----------

[Form] Added the 'range' FormType

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

Implemented the "range" FormType.

Commits
-------

b52e197 [Form] Added the 'range' FormType
2015-06-17 10:09:09 +02:00
Joshua Thijssen
b52e1974f7 [Form] Added the 'range' FormType 2015-06-17 10:08:53 +02:00
Fabien Potencier
450706fbb3 minor #15004 [2.7] Fix unsilenced deprecation notices (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Fix unsilenced deprecation notices

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

Commits
-------

dae98e0 [2.7] Fix unsilenced deprecation notices
2015-06-16 23:37:16 +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
Fabien Potencier
daa38cf559 minor #14975 [Console] Fix tests on Windows (mhujer)
This PR was squashed before being merged into the 2.7 branch (closes #14975).

Discussion
----------

[Console] Fix tests on Windows

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

Commits
-------

4f0f7ea [Console] Fix tests on Windows
2015-06-16 17:28:26 +02:00
Martin Hujer
4f0f7ea6ed [Console] Fix tests on Windows 2015-06-16 17:28:22 +02:00
Nicolas Grekas
dae98e0b27 [2.7] Fix unsilenced deprecation notices 2015-06-16 15:26:24 +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
Fabien Potencier
f88cfd15d9 minor #14977 added missing deprecation in CHANGELOG (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

added missing deprecation in CHANGELOG

Commits
-------

ddddeb5 added missing deprecation in CHANGELOG
2015-06-15 18:20:32 +02:00
Fabien Potencier
4b960a65c5 minor #14986 Added a small Upgrade note regarding security.context (iltar)
This PR was merged into the 2.7 branch.

Discussion
----------

Added a small Upgrade note regarding security.context

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

I've added a note in the 2.7 upgrade file on which extending implementations should be updated when using 2.7. Along with it, I've removed an unused use statement, fixed some typos and removed a redundant session check as this check is already done at the start of the method.

For #14889 I have also done a search through the docs (2.7), but I couldn't find any remaining examples encouraging the usage of the `SecurityContext(Interface)` anywhere.

Commits
-------

ade1fef Added a small Upgrade note regarding security.context
2015-06-15 18:18:03 +02:00
Nicolas Grekas
4dc727fa7d [Debug+VarDumper] Fix handling of PHP7 exception/error model 2015-06-15 17:25:25 +02:00
Fabien Potencier
4c800ae260 minor #14988 Do not trigger deprecation error in ResolveParameterPlaceHoldersPass (murnieza)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #14988).

Discussion
----------

Do not trigger deprecation error in ResolveParameterPlaceHoldersPass

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

Commits
-------

600078a Do not trigger deprecation error in ResolveParameterPlaceHoldersPass
2015-06-15 16:48:29 +02:00
Mantas Urnieža
600078a28c Do not trigger deprecation error in ResolveParameterPlaceHoldersPass 2015-06-15 16:48:29 +02:00
Fabien Potencier
15ff8652b8 feature #14993 [Profiler][Translation] added filter. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[Profiler][Translation] added filter.

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

![selection_017](https://cloud.githubusercontent.com/assets/1753742/8159914/c2c8ad68-135a-11e5-9ae3-f2e055ea3230.jpg)

Commits
-------

65f9291 [Profiler][Translation] added filter.
2015-06-15 16:44:02 +02:00
Fabien Potencier
c4f43e7e40 minor #14990 [WebProfilerBundle][logger] remove duplicated deprecation message (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle][logger] remove duplicated deprecation message

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

Commits
-------

c907f8c [WebProfilerBundle][logger] remove duplicated deprecation message
2015-06-15 16:42:01 +02:00
Abdellatif Ait boudad
65f92916a2 [Profiler][Translation] added filter. 2015-06-15 14:23:50 +00: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
Iltar van der Berg
ade1fef3ae Added a small Upgrade note regarding security.context 2015-06-15 08:46:44 +02:00
Fabien Potencier
ddddeb5a24 added missing deprecation in CHANGELOG 2015-06-14 19:35:57 +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
Abdellatif Ait boudad
c907f8cb04 [WebProfilerBundle][logger] remove duplicated deprecation message 2015-06-12 19:24:25 +00:00
Fabien Potencier
d209d1c35a bug #14950 [Form] Fixed: Filter non-integers when selecting entities by int ID (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed: Filter non-integers when selecting entities by int ID

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14583 (for Doctrine, not Propel)
| License       | MIT
| Doc PR        | -

This PR fixes #14583 for Doctrine. Non-integer values (like `""`) are not passed to the database anymore when selecting entities by integer PK, which causes an error on some DBMSs (like PostgreSQL).

Commits
-------

352be8e [Form] Fixed: Filter non-integers when selecting entities by int ID
2015-06-12 17:08:08 +02:00