* 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
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
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
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
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
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 (#).
* 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
This PR was merged into the 2.3 branch.
Discussion
----------
[Yaml] fix indented line handling in folded blocks
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #9105
| License | MIT
| Doc PR |
Commits
-------
756834c [Yaml] fix indented line handling in folded blocks
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes#17052).
Discussion
----------
[2.7] Fixed flatten exception recursion with errors
| 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
Consider the following code:
```php
$error = new ParseError();
$exception = new RuntimeException($error->getMessage(), $error->getCode(), $error);
$flat = new Symfony\Component\Debug\Exception\FlattenException($exception);
```
Without this fix, that code is broken.
You'll end up with something like this:
```
FatalThrowableError in FlattenException.php line 76:
Type error: Argument 1 passed to Symfony\Component\Debug\Exception\FlattenException::create() must be an instance of Exception, instance of ParseError given
```
---
I came across this error issue in https://github.com/laravel/framework/issues/11329.
Commits
-------
2b0721d [2.7] Fixed flatten exception recursion with errors
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes#16826).
Discussion
----------
Embedded identifier support
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | none
| License | MIT
| Doc PR | n/a
If you define your entity identifier using an embeddable class the identifier name will contain period symbols in it such as `id.value` which will generate a syntax error in the DQL lexer because parameter names are not allowed to contain period symbols.
Example to reproduce described bug:
```php
/**
* @ORM\Embeddable
*/
class Identifier {
/**
* @ORM\Column(type="integer")
*/
protected $value;
}
/**
* @ORM\Entity
*/
class Entity {
/**
* @ORM\Id @ORM\Embedded(class="Identifier")
*/
protected $id;
}
```
Commits
-------
38fdda6 Embedded identifier support
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes#17079).
Discussion
----------
Also transform inline mappings to objects
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #17075
| License | MIT
| Doc PR | -
`$objectForMapping` was only applied to inlined mappings. It should be applied for multi-line mappings as well.
Commits
-------
61b863b Also transform inline mappings to objects
This PR was merged into the 2.7 branch.
Discussion
----------
[Serializer] Make metadata interfaces internal
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17113#discussion_r48291776
| License | MIT
| Doc PR | n/a
Introducing such interfaces was a (my) mistake. Serializer metadata are value objects. Nobody will (nor should) implement these interfaces. Composition is better for "extending" metadata.
They were not marked as `@api` and should now be marked as `@internal` (or even deprecated but it will cause some maintenance headaches).
Commits
-------
3f6cfcd [Serializer] Make metadata interfaces internal
This PR was merged into the 2.3 branch.
Discussion
----------
[Config] Fix array sort on normalization in edge case
| 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
Commits
-------
eca41a8 [Config] Fix array sort on normalization in edge case
This PR was submitted for the 3.0 branch but it was merged into the 2.3 branch instead (closes#17131).
Discussion
----------
[DependencyInjection] Change the ExtensionInterface load method definition
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | ~
| License | MIT
| Doc PR | https://github.com/symfony/symfony-docs/pull/5988
This PR change the `Symfony\Component\DependencyInjection\Extension\ExtensionInterface` load method definition to be identical to the documentation :
`public function load(array $configs, ContainerBuilder $container);`
Commits
-------
85c271b Change the ExtensionInterface load method definition to bo identical to the documentation.
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes#16945).
Discussion
----------
add and correct armenian translations
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | none
| License | MIT
| Doc PR | none
Commits
-------
54e6fb4 add and correct armenian translations
This PR was merged into the 2.3 branch.
Discussion
----------
improve BrowserKit test coverage p1
Hi,
This PR improves BrowserKit test coverage.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| License | MIT
I rebased previous PR https://github.com/symfony/symfony/pull/16549 to 2.3
Commits
-------
0261b48 improve BrowserKit test coverage p1
This PR was merged into the 2.7 branch.
Discussion
----------
[Security] Run tests on all PHP versions
Symfony 2.7 supports PHP >= 5.3.9. Since #17073 was merged to 2.7 now, we need to remove the checks for 5.3.7 again.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
4bec980 [Security] Run tests on all PHP versions
This PR was merged into the 2.7 branch.
Discussion
----------
[Console][2.7] Fix merge #17040
| Q | A
| ------------- | ---
| Fixed tickets | 6a92f4e03f (commitcomment-15080872)
| License | MIT
This change should not be merged in upper branches.
Commits
-------
211d589 [Console][2.7] Fix merge #17040
This PR was merged into the 2.3 branch.
Discussion
----------
[appveyor] Exit with failing status code
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
[Sometimes](https://ci.appveyor.com/project/fabpot/symfony/build/1.0.4272#L1103), tests fail on appveyor and I'd like to see the exit code. This does it.
Commits
-------
a6cfff5 [appveyor] Exit with failing status code
This PR was merged into the 2.7 branch.
Discussion
----------
[Process] Make tests more deterministic
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #16988
| License | MIT
| Doc PR | -
This makes running the Process tests faster and more deterministic.
Commits
-------
0dc9389 [Process] Make tests more deterministic
