Commit Graph

24433 Commits

Author SHA1 Message Date
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
Martin Hasoň
c92fcdb273 Added placeholders to all log messages instead of hardcoded values 2015-12-29 13:13:49 +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
Hugo Hamon
bb5f118555 [DependencyInjection] make YamlFileLoader raise a deprecation notice if a service definition contains unsupported keywords. 2015-12-29 10:37:15 +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
586c58a354 Merge branch '3.0'
* 3.0:
  [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
  bumped Symfony version to 3.0.2
  Do not use HttpKernel Extension when not needed
  updated VERSION for 3.0.1
  updated CHANGELOG for 3.0.1
  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:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-12-28 14:15:29 +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
Fabien Potencier
8956ed50a4 Merge pull request #17143 from fabpot/release-2.8.1
released v2.8.1
2015-12-26 16:56:52 +01:00
Fabien Potencier
156e801303 updated VERSION for 2.8.1 2015-12-26 16:56:42 +01:00
Fabien Potencier
8b4a252d90 updated CHANGELOG for 2.8.1 2015-12-26 16:56:37 +01:00
Fabien Potencier
d222bd3213 bumped Symfony version to 2.7.9 2015-12-26 16:49:24 +01:00
Fabien Potencier
ad264021e4 Merge pull request #17142 from fabpot/release-2.7.8
released v2.7.8
2015-12-26 16:02:06 +01:00
Fabien Potencier
e680b91f6e updated VERSION for 2.7.8 2015-12-26 16:01:55 +01:00
Fabien Potencier
7fa9f72574 updated CHANGELOG for 2.7.8 2015-12-26 16:01:50 +01:00
Fabien Potencier
f409dd2589 bumped Symfony version to 2.3.37 2015-12-26 15:52:28 +01:00
Fabien Potencier
b72ca4bdc7 Merge pull request #17141 from fabpot/release-2.3.36
released v2.3.36
2015-12-26 15:08:08 +01:00
Fabien Potencier
b7362dc730 updated VERSION for 2.3.36 2015-12-26 15:07:57 +01:00
Fabien Potencier
2f21e288db update CONTRIBUTORS for 2.3.36 2015-12-26 15:07:37 +01:00
Fabien Potencier
3ebbb15d4e updated CHANGELOG for 2.3.36 2015-12-26 15:07:27 +01:00
Fabien Potencier
778884acdd Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
This reverts commit e60889ac4d.
2015-12-26 15:05:15 +01:00
Fabien Potencier
3c907cebed Merge branch '2.3' into 2.7
* 2.3:
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
2015-12-26 15:02:48 +01:00
Fabien Potencier
e60889ac4d Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
This reverts commit af3f4eaa2b, reversing
changes made to 021ab8a7b3.
2015-12-26 15:02:40 +01:00
Fabien Potencier
a97684095f Merge branch '3.0'
* 3.0:
  fixed previous merge
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [DomCrawler] Revert previous restriction, allow selection of every DOMNode object
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:42:39 +01:00
Fabien Potencier
a9fe244b0b fixed previous merge 2015-12-26 14:42:31 +01:00
Fabien Potencier
77f37fb077 Merge branch '2.8' into 3.0
* 2.8:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [DomCrawler] Revert previous restriction, allow selection of every DOMNode object
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:39:53 +01:00
Fabien Potencier
27129228eb Merge branch '2.7' into 2.8
* 2.7:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:56 +01:00
Fabien Potencier
97cf53f9bd Merge branch '2.3' into 2.7
* 2.3:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:43 +01:00