Commit Graph

24235 Commits

Author SHA1 Message Date
Nicolas Grekas
78a08f3a68 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
  Removed an object as route generator argument

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
2015-12-30 19:45:14 +01:00
Nicolas Grekas
3676c3b61c Fix merge 2015-12-30 19:31:26 +01:00
Nicolas Grekas
d38278fd12 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 19:23:12 +01:00
Nicolas Grekas
c457f7beb7 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix running tests on HHVM>=3.8
2015-12-30 19:22:28 +01:00
Nicolas Grekas
5ff87136d6 minor #17189 [Process] Fix running tests on HHVM>=3.8 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix running tests on HHVM>=3.8

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

open_basedir works correctly since hhvm 3.8

Commits
-------

a47208b [Process] Fix running tests on HHVM>=3.8
2015-12-30 19:21:38 +01:00
Nicolas Grekas
a47208bea9 [Process] Fix running tests on HHVM>=3.8 2015-12-30 19:16:06 +01:00
Tobias Schultze
140ed985be feature #16747 [Form] Improved performance of ChoiceType and its subtypes (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Improved performance of ChoiceType and its subtypes

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

I found out today that, although CachingFactoryDecorator is part of Symfony 2.7, it is not configured to be used in the DI configuration. This simple in-memory cache improved the page load by 50% for one considerably large form with many (~600) choice/entity fields that I was working on today.

Also, caching of query builders with parameters was broken, since the parameters are represented by objects. PHP's object hashes were used to calculate the cache keys, hence the cache always missed. I converted parameters to arrays for calculating the cache keys to fix this problem.

Commits
-------

a0ef101 [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 16:04:43 +01:00
Christophe Coevoet
a22a0707d4 bug #17179 [WebProfiler] Removed an object as route generator argument (iltar)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfiler] Removed an object as route generator argument

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

Commits
-------

43fd7bb Removed an object as route generator argument
2015-12-30 12:38:15 +01:00
Nicolas Grekas
52c4304084 Merge branch '2.8' into 3.0
* 2.8:
  [Form] fix Catchable Fatal Error if choices is not an array
  [Process] Fix a transient test
  [Process] Fix potential race condition leading to transient tests
  [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
  [DependencyInjection] fixes typo in triggered deprecation notice.
  [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.
  [Form] Fixed regression on Collection type
  add missing symfony/polyfill-php55 dependency

Conflicts:
	src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/HttpFoundation/composer.json
2015-12-30 11:41:35 +01:00
Nicolas Grekas
7fc30463e2 Merge branch '2.7' into 2.8
* 2.7:
  [Form] fix Catchable Fatal Error if choices is not an array
  [Process] Fix a transient test
  [Process] Fix potential race condition leading to transient tests
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
  [DependencyInjection] fixes typo in triggered deprecation notice.
  [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
2015-12-30 11:33:57 +01:00
Nicolas Grekas
2c2daf184c Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix potential race condition leading to transient tests
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
2015-12-30 11:27:24 +01:00
Nicolas Grekas
675baceb72 minor #17171 [travis] use github token to fetch deps from ZIP files (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] use github token to fetch deps from ZIP files

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

Is there any downside to doing so?

Commits
-------

6215437 [travis] use github token to fetch deps from ZIP files
2015-12-30 11:26:47 +01:00
Nicolas Grekas
ddf11f5b8a bug #17177 [Process] Fix potential race condition leading to transient tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix potential race condition leading to transient tests

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

Sibling of #17176 on 2.3

Commits
-------

99fc428 [Process] Fix potential race condition leading to transient tests
2015-12-30 11:25:59 +01:00
Bernhard Schussek
a0ef1018d6 [Form] Improved performance of ChoiceType and its subtypes 2015-12-30 11:11:52 +01:00
Iltar van der Berg
43fd7bba44 Removed an object as route generator argument 2015-12-30 10:32:18 +01:00
Nicolas Grekas
9305aab3e0 minor #17176 [Process] Fix a transient test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Fix a transient test

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

Commits
-------

7e2c67c [Process] Fix a transient test
2015-12-30 10:15:14 +01:00
Nicolas Grekas
b78eab561e bug #17163 [Form] fix Catchable Fatal Error if choices is not an array (Gladhon, nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fix Catchable Fatal Error if choices is not an array

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

Since 2.7.8 I got a BC-Break Error

Catchable Fatal Error: Argument 1 passed to Symfony\Component\Form\Extension\Core\Type\ChoiceType::normalizeLegacyChoices() must be of the type array, null given

normalizeLegacyChoices work only with array, so if choices not an array, just don't try to normlize.

Commits
-------

f3c2a9b [Form] fix Catchable Fatal Error if choices is not an array
2015-12-30 10:03:39 +01:00
Gladhon
f3c2a9beda [Form] fix Catchable Fatal Error if choices is not an array 2015-12-30 10:03:36 +01:00
Nicolas Grekas
7e2c67c9dc [Process] Fix a transient test 2015-12-30 09:47:47 +01:00
Nicolas Grekas
99fc428bdc [Process] Fix potential race condition leading to transient tests 2015-12-30 09:46:06 +01:00
Fabien Potencier
06eec9d39f minor #17174 [Routing] removed unused variable in PhpMatcherDumperTest class. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] removed unused variable in PhpMatcherDumperTest class.

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

Commits
-------

26d31eb [Routing] removed unused variable in PhpMatcherDumperTest class.
2015-12-29 19:41:07 +01:00
Fabien Potencier
ddc508bbd4 bug #17152 [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException (dunglas)
This PR was squashed before being merged into the 2.8 branch (closes #17152).

Discussion
----------

[DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException

| 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

Sometimes the Doctrine ORM `ClassMetadataFactory` throws a `Doctrine\Common\Persistence\Mapping\MappingException` exception, sometime a `Doctrine\ORM\Mapping\MappingException`.
This PR catch both.

Port of dunglas/php-property-info#10.

Commits
-------

ceded10 [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException
2015-12-29 19:38:50 +01:00
Kévin Dunglas
ceded10f67 [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException 2015-12-29 19:38:48 +01:00
Hugo Hamon
26d31eb9ac [Routing] removed unused variable in PhpMatcherDumperTest class. 2015-12-29 18:08:17 +01:00
Nicolas Grekas
6215437bdd [travis] use github token to fetch deps from ZIP files 2015-12-29 18:02:08 +01:00
Nicolas Grekas
75fdcb132a minor #17173 [DependencyInjection] fixes typo in triggered deprecation notice. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] fixes typo in triggered deprecation notice.

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

Commits
-------

ba7213c [DependencyInjection] fixes typo in triggered deprecation notice.
2015-12-29 17:54:12 +01:00
Hugo Hamon
ba7213c280 [DependencyInjection] fixes typo in triggered deprecation notice. 2015-12-29 17:31:38 +01:00
Nicolas Grekas
3590c01f41 bug #17119 [Form] improve deprecation message for "empty_value" and "choice_list" options. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] improve deprecation message for "empty_value" and "choice_list" options.

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

Commits
-------

7878536 [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.
2015-12-29 15:29:59 +01:00
Nicolas Grekas
d9467799c4 bug #17156 [HttpFoundation] add missing symfony/polyfill-php55 dependency (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] add missing symfony/polyfill-php55 dependency

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

The `json_last_error_msg()` function used in the `JsonResponse` class
requires PHP 5.5.

Commits
-------

3cc4e4d add missing symfony/polyfill-php55 dependency
2015-12-29 15:27:25 +01:00
Nicolas Grekas
be95db892d bug #17162 [Form] Fix regression on Collection type (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fix regression on Collection type

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

A regression was introduced in #17044.

Commits
-------

bd686cd [Form] Fixed regression on Collection type
2015-12-29 15:18:28 +01:00
Hugo Hamon
787853673b [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class. 2015-12-29 10:59:52 +01:00
Martin Hasoň
bd686cd1ee [Form] Fixed regression on Collection type 2015-12-29 10:02:59 +01:00
Christian Flothmann
3cc4e4d0d4 add missing symfony/polyfill-php55 dependency
The `json_last_error_msg()` function used in the `JsonResponse` class
requires PHP 5.5.
2015-12-28 15:56:15 +01:00
Nicolas Grekas
304097705c Merge branch '2.8' into 3.0
* 2.8:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.8.2
  updated VERSION for 2.8.1
  updated CHANGELOG for 2.8.1
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.7.md
	CHANGELOG-2.8.md
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Command/ExportCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Command/ImportCommand.php
	src/Symfony/Component/Console/Shell.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-12-28 14:14:56 +01:00
Nicolas Grekas
a7e5b4932e Merge branch '2.7' into 2.8
* 2.7:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
2015-12-28 14:12:56 +01:00
Nicolas Grekas
a63dd194ed Merge branch '2.3' into 2.7
* 2.3:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
2015-12-28 14:11:03 +01:00
Nicolas Grekas
a89fe42811 minor #17086 CS: use nowdoc instead of heredoc (gharlan)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: use nowdoc instead of heredoc

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

if this is accepted, we could add the fixer to symfony level of php-cs-fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1580

Commits
-------

3dca549 use nowdoc instead of heredoc
2015-12-28 14:03:05 +01:00
Nicolas Grekas
970d363bfe minor #17151 [travis] timeout the sigchild tests at 60s (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] timeout the sigchild tests at 60s

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

[Sometimes](https://travis-ci.org/symfony/symfony/jobs/98790028#L2774), the tests of the process component with sigchild enabled are terminated by travis after 10 minutes of no activity.
In order to free the failing job faster and to get some output, let's kill the job ourselves after 60s (running the test suite usually takes ~8s on travis)

Commits
-------

f78e794 [travis] timeout the sigchild tests at 60s
2015-12-28 12:54:50 +01:00
Nicolas Grekas
f78e794451 [travis] timeout the sigchild tests at 60s 2015-12-28 11:37:21 +01:00
Fabien Potencier
77f4b23093 minor #17146 Do not use HttpKernel Extension when not needed for 2.7 (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

Do not use HttpKernel Extension when not needed for 2.7

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

#17145 for new stuff in 2.7

Commits
-------

cc64c54 Do not use HttpKernel Extension when not needed for 2.7
2015-12-28 10:14:16 +01:00
Fabien Potencier
c4bef7233c minor #17145 Do not use HttpKernel Extension when not needed (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

Do not use HttpKernel Extension when not needed

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

HttpKernel Extension only adds `addClassesToCompile`. So the class hierarchy should be slim if it's not used.

Commits
-------

4978e19 Do not use HttpKernel Extension when not needed
2015-12-28 10:12:53 +01:00
Tobias Schultze
39c06e79b1 minor #17149 CS: Single line comments should use double slashes (//) and not hash (#) (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Single line comments should use double slashes (//) and not hash (#)

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

Just to be consistent ;)

Commits
-------

4f0f8a2 CS: Single line comments should use double slashes (//) and not hash (#).
2015-12-27 22:26:10 +01:00
Dariusz Ruminski
4f0f8a2395 CS: Single line comments should use double slashes (//) and not hash (#). 2015-12-27 17:45:57 +01:00
Tobias Schultze
cc64c54cfa Do not use HttpKernel Extension when not needed for 2.7 2015-12-26 18:53:53 +01:00
Fabien Potencier
8f2d0bb2bd bumped Symfony version to 3.0.2 2015-12-26 18:44:36 +01:00
Tobias Schultze
4978e196ca Do not use HttpKernel Extension when not needed 2015-12-26 18:41:33 +01:00
Fabien Potencier
979d732371 Merge pull request #17144 from fabpot/release-3.0.1
Release v3.0.1
2015-12-26 17:49:48 +01:00
Fabien Potencier
add06a4261 updated VERSION for 3.0.1 2015-12-26 17:46:13 +01:00
Fabien Potencier
9dda04c238 updated CHANGELOG for 3.0.1 2015-12-26 17:46:07 +01:00
Fabien Potencier
b1a7949b36 bumped Symfony version to 2.8.2 2015-12-26 17:41:26 +01:00