Commit Graph

21636 Commits

Author SHA1 Message Date
Nicolas Grekas
22a1105f42 Fix merge 2016-06-16 10:33:40 +02:00
Nicolas Grekas
4a15e665ba minor #19067 [3.1] update tests to use the new error assertion helper (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[3.1] update tests to use the new error assertion helper

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

Commits
-------

9c7512b update tests to use the new error assertion helper
2016-06-16 10:28:45 +02:00
Nicolas Grekas
aaa40390dc Merge branch '3.0' into 3.1
* 3.0:
  Tweak merge
  update tests to use the new error assertion helper
  [ci] Upgrade to symfony/phpunit-bridge >=3.2@dev
2016-06-16 10:27:44 +02:00
Nicolas Grekas
8da9a387d7 Tweak merge 2016-06-16 10:27:19 +02:00
Nicolas Grekas
bd39ce84b6 Merge branch '2.8' into 3.0
* 2.8:
  update tests to use the new error assertion helper
  [ci] Upgrade to symfony/phpunit-bridge >=3.2@dev

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
2016-06-16 10:25:06 +02:00
Nicolas Grekas
f8937bd8b8 minor #19066 [2.8] update tests to use the new error assertion helper (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] update tests to use the new error assertion helper

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

Commits
-------

e5cf4d4 update tests to use the new error assertion helper
2016-06-16 10:19:53 +02:00
Christian Flothmann
e5cf4d424b update tests to use the new error assertion helper 2016-06-16 10:10:24 +02:00
Christian Flothmann
9c7512bf39 update tests to use the new error assertion helper 2016-06-16 07:34:55 +02:00
Nicolas Grekas
969e3b1ded Merge branch '3.0' into 3.1
* 3.0:
  [TwigBridge] Add missing type hint to TwigRenderer
  [HttpFoundation] Fix UPSERT for PgSql >= 9.5
  [Form] fixed DateTime transformers
  [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't
  [Form] fixed EntityType test with query_builder option

Conflicts:
	src/Symfony/Component/HttpFoundation/Cookie.php
2016-06-16 07:20:30 +02:00
Nicolas Grekas
d2786ad21a Merge branch '2.8' into 3.0
* 2.8:
  [HttpFoundation] Fix UPSERT for PgSql >= 9.5
  [Form] fixed DateTime transformers
  [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't
  [Form] fixed EntityType test with query_builder option

Conflicts:
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php
2016-06-16 07:18:30 +02:00
Nicolas Grekas
8060715778 Merge branch '2.7' into 2.8
* 2.7:
  [HttpFoundation] Fix UPSERT for PgSql >= 9.5
  [Form] fixed DateTime transformers
  [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't
2016-06-16 07:02:45 +02:00
Jáchym Toušek
dd481d2233 [TwigBridge] Add missing type hint to TwigRenderer 2016-06-15 23:06:35 +02:00
Nicolas Grekas
ff1f5f80d2 [HttpFoundation] Fix UPSERT for PgSql >= 9.5 2016-06-15 12:17:39 +02:00
Fabien Potencier
b3dbc5678c minor #18830 [Form] fixed EntityType test with query_builder option as null (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] fixed EntityType test with query_builder option as null

| Q             | A
| ------------- | ---
| Branch?       | 2.8+
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | symfony/symfony-docs#6599

ref https://github.com/symfony/symfony/pull/13990#issuecomment-220788142.

Commits
-------

ad8e989 [Form] fixed EntityType test with query_builder option
2016-06-15 09:41:10 +02:00
Jules Pietri
b91008fb57 [Form] fixed DateTime transformers 2016-06-15 09:21:32 +02:00
Fabien Potencier
d7e466ac23 bug #18732 [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't (nykopol)
This PR was squashed before being merged into the 2.7 branch (closes #18732).

Discussion
----------

[PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't

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

When you try do define a manyToMany association but you don't give an array or \Traversable, the raised exception say that some methods are missing while they don't. This PR check if the adder and setter methods exists and if so, give a exception that pointing on the real problem.

Commits
-------

c46519b [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't
2016-06-15 09:08:06 +02:00
Johan DESMYTER
c46519b40b [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't 2016-06-15 09:08:04 +02:00
Fabien Potencier
343c0da7fb bumped Symfony version to 3.1.2 2016-06-15 08:20:59 +02:00
Fabien Potencier
75209e27b8 updated VERSION for 3.1.1 2016-06-15 07:59:04 +02:00
Nicolas Grekas
de03922804 Merge branch '3.0' into 3.1
* 3.0: (25 commits)
  Fix merge
  [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
  [Console] fixed PHPDoc
  [travis] HHVM 3.12 LTS
  Fix feature detection for IE
  [Form] Fixed collapsed choice attributes
  [Console] added explanation of messages usage in a progress bar
  force enabling the external XML entity loaders
  [Yaml] properly count skipped comment lines
  [WebProfilerBundle] Fix invalid CSS style
  Added progressive jpeg to mime types guesser
  [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
  Fixed singular of committee
  Do not inject web debug toolbar on attachments
  bumped Symfony version to 3.0.8
  updated VERSION for 3.0.7
  updated CHANGELOG for 3.0.7
  bumped Symfony version to 2.8.8
  updated VERSION for 2.8.7
  updated CHANGELOG for 2.8.7
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/PropertyAccess/StringUtil.php
	src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
2016-06-14 13:18:07 +02:00
Nicolas Grekas
a7ed68b38f Merge branch '2.8' into 3.0
* 2.8: (22 commits)
  Fix merge
  [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
  [Console] fixed PHPDoc
  [travis] HHVM 3.12 LTS
  Fix feature detection for IE
  [Form] Fixed collapsed choice attributes
  [Console] added explanation of messages usage in a progress bar
  force enabling the external XML entity loaders
  [Yaml] properly count skipped comment lines
  [WebProfilerBundle] Fix invalid CSS style
  Added progressive jpeg to mime types guesser
  [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
  Fixed singular of committee
  Do not inject web debug toolbar on attachments
  bumped Symfony version to 2.8.8
  updated VERSION for 2.8.7
  updated CHANGELOG for 2.8.7
  bumped Symfony version to 2.7.15
  updated VERSION for 2.7.14
  update CONTRIBUTORS for 2.7.14
  ...

Conflicts:
	CHANGELOG-2.7.md
	CHANGELOG-3.0.md
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/HttpKernel/Kernel.php
2016-06-14 13:04:19 +02:00
Nicolas Grekas
625513da7b Fix merge 2016-06-14 13:01:05 +02:00
Nicolas Grekas
7fa2eab99f Merge branch '2.7' into 2.8
* 2.7:
  [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
  [Console] fixed PHPDoc
  [travis] HHVM 3.12 LTS
  Fix feature detection for IE
  [Form] Fixed collapsed choice attributes
  [Console] added explanation of messages usage in a progress bar
  force enabling the external XML entity loaders
  [Yaml] properly count skipped comment lines

Conflicts:
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
2016-06-14 12:47:22 +02:00
Fabien Potencier
347cd8712e bug #19048 [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5

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

Commits
-------

9569c74 [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
2016-06-14 11:41:37 +02:00
Nicolas Grekas
9569c7453c [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5 2016-06-14 11:40:21 +02:00
Ahmed Tailouloute
37fac3e44f [Console] fixed PHPDoc 2016-06-14 10:22:25 +02:00
Nicolas Grekas
040f53d3e6 [Cache] Fix double fetch in ProxyAdapter 2016-06-14 07:54:16 +02:00
Cédric Bertolini
b35658b1ff Fix feature detection for IE
operator `!` has higher precedence (4) than operator `in` (8). Parentheses are mandatory here.
2016-06-13 13:03:01 +02:00
Fabien Potencier
ad1ffc5e95 minor #19035 [Console] added explanation of messages usage in a progress bar (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] added explanation of messages usage in a progress bar

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

The intent of progress bar messages is currently wrongly documented. This PR updates the phpdoc to hopefully better describe the usage of such messages.

So, basically, messages are a way to add dynamic information in the progress bar; information that cannot be computed by the progress bar (like for all other placeholders).

Commits
-------

d92f3ea [Console] added explanation of messages usage in a progress bar
2016-06-13 08:28:47 +02:00
Fabien Potencier
3f192dccdc bug #18915 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] force enabling the external XML entity loaders

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

Commits
-------

12b5509 force enabling the external XML entity loaders
2016-06-13 08:25:24 +02:00
Fabien Potencier
11f303994c bug #19020 [Form] Fixed collapsed choice attributes (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed collapsed choice attributes

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

Commits
-------

445dcc8 [Form] Fixed collapsed choice attributes
2016-06-13 07:29:09 +02:00
Jules Pietri
445dcc8ae2 [Form] Fixed collapsed choice attributes 2016-06-13 01:34:04 +02:00
Fabien Potencier
d92f3ea29e [Console] added explanation of messages usage in a progress bar 2016-06-12 09:56:51 +02:00
Christian Flothmann
12b5509d8b force enabling the external XML entity loaders 2016-06-11 12:13:28 +02:00
Christian Flothmann
da7fc36a43 [Yaml] properly count skipped comment lines 2016-06-11 11:53:36 +02:00
Romain Neutron
aa35a1652c [WebProfilerBundle] Fix invalid CSS style 2016-06-09 13:02:03 +02:00
Fabien Potencier
e44cac066e Merge branch '2.7' into 2.8
* 2.7:
  Added progressive jpeg to mime types guesser
  [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
  Fixed singular of committee
  Do not inject web debug toolbar on attachments
  bumped Symfony version to 2.7.15
  updated VERSION for 2.7.14
  update CONTRIBUTORS for 2.7.14
  updated CHANGELOG for 2.7.14
  [Console] [SymfonyStyle] Replace long word wrapping test to directly test output
2016-06-08 15:14:46 +02:00
Konstantin Myakshin
2c99a0a7df Added progressive jpeg to mime types guesser 2016-06-08 15:06:30 +02:00
Fabien Potencier
1d148bd39e minor #18896 [Console] [SymfonyStyle] Replace long word wrapping test to directly test output (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] [SymfonyStyle] Replace long word wrapping test to directly test output

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/18879#discussion_r64783524
| License       | MIT
| Doc PR        | -

This [line](https://github.com/symfony/symfony/pull/18879/files#diff-d3625f2548a3b329058ca5a0f5aa57feR60) should not have been changed in order to the test to pass. I assume the test was flawed at first, so I suggest to simply test the output as we did for other ones.

Ping @chalasr

Commits
-------

b78fff4 [Console] [SymfonyStyle] Replace long word wrapping test to directly test output
2016-06-08 13:41:03 +02:00
Paráda József
d83e3463ba [Yaml] Fix wrong line number when comments are inserted in the middle of a block. 2016-06-08 13:30:01 +02:00
Fabien Potencier
c87c175ad5 bug #18909 Fixed singular of committee (peterrehm)
This PR was squashed before being merged into the 3.1 branch (closes #18909).

Discussion
----------

Fixed singular of committee

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

As in SF 3.1 the StringUtil has been moved to a new Component, I am proposing this for 3.1.
I can easily provide the same in an additional PR against the 2.3? branch.

Commits
-------

b5e1f24 Fixed singular of committee
2016-06-08 13:24:11 +02:00
Peter Rehm
b5e1f24860 Fixed singular of committee 2016-06-08 13:24:07 +02:00
Peter Rehm
5661d52ace Fixed singular of committee 2016-06-08 13:22:53 +02:00
Fabien Potencier
a81b6cec5d bug #18971 Do not inject web debug toolbar on attachments (peterrehm)
This PR was squashed before being merged into the 2.7 branch (closes #18971).

Discussion
----------

Do not inject web debug toolbar on attachments

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

Commits
-------

4a7d836 Do not inject web debug toolbar on attachments
2016-06-08 13:15:48 +02:00
Peter Rehm
4a7d83666e Do not inject web debug toolbar on attachments 2016-06-08 13:15:43 +02:00
Fabien Potencier
8c7d9d9e75 bug #18944 [Ldap] Fixed issue with legacy client initialisation (csarrazi)
This PR was merged into the 3.1 branch.

Discussion
----------

[Ldap] Fixed issue with legacy client initialisation

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/18725#issuecomment-223076867
| License       | MIT
| Doc PR        |

Thanks @uvups for noticing this.

Commits
-------

6804efe Fixed issue with legacy client initialization
2016-06-08 13:12:12 +02:00
Charles Sarrazin
6804efeeee Fixed issue with legacy client initialization 2016-06-08 12:16:33 +02:00
Fabien Potencier
20417d2658 bug #18974 Added missing APCU CacheProvider of doctrine/cache 1.6.x (Carsten Eilers)
This PR was merged into the 3.1 branch.

Discussion
----------

Added missing APCU CacheProvider of doctrine/cache 1.6.x

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | yes
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Commits
-------

a104c39 Added APCU CacheProvider of doctrine/cache 1.6.x
2016-06-08 12:06:15 +02:00
Kévin Dunglas
f6229c7a74
[FrameworkBundle] Remove unused variable 2016-06-07 16:56:06 +02:00
Fabien Potencier
ceee6038d7 bumped Symfony version to 3.0.8 2016-06-06 19:17:28 +02:00
Fabien Potencier
fa7e94050e updated VERSION for 3.0.7 2016-06-06 18:52:35 +02:00
Fabien Potencier
b98b214238 bumped Symfony version to 2.8.8 2016-06-06 18:48:23 +02:00
Fabien Potencier
a888909cfc updated VERSION for 2.8.7 2016-06-06 18:05:21 +02:00
Fabien Potencier
b849a8637a bumped Symfony version to 2.7.15 2016-06-06 17:55:40 +02:00
Fabien Potencier
c5a7f9fe26 updated VERSION for 2.7.14 2016-06-06 17:23:26 +02:00
Fabien Potencier
1e673019cf Merge branch '3.0' into 3.1
* 3.0:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
2016-06-06 17:08:54 +02:00
Fabien Potencier
75a3a79d30 Merge branch '2.8' into 3.0
* 2.8:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
2016-06-06 17:08:35 +02:00
Fabien Potencier
d29218f1e7 Merge branch '2.7' into 2.8
* 2.7:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
2016-06-06 17:06:25 +02:00
Jakub Zalas
5579d86454 [BrowserKit] Bump dom-crawler minimum version requirement
The BrowserKit Client will not work with DomCrawler 2.0 if the CssSelector component is not installed.
2016-06-06 16:48:46 +02:00
Alexander Obuhovich
73b812e3a8 Make one call to "OutputInterface::write" method per table row 2016-06-06 16:41:06 +02:00
Nicolas Grekas
2e938491d6 minor #18979 [HttpKernel] Fix context dependent test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Fix context dependent test

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

Class `Foo` exists when the ClassLoader component is tested alongside with HttpKernel

Commits
-------

065dee8 [HttpKernel] Fix context dependent test
2016-06-06 14:26:28 +02:00
Nicolas Grekas
065dee8525 [HttpKernel] Fix context dependent test 2016-06-06 14:20:11 +02:00
Nicolas Grekas
9fc48b8bb2 [Debug] Fix context dependent test 2016-06-06 13:49:15 +02:00
Nicolas Grekas
a249f5d582 Merge branch '3.0' into 3.1
* 3.0:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-06-06 13:42:41 +02:00
Nicolas Grekas
0ed0e64d43 Merge branch '2.8' into 3.0
* 2.8:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	CHANGELOG-2.3.md
	src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
	src/Symfony/Component/Config/Loader/FileLoader.php
	src/Symfony/Component/DependencyInjection/Container.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Expression/Expression.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
2016-06-06 13:33:26 +02:00
Nicolas Grekas
c4716d2511 Merge branch '2.7' into 2.8
* 2.7:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
	src/Symfony/Component/Security/Acl/Model/AclInterface.php
	src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
	src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-06-06 13:11:27 +02:00
Nicolas Grekas
bf3a2c0abd @throws annotations should go after @return 2016-06-06 13:03:51 +02:00
Nicolas Grekas
cb850fef26 Fix merge 2016-06-06 11:00:08 +02:00
Fabien Potencier
011d2dcd26 Merge branch '2.3' into 2.7
* 2.3:
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp
2016-06-06 10:55:42 +02:00
Carsten Eilers
a104c399dc Added APCU CacheProvider of doctrine/cache 1.6.x 2016-06-06 09:36:22 +02:00
Nicolas Grekas
98303d34a1 Merge branch '3.0' into 3.1
* 3.0:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
  document method name changes in Voter class

Conflicts:
	.travis.yml
2016-06-03 13:12:53 +02:00
Nicolas Grekas
ef078ca41c Merge branch '2.8' into 3.0
* 2.8:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
  document method name changes in Voter class

Conflicts:
	.travis.yml
	UPGRADE-3.0.md
	src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
2016-06-03 13:11:05 +02:00
Nicolas Grekas
5a560f1d12 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
2016-06-03 13:06:57 +02:00
Nicolas Grekas
e1b7bd2d67 minor #18945 [Security] LdapUserProvider: add missing argument type doc (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[Security] LdapUserProvider: add missing argument type doc

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

Commits
-------

bff9c36 LdapUserProvider: add missing argument type doc
2016-06-03 13:02:38 +02:00
Nicolas Grekas
a004fc7526 minor #18932 Improve memory efficiency (Dword123)
This PR was merged into the 2.7 branch.

Discussion
----------

Improve memory efficiency

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

This avoids concatenating `$message` and `PHP_EOL` (if necessary) as a new value, greatly improving memory efficiency for large `$message`s.

Commits
-------

c1df9f2 Improve memory efficiency
2016-06-03 13:01:18 +02:00
Fabien Potencier
22aa620e80 bug #18954 [3.1][HttpKernel] Fix RequestDataCollector starting the session (romainneutron)
This PR was merged into the 3.1 branch.

Discussion
----------

[3.1][HttpKernel] Fix RequestDataCollector starting the session

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

The RequestDataCollector starts a non-started session on kernel response. This produces bug #18951
I'm not sure if this is the right fix, let's discuss it.

Commits
-------

ab62dcf [HttpKernel] Fix RequestDataCollector starting the session
2016-06-03 10:45:02 +02:00
Romain Neutron
ab62dcf3f4 [HttpKernel] Fix RequestDataCollector starting the session 2016-06-03 10:33:12 +02:00
Nicolas Grekas
c4149a40fb minor #18947 Run an uptodate version of HHVM on Travis (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Run an uptodate version of HHVM on Travis

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

Using the Trusty infrastructure allows running an uptodate version of HHVM rather than running the latest version supporting Precise, which is very old.
It relies on an undocumented feature of the Travis config file, namely the fact that ``matrix.include`` actually allows to overwrite everything from the config file (it is merged with the main config), even though the Travis linter complains about it. I think it is fine to use this and to replace it with an official approach once there is one.

Refs #18922

Commits
-------

e6956c9 Skip some tests on HHVM due to a PHPunit bug
e041da0 Use the Trusty Travis infrastructure for HHVM builds
2016-06-03 10:03:59 +02:00
Nicolas Grekas
574f4e4147 [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows 2016-06-03 09:48:37 +02:00
Fabien Potencier
eced97bf51 minor #18939 [FrameworkBundle] Skip redis cache pools test on failed connection (chalasr)
This PR was squashed before being merged into the 3.1 branch (closes #18939).

Discussion
----------

[FrameworkBundle] Skip redis cache pools test on failed connection

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

Actually, running the FrameworkBundle tests suit leads to a failure that says:

> 1) Symfony\Bundle\FrameworkBundle\Tests\Functional\CachePoolsTest::testRedisCachePools
Symfony\Component\Cache\Exception\InvalidArgumentException: Redis connection failed: redis://localhost
[...]
[...]/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php:59
[...]/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php:30

So I propose to catch this specific exception in case of redis is not (locally) supported, in order to be sure that tests stay green.

Commits
-------

0d349dd [FrameworkBundle] Skip redis cache pools test on failed connection
2016-06-03 07:29:17 +02:00
Robin Chalas
0d349dd496 [FrameworkBundle] Skip redis cache pools test on failed connection 2016-06-03 07:29:16 +02:00
Fabien Potencier
60b83dc2fe bug #18949 [3.1][Security] Fix DebugAccessDecisionManager when object is not a scalar (romainneutron)
This PR was merged into the 3.1 branch.

Discussion
----------

[3.1][Security] Fix DebugAccessDecisionManager when object is not a scalar

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

Commits
-------

ff2d189 [Security] Fix DebugAccessDecisionManager when object is not a scalar
2016-06-03 07:23:02 +02:00
Jules Pietri
078c8b6b8a Fixed forwarded request data in templates 2016-06-03 02:46:43 +02:00
Romain Neutron
ff2d189f34 [Security] Fix DebugAccessDecisionManager when object is not a scalar 2016-06-02 16:45:44 +02:00
Christophe Coevoet
e6956c9bfc Skip some tests on HHVM due to a PHPunit bug 2016-06-02 11:40:24 +02:00
Christian Flothmann
bff9c3631d LdapUserProvider: add missing argument type doc 2016-06-01 23:24:55 +02:00
Charles Sarrazin
58996ac0bf Fixed issue with missing argument in the abstract service definition for the ldap user provider 2016-06-01 21:35:13 +02:00
GeLo
c483a0f928 [Form] Consider a violation even if the form is not submitted 2016-06-01 18:00:24 +02:00
Dword123
c1df9f210e Improve memory efficiency
This avoids concatenating `$message` and `PHP_EOL` (if necessary) as a new value, greatly improving memory efficiency for large `$message`s.
2016-06-01 13:20:21 +02:00
Kévin Dunglas
7a5a139135 [Console] Fix BC break introduced by #18101 2016-06-01 08:04:28 +02:00
Christophe Coevoet
691f19ff34 minor #18914 [#18838] add a test to avoid regressions (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[#18838] add a test to avoid regressions

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

Commits
-------

240cf0a [#18838] add a test to avoid regressions
2016-05-30 10:42:44 +02:00
Fabien Potencier
7143b2974c updated VERSION for 2.3.42 2016-05-30 10:41:10 +02:00
Nicolas Grekas
91635a8054 Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
This reverts commit 44f6f89308, reversing
changes made to 57d6053822.
2016-05-30 10:31:06 +02:00
Nicolas Grekas
44f6f89308 bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] force enabling the external XML entity loaders

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

Commits
-------

142b1a4 force enabling the external XML entity loaders
2016-05-30 10:25:13 +02:00
Christian Flothmann
240cf0aaa8 [#18838] add a test to avoid regressions 2016-05-30 10:23:04 +02:00
Nicolas Grekas
57d6053822 bug #18893 [DependencyInjection] Skip deep reference check for 'service_container' (RobertMe)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Skip deep reference check for 'service_container'

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

The "hasReference" check when dumping the container fails in the case where a service has a method call which includes a reference to a private/inlined service when either that service, or a dependency of it, references the service_container. This because service_container isn't defined while it still tries to check the references of it. So the service_container must be skipped in this case, this shouldn't break anything as the service_container doesn't reference any services, and thus can't reference the service which it is checking for.

Commits
-------

6f36733 [DependencyInjection] Skip deep reference check for 'service_container'
2016-05-30 10:21:17 +02:00
Nicolas Grekas
b3cd2679b8 Partial revert of previous PR 2016-05-30 10:16:24 +02:00
Robert Meijers
6f3673364e [DependencyInjection] Skip deep reference check for 'service_container'
Deep checks on whether a service references another service need to
exclude the 'service_container' service as it doesn't exist. Without this
dumping the container will fail if a service definition references an
inlined service which has a direct or indirect dependency to the
service_container.
2016-05-30 10:16:14 +02:00
Nicolas Grekas
a60c3551b0 bug #18812 Catch \Throwable (fprochazka)
This PR was squashed before being merged into the 2.3 branch (closes #18812).

Discussion
----------

Catch \Throwable

| Q             | A
| ------------- | ---
| Branch?       | 2.3, 2.7, 2.8, 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Related symfony/symfony#18765, symfony/symfony#15949

Commits
-------

893cf00 Catch \Throwable
2016-05-30 10:14:44 +02:00
Filip Procházka
893cf00a52 Catch \Throwable 2016-05-30 10:14:41 +02:00
Nicolas Grekas
0cf017e568 bug #18821 [2.3][Form] Removed UTC specification with timestamp (francisbesset)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Form] Removed UTC specification with timestamp

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

The function `date_parse()` indicates a warning if a timezone is used with the timestamp: `Double timezone specification`. I removed the UTC specification and this time it's more faster!

Commits
-------

0d14aac Removed UTC specification with timestamp
2016-05-30 10:13:41 +02:00
Nicolas Grekas
c58513457c minor #18854 [Serializer] Add missing @throws annotations (theofidry)
This PR was squashed before being merged into the 2.3 branch (closes #18854).

Discussion
----------

[Serializer] Add missing @throws annotations

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

Commits
-------

b73400d [Serializer] Add missing @throws annotations
2016-05-30 10:12:16 +02:00
Théo FIDRY
b73400d707 [Serializer] Add missing @throws annotations 2016-05-30 10:12:14 +02:00
Nicolas Grekas
d645bd5073 bug #18861 Fix for #18843 (inso)
This PR was squashed before being merged into the 2.3 branch (closes #18861).

Discussion
----------

Fix for #18843

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

Commits
-------

7d78196 Fix for #18843
2016-05-30 10:10:22 +02:00
Anton Bakai
7d78196d0c Fix for #18843 2016-05-30 10:10:17 +02:00
Fabien Potencier
76e30a9881 bumped Symfony version to 3.1.1 2016-05-30 09:57:32 +02:00
Fabien Potencier
e62f832521 updated VERSION for 3.1.0 2016-05-30 09:24:26 +02:00
Fabien Potencier
73ca90db53 Merge branch '3.0' into 3.1
* 3.0:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:58:39 +02:00
Fabien Potencier
7b7c9b86a1 Merge branch '2.8' into 3.0
* 2.8:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:58:27 +02:00
Fabien Potencier
e617502ba2 Merge branch '2.7' into 2.8
* 2.7:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:57:11 +02:00
Fabien Potencier
00763f6e41 Merge branch '2.3' into 2.7
* 2.3:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:56:59 +02:00
Maxime Steinhausser
b78fff417b [Console] [SymfonyStyle] Replace long word wrapping test to directly test output 2016-05-29 22:16:56 +02:00
Robin Chalas
1c94fea42f [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
CS Fixes

Add tests

Add docblock

Fix side effect on FrameworkBundle tests

Remove useless '\n' from TextDescriptor since comments are block
2016-05-29 20:12:27 +02:00
Fabien Potencier
ab621ee574 bug #18907 [Routing] Fix the annotation loader taking a class constant as a beginning of a class name (jakzal, nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Fix the annotation loader taking a class constant as a beginning of a class name

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

Code copy/pasted from ClassMapGenerator.php

Commits
-------

8d4f35d [Routing] Finish annotation loader taking a class constant as a beginning of a class name
43c7f9b [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-29 18:07:21 +02:00
Christian Flothmann
142b1a4b46 force enabling the external XML entity loaders 2016-05-29 13:17:50 +02:00
Nicolas Grekas
8d4f35d12c [Routing] Finish annotation loader taking a class constant as a beginning of a class name 2016-05-29 12:13:06 +02:00
Nicolas Grekas
8c65c0e6ec Merge branch '3.0' into 3.1
* 3.0:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:50:31 +02:00
Nicolas Grekas
0929c7b91c Merge branch '2.8' into 3.0
* 2.8:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:50:11 +02:00
Nicolas Grekas
56b5f4196b Merge branch '2.7' into 2.8
* 2.7:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:49:47 +02:00
Nicolas Grekas
a350459d70 Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Fix for PHP 7.0.7

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-05-29 11:49:32 +02:00
Nicolas Grekas
a125af74f8 [PropertyAccess] Fix for PHP 7.0.7 2016-05-29 11:41:46 +02:00
Christian Flothmann
0ea2228228 [Yaml] search for colons in strings only
Since the parser is able to return `\DateTime` instances when the
`Yaml::PARSE_DATETIME` flag is passed, we need to ensure that the parsed
value actually is a string before passing the parsed value to string
functions.
2016-05-26 23:46:24 +02:00
Fabien Potencier
91a4de32c3 bumped Symfony version to 3.1.0 2016-05-26 15:07:51 +02:00
Fabien Potencier
ebcbca0ba2 updated VERSION for 3.1.0-RC1 2016-05-26 10:31:07 +02:00
Fabien Potencier
af79ff69bc Merge branch '3.0' into 3.1
* 3.0:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:36 +02:00
Fabien Potencier
ee4b4aeedc Merge branch '2.8' into 3.0
* 2.8:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:30 +02:00
Fabien Potencier
fc32e6a794 Merge branch '2.7' into 2.8
* 2.7:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:20 +02:00
Fabien Potencier
a842b97087 fixed PHP 5.3 compat in tests 2016-05-26 10:21:12 +02:00
Fabien Potencier
defe88fee1 Merge branch '3.0' into 3.1
* 3.0:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:35 +02:00
Fabien Potencier
afece71f7c Merge branch '2.8' into 3.0
* 2.8:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:28 +02:00
Fabien Potencier
1567ce6d9e Merge branch '2.7' int pusto 2.8
* 2.7:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:20 +02:00
Fabien Potencier
557bc51c5b Merge branch '2.3' into 2.7
* 2.3:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:14 +02:00
Fabien Potencier
c59a3da606 fixed PHP 5.3 compat in tests 2016-05-26 10:04:58 +02:00
Fabien Potencier
c968257472 Merge branch '3.0' into 3.1
* 3.0:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:52 +02:00
Fabien Potencier
26f2c8718e Merge branch '2.8' into 3.0
* 2.8:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:45 +02:00
Fabien Potencier
e89e1656b9 Merge branch '2.7' into 2.8
* 2.7:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:38 +02:00
Fabien Potencier
13394f81f7 Merge branch '2.3' into 2.7
* 2.3:
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
2016-05-26 09:56:29 +02:00
Fabien Potencier
6f7ed8c316 minor #18878 [Serializer][#18837] adding a test (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[Serializer][#18837] adding a test

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

Commits
-------

37cacc4 [Serializer][#18837] adding a test
2016-05-26 09:55:01 +02:00
Robin Chalas
963fe1d635 [Console] SymfonyStyle: Align multi-line/very-long-line blocks
Remove SymfonyStyle::comment() changes (out of scope)

CS Fixes

Add tests
2016-05-26 09:53:24 +02:00
Peter Rehm
7cb76558ce [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut 2016-05-26 09:43:25 +02:00
Linnaea Von Lavia
91a2f5dea1 Fix js comment in profiler 2016-05-26 10:56:28 +08:00
Charles Sarrazin
dbf45e4a76 [Ldap] Fixed issue with Entry password attribute containing array of values and made password attribute configurable 2016-05-26 04:36:36 +02:00
Christian Flothmann
37cacc4874 [Serializer][#18837] adding a test 2016-05-25 22:21:27 +02:00
Nicolas Grekas
9461750bd0 [Cache] Drop counting hit/miss in ProxyAdapter 2016-05-25 09:47:04 +02:00
Francis Besset
0d14aac880 Removed UTC specification with timestamp 2016-05-24 22:23:23 +02:00
Kévin Dunglas
29b4115d1a [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called 2016-05-24 12:12:38 +02:00
Kévin Dunglas
58ac241c1d [Serializer] ObjectNormalizer: add missing parameters 2016-05-24 12:10:22 +02:00
Fabien Potencier
330c09b390 Merge branch '3.0' into 3.1
* 3.0:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  [Serializer] Add test for ignored attributes during denormalization
  chomp newlines only at the end of YAML documents
  Fixed server status command when port has been omitted
  Update UPGRADE FROM 2.x to 3.0
  fix removed commands wording in upgrade file
  Catch \Throwable
  Catch \Throwable
  [DependencyInjection] Avoid generating call_user_func in more cases
  [Validator] Support for DateTimeImmutable
  [FrameworkBundle] update upgrade instructions
  Use levenshtein level for better Bundle matching
  [WebProfilerBundle] Fix CORS ajax security issues
  remove methods that were needed for PHP 5.3
  [DX][DI] Make Autowiring exceptions more future friendly
2016-05-24 12:06:56 +02:00
Fabien Potencier
90dcd92691 Merge branch '2.8' into 3.0
* 2.8:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  [Serializer] Add test for ignored attributes during denormalization
  chomp newlines only at the end of YAML documents
  Fixed server status command when port has been omitted
  Update UPGRADE FROM 2.x to 3.0
  fix removed commands wording in upgrade file
  Catch \Throwable
  Catch \Throwable
  Use levenshtein level for better Bundle matching
  [WebProfilerBundle] Fix CORS ajax security issues
  [DX][DI] Make Autowiring exceptions more future friendly
2016-05-24 12:03:10 +02:00
Fabien Potencier
5cb0ad3f81 Merge branch '2.7' into 2.8
* 2.7:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  [Serializer] Add test for ignored attributes during denormalization
  chomp newlines only at the end of YAML documents
  Fixed server status command when port has been omitted
  Update UPGRADE FROM 2.x to 3.0
  Catch \Throwable
  Use levenshtein level for better Bundle matching
  [WebProfilerBundle] Fix CORS ajax security issues
2016-05-24 12:00:02 +02:00
Fabien Potencier
eac5868d20 Merge branch '2.3' into 2.7
* 2.3:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  chomp newlines only at the end of YAML documents
2016-05-24 11:57:18 +02:00
Christian Flothmann
9bdaba4801 [Yaml] fix exception contexts 2016-05-23 12:02:40 +02:00
Martin Morávek (moravek.martin)
55d9a7a732 Added people - person inflection 2016-05-23 11:06:27 +02:00
Fabien Potencier
7830fa7dbd bug #18840 [Yaml] properly handle unindented collections (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] properly handle unindented collections

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

Commits
-------

717e1a9 [Yaml] properly handle unindented collections
2016-05-23 11:02:43 +02:00
Fabien Potencier
eff863b434 bug #18765 Catch \Throwable (fprochazka)
This PR was merged into the 2.8 branch.

Discussion
----------

Catch \Throwable

| Q             | A
| ------------- | ---
| Branch?       | 2.8, 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Mostly!
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

The first commit is based on symfony/symfony#15949
Depends on symfony/symfony#18813, symfony/symfony#18812

----

I'm new to symfony, so I'm not sure where are all the places where it makes sense to actually catch the throwable and where not. I added most places that seemed logical and when I wasn't sure, I added it anyway. I'm hoping you guys (and girls?) can point out the places where the catch should not be added, I'll fix it and then I can create several PR's for the older branches. A lot of this IMHO should go also to 3.0.

Commits
-------

de671f4 Catch \Throwable
2016-05-23 11:00:59 +02:00
Fabien Potencier
f55680b3ab bug #18813 Catch \Throwable (fprochazka)
This PR was merged into the 2.7 branch.

Discussion
----------

Catch \Throwable

| Q             | A
| ------------- | ---
| Branch?       | 2.7, 2.8, 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Related symfony/symfony#18765, symfony/symfony#15949
Depends on symfony/symfony#18812

Commits
-------

103526b Catch \Throwable
2016-05-23 10:58:41 +02:00
Martin Morávek (moravek.martin)
02070f9fd3 People - person singularization 2016-05-23 10:52:53 +02:00
Christian Flothmann
717e1a9e47 [Yaml] properly handle unindented collections 2016-05-22 18:07:51 +02:00
Kévin Dunglas
c2f7fedfd6 [Serializer] Add test for ignored attributes during denormalization 2016-05-22 13:47:44 +02:00
Jules Pietri
ad8e98955f [Form] fixed EntityType test with query_builder option 2016-05-21 20:24:27 +02:00
Christian Flothmann
a4b1fa6694 chomp newlines only at the end of YAML documents 2016-05-21 09:04:04 +02:00
Peter Rehm
94e4706609 Fixed server status command when port has been omitted 2016-05-20 17:00:42 +02:00
Nicolas Grekas
c73f34d2bc [Config] Allow schemed path in FileResource 2016-05-20 13:48:17 +02:00
Filip Procházka
de671f4cb2 Catch \Throwable 2016-05-19 16:01:30 +02:00
Filip Procházka
103526b40f Catch \Throwable 2016-05-19 15:58:47 +02:00
Rouven Weßling
2718a6c764 [DependencyInjection] Avoid generating call_user_func in more cases 2016-05-19 10:07:44 +02:00
Nicolas Grekas
5c3962e1b0 bug #18759 [Validator] Support for DateTimeImmutable (krzysiekpiasecki)
This PR was squashed before being merged into the 3.0 branch (closes #18759).

Discussion
----------

[Validator] Support for DateTimeImmutable

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

When validating with DateTime constraint UnexpectedTypeException is thrown for DateTimeImmutable instances.

Why PR?
- DateTimeImmutable behaves like a DateTime. Both implements the same interface DateTimeInterface.
- DateTimeInterface cannot be implemented by the client.

Commits
-------

f49659f [Validator] Support for DateTimeImmutable
2016-05-19 09:37:29 +02:00
Krzysiek Piasecki
f49659f137 [Validator] Support for DateTimeImmutable 2016-05-19 09:37:05 +02:00
Fabien Potencier
2731787e8b bug #18799 Use levenshtein level for better Bundle matching (j0k3r)
This PR was merged into the 2.7 branch.

Discussion
----------

Use levenshtein level for better Bundle matching

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

_I've targetted 2.7 branch since this was introduced in the 2.6 version but the 2.6 isn't maintain anymore._

**TL;DR:** I found unused code in bad bundle exception when Symfony try to find the best bundle to fix the typo. Should we remove that code (and got a potential lower matching bundle name) or keep it and make it work?

-----

I've noticed that a part of the code wasn't used when determining which bundle typo was written on _bad bundle exception_, from https://github.com/symfony/symfony/pull/11210.

```php
$alternative = null;
$shortest = null;
foreach ($bundleNames as $bundleName) {
    // if there's a partial match, return it immediately
    if (false !== strpos($bundleName, $nonExistentBundleName)) {
        return $bundleName;
    }

    $lev = levenshtein($nonExistentBundleName, $bundleName);
    if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
        $alternative = $bundleName;
    }
}
```

In this snippet, the `$shortest` wasn't update in the `foreach`. Reading the code, I guess it was supposed to add an even better accuracy when multiple bundle matche the typo'd bundle name.

Which mean when an alternative is found, we have to assign the level `$lev` from that match to `$shortest`.

```php
if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
    $alternative = $bundleName;
    $shortest = $lev;
}
```

Let say you have these bundles: `FoooooBundle` and `FooBundle` and you request the bundle `FoodBundle`.

- Without `$shortest` updated, you'll got a suggestion with `FoooooBundle` (first matching bundle found)
- With `$shortest` upadted, you'll got a suggestion with `FooBundle` (because it has a better level than `FoooooBundle`)

This isn't a _bug fix_ since this is only supposed to help developper but not the final user.

**Question is**: should we keep that level comparison or just remove it?

Commits
-------

ac7f74e Use levenshtein level for better Bundle matching
2016-05-17 20:42:59 +02:00
Nicolas Grekas
0c8358b3fe [Cache] Rename nonce to version 2016-05-17 19:16:01 +02:00
Jeremy Benoist
ac7f74ecca Use levenshtein level for better Bundle matching 2016-05-17 15:13:00 +02:00
Romain Neutron
f8dd87d7cc [WebProfilerBundle] Fix CORS ajax security issues 2016-05-16 18:19:08 +02:00
Christian Flothmann
7d9e74e340 remove methods that were needed for PHP 5.3 2016-05-14 13:18:56 +02:00
Mathieu Lemoine
834f550263 [DX][DI] Make Autowiring exceptions more future friendly 2016-05-13 15:42:47 -04:00
Fabien Potencier
7a4019bbcf bumped Symfony version to 3.1.0 2016-05-13 14:21:08 -05:00
Fabien Potencier
14d4d5837a updated VERSION for 3.1.0-BETA1 2016-05-13 13:33:36 -05:00
Fabien Potencier
918eb27afb feature #18725 [Ldap] Added the possibility to configure all available Ldap options for connection (csarrazi)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Ldap] Added the possibility to configure all available Ldap options for connection

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

This PR lets a user configure [all documented Ldap options](http://php.net/manual/fr/function.ldap-get-option.php), as well as a few undocumented ones (back-ported from the [OpenLdap C library](http://linux.die.net/man/3/ldap_set_option), as well as the [Ldap client specification](https://www.ietf.org/proceedings/50/I-D/ldapext-ldap-c-api-05.txt)).

Commits
-------

a8bae31 Added the possibility to configure all Ldap options for connection
2016-05-13 13:08:51 -05:00
Fabien Potencier
a1b2d8cf8e Merge branch '3.0'
* 3.0:
  Fix computation of PR diffs for component matrix lines
  [console][table] adjust width of colspanned cell.
  [BUG] Delete class 'control-group' in bootstrap 3
  [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  added missing constant in Response
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  added StaticVerionStrategyTest
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
  Fixed DateTimeInterface comparaison
  [console][table] adjust width of colspanned cell.
2016-05-13 13:06:41 -05:00
Fabien Potencier
797e83fd2e Merge branch '2.8' into 3.0
* 2.8:
  Fix computation of PR diffs for component matrix lines
  [console][table] adjust width of colspanned cell.
  [BUG] Delete class 'control-group' in bootstrap 3
  [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  added missing constant in Response
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  added StaticVerionStrategyTest
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
  [console][table] adjust width of colspanned cell.
2016-05-13 13:03:36 -05:00
Fabien Potencier
bcdf568a19 Merge branch '2.7' into 2.8
* 2.7:
  Fix computation of PR diffs for component matrix lines
  [BUG] Delete class 'control-group' in bootstrap 3
  [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
2016-05-13 13:03:14 -05:00
Fabien Potencier
219b050d30 bug #18766 Make failed autowiring error messages more explicit (lemoinem)
This PR was merged into the 3.1-dev branch.

Discussion
----------

Make failed autowiring error messages more explicit

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no (better DX integration)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18658
| License       | MIT
| Doc PR        | N/A

@nicolas-grekas This is a port from #18691 (which was for **2.8**).
It looks like the original PR has been already mostly implemented in **master** by @weaverryan (in #17877).

IMO, this PR is still improving two use cases:

  * In case a class cannot be autowired because no service can be found AND a service cannot be registered automatically, the error message now mentions both conditions (instead of simply saying no service has been found)
  * In case a class with no service attached to it can be automatically instantiated but cannot be autowired because of further problems, an exception mentioning this is now thrown instead of the lower level exception, making the situation easier to debug. (The lower level exception is still available through `getPrevious()`)

Hence, I still think this PR provides useful additional DX features and is worth to be merged.

Commits
-------

6894e03 Make failed autowiring error messages more explicit
2016-05-13 12:58:08 -05:00
Fabien Potencier
208e6b0f9e bug #18774 [console][table] adjust width of colspanned cell. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[console][table] adjust width of colspanned cell.

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

Commits
-------

081ad73 [console][table] adjust width of colspanned cell.
2016-05-13 12:56:25 -05:00
Fabien Potencier
b5b141cf9a feature #18715 [FrameworkBundle] Default to Apcu+Filesystem cache chain (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[FrameworkBundle] Default to Apcu+Filesystem cache chain

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

In #16838, @dunglas benched that the filesystem cache is not the fastest one (not a surprise).
Yet, it is the default for now. I propose to replace this default by a dynamically created one that uses APCu when available (of course, we cannot do the check at container-build time), chained with the filesystem.

The benefit is double: APCu is automatically used when available without any configuration, and cache warming up is seeded by the filesystem cache so that the apcu cache can benefit from it.

Commits
-------

b9b57f9 [FrameworkBundle] Default to Apcu+Filesystem cache chain
2016-05-13 12:53:26 -05:00
Nicolas Grekas
b9b57f93cb [FrameworkBundle] Default to Apcu+Filesystem cache chain 2016-05-13 12:36:10 -05:00
Charles Sarrazin
a8bae3175f Added the possibility to configure all Ldap options for connection 2016-05-13 18:20:58 +02:00
Abdellatif Ait boudad
081ad731b6 [console][table] adjust width of colspanned cell. 2016-05-13 16:56:27 +01:00
Fabien Potencier
0469c4a380 feature #18184 [DomCrawler] Expose getter for uri (hason)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[DomCrawler] Expose getter for uri

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

Same as #18143

Commits
-------

baebdb4 [DomCrawler] Exposed getter for uri
2016-05-13 10:49:09 -05:00
Philippe Degeeter
99f61d6df3 [BUG] Delete class 'control-group' in bootstrap 3 2016-05-13 10:45:43 -05:00
Issei.M
ae38660fde [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper 2016-05-13 10:41:04 -05:00
Fabien Potencier
1253b1d344 Merge branch '2.7' into 2.8
* 2.7:
  added missing constant in Response
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  added StaticVerionStrategyTest
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
  [console][table] adjust width of colspanned cell.
2016-05-13 10:38:45 -05:00
Fabien Potencier
4a065b44dd added missing constant in Response 2016-05-13 10:31:27 -05:00
Fabien Potencier
58f8f5174f Merge branch '2.3' into 2.7
* 2.3:
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
2016-05-13 10:28:37 -05:00
dasmfm
fa99fbd7cf Update HTTP statuses list 2016-05-13 10:22:39 -05:00
Robin Chalas
31285c22fa [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
Use Command::setHelperSet rather than Command#setHelperSet in exception msg

Simplify exception message

Add DidYouForget to exception msg
2016-05-13 10:18:46 -05:00
Fabien Potencier
f0b592bf8d feature #18654 [Bridge/Doctrine] Use better exception in the register mapping pass (dantleech)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Bridge/Doctrine] Use better exception in the register mapping pass

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

Current when this mapping pass cannot find (any of) the configured managers the user receives the following exception:

```
[Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException]
You have requested a non-existent parameter "Could not determine the Doctrine manager. Either Doctrine is not configured or a bundle is misconfigured.".
```

Which is misleading and strange.

This PR changes the exception to an `InvalidArgumentException` and provides the following message:

```
[InvalidArgumentException]
Could not find the object manager name parameter. Tried: "cmf_routing.dynamic.persistence.orm.manager_name", "doctrine.default_entity_manager"
```

Commits
-------

0eeedee Use better exception in the register mapping pass
2016-05-13 10:14:47 -05:00
Fabien Potencier
d02e5eb6a1 feature #18676 [HttpKernel] Add request method to logger messages (gnat42)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[HttpKernel] Add request method to logger messages

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

While debugging some functional tests I was looking at the test.log. It would have been quite useful to know if the request was a POST or GET. This adds the request method to the log details.

Commits
-------

d751d59 Add request method to logger messages
2016-05-13 10:12:29 -05:00
Fabien Potencier
8648fe2ed3 bug #18686 [console][table] adjust width of colspanned cell. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[console][table] adjust width of colspanned cell.

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

Commits
-------

9b35449 [console][table] adjust width of colspanned cell.
2016-05-13 10:09:02 -05:00
danionut90
80300f52d4 added StaticVerionStrategyTest 2016-05-13 10:01:47 -05:00
Daniel Espendiller
94b9e44993 Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns 2016-05-13 09:58:35 -05:00
Fabien Potencier
6aa00aa27e minor #18751 [3.0] Fixed DateTimeInterface comparison (francisbesset)
This PR was merged into the 3.0 branch.

Discussion
----------

[3.0] Fixed DateTimeInterface comparison

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

DateTime class implements the DateTimeInterface.
It is useless to compare is a value is an instance of DateTime or DateTimeInterface.

Commits
-------

9a0bc99 Fixed DateTimeInterface comparaison
2016-05-13 09:48:28 -05:00