Commit Graph

37792 Commits

Author SHA1 Message Date
Nicolas Grekas
1730b7d9ef Merge branch '4.1'
* 4.1:
  fix merge
  bumped Symfony version to 4.1.3
  [PhpUnitBridge] Describe weak_vendors properly
  [HttpKernel] Fix merging bindings for controllers' locators
  updated VERSION for 4.1.2
  updated CHANGELOG for 4.1.2
  bumped Symfony version to 4.0.14
  updated VERSION for 4.0.13
  updated CHANGELOG for 4.0.13
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
  Chaining senders with their aliases should work
2018-07-26 10:29:03 +02:00
Nicolas Grekas
8305d615ab fix merge 2018-07-26 10:28:23 +02:00
Nicolas Grekas
abe2a237a0 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] Fix merging bindings for controllers' locators
  bumped Symfony version to 4.0.14
  updated VERSION for 4.0.13
  updated CHANGELOG for 4.0.13
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
2018-07-26 10:24:24 +02:00
Nicolas Grekas
cdc4f7ddd1 bumped Symfony version to 4.1.3 2018-07-26 10:23:27 +02:00
Nicolas Grekas
097ac83a50 Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] Fix merging bindings for controllers' locators
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
2018-07-26 10:19:20 +02:00
Nicolas Grekas
3349ec66a7 Merge branch '2.8' into 3.4
* 2.8:
  bumped Symfony version to 2.8.44
2018-07-26 10:16:47 +02:00
Nicolas Grekas
1b9baa48bd bug #28052 [HttpKernel] Fix merging bindings for controllers' locators (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel] Fix merging bindings for controllers' locators

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

Commits
-------

94b620ebc2 [HttpKernel] Fix merging bindings for controllers' locators
2018-07-25 10:23:09 +02:00
Nicolas Grekas
abc4ef2566 minor #28046 [PhpUnitBridge] Describe weak_vendors properly (greg0ire)
This PR was squashed before being merged into the 4.1 branch (closes #28046).

Discussion
----------

[PhpUnitBridge] Describe weak_vendors properly

| Q             | A
| ------------- | ---
| Branch?       | 4.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

The `weak_vendors` mode now displays deprecations, this behavior has changed since https://github.com/symfony/symfony/pull/25997

Commits
-------

336008c5d3 [PhpUnitBridge] Describe weak_vendors properly
2018-07-25 10:19:41 +02:00
Grégoire Paris
336008c5d3 [PhpUnitBridge] Describe weak_vendors properly 2018-07-25 10:19:35 +02:00
Samuel ROZE
975421c868 bug #28014 [Messenger] Fix chaining senders with their aliases (sroze)
This PR was merged into the 4.1 branch.

Discussion
----------

[Messenger] Fix chaining senders with their aliases

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

Turns out chaining senders when using their alias as the name is broken. This PR fixes it :)

Commits
-------

98bb64c32a Chaining senders with their aliases should work
2018-07-25 09:59:22 +02:00
Nicolas Grekas
94b620ebc2 [HttpKernel] Fix merging bindings for controllers' locators 2018-07-24 09:03:36 +02:00
Fabien Potencier
c42cc18492
Merge pull request #28043 from fabpot/release-4.1.2
released v4.1.2
2018-07-23 19:16:40 +02:00
Fabien Potencier
971445977f updated VERSION for 4.1.2 2018-07-23 19:16:22 +02:00
Fabien Potencier
52c642b1f4 updated CHANGELOG for 4.1.2 2018-07-23 19:16:16 +02:00
Fabien Potencier
b067f31147 bumped Symfony version to 4.0.14 2018-07-23 19:15:26 +02:00
Fabien Potencier
b2fc878468
Merge pull request #28042 from fabpot/release-4.0.13
released v4.0.13
2018-07-23 19:13:11 +02:00
Fabien Potencier
89959a4ca1 updated VERSION for 4.0.13 2018-07-23 19:12:53 +02:00
Fabien Potencier
c710c7431f updated CHANGELOG for 4.0.13 2018-07-23 19:12:47 +02:00
Fabien Potencier
0ff03c9b3d bumped Symfony version to 3.4.14 2018-07-23 19:11:49 +02:00
Fabien Potencier
c406c5a4f1
Merge pull request #28039 from fabpot/release-3.4.13
released v3.4.13
2018-07-23 18:37:45 +02:00
Fabien Potencier
7446a290ad updated VERSION for 3.4.13 2018-07-23 18:37:31 +02:00
Fabien Potencier
30b834bdaf updated CHANGELOG for 3.4.13 2018-07-23 18:37:26 +02:00
Nicolas Grekas
0eea077522 Merge branch '4.1'
* 4.1:
  [Form] fix truncating form views in data collector
  [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 17:02:41 +02:00
Nicolas Grekas
07cf82793c Merge branch '4.0' into 4.1
* 4.0:
  [Form] fix truncating form views in data collector
  [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 17:02:27 +02:00
Nicolas Grekas
9d4abf842f Merge branch '3.4' into 4.0
* 3.4:
  [Form] fix truncating form views in data collector
  [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 17:02:07 +02:00
Fabien Potencier
a57549d0a1 bumped Symfony version to 2.8.44 2018-07-23 16:56:24 +02:00
Nicolas Grekas
707e52afd7 minor #28037 [Form] fix truncating form views in data collector (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[Form] fix truncating form views in data collector

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no (fixing a non released patch)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Fixes #27923.

Commits
-------

5fa1f12f3c [Form] fix truncating form views in data collector
2018-07-23 16:49:37 +02:00
Nicolas Grekas
ad316675f5 minor #28036 [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge

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

Commits
-------

8869b296b8 [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 15:28:27 +02:00
Nicolas Grekas
5fa1f12f3c [Form] fix truncating form views in data collector 2018-07-23 14:58:27 +02:00
Nicolas Grekas
8869b296b8 [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge 2018-07-23 14:38:31 +02:00
Nicolas Grekas
ffb515d415 Merge branch '4.1'
* 4.1:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:47 +02:00
Nicolas Grekas
53d64d7a99 Merge branch '4.0' into 4.1
* 4.0:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:29 +02:00
Nicolas Grekas
dcf55f4f22 Merge branch '3.4' into 4.0
* 3.4:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:04 +02:00
Nicolas Grekas
d61bedabd5 Merge branch '2.8' into 3.4
* 2.8:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:36:14 +02:00
Samuel ROZE
98bb64c32a Chaining senders with their aliases should work 2018-07-23 12:44:09 +02:00
Fabien Potencier
e7f50768f1
Merge pull request #28031 from fabpot/release-2.8.43
released v2.8.43
2018-07-23 11:03:03 +02:00
Fabien Potencier
78ef2a0740 updated VERSION for 2.8.43 2018-07-23 11:02:45 +02:00
Fabien Potencier
d74b11f877 update CONTRIBUTORS for 2.8.43 2018-07-23 11:02:44 +02:00
Fabien Potencier
6f97c89340 updated CHANGELOG for 2.8.43 2018-07-23 11:02:31 +02:00
Fabien Potencier
b2ec4aaf76 bug #28005 [HttpKernel] Fixed templateExists on parse error of the template name (yceruto)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel] Fixed templateExists on parse error of the template name

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

9bfa971bc5/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php (L49-L51)

Commits
-------

53347c42fd Fixed templateExists on parse error of the template name
2018-07-23 10:31:26 +02:00
Fabien Potencier
48644a8fc8 backported translations 2018-07-23 10:22:17 +02:00
Fabien Potencier
ce2ac0f2f0 Merge branch '4.1'
* 4.1:
  fixed UUID error message id in translation files
  Add missing typehint on chain sender
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
  Supports nested "abstract" object while serializing and de-serializing
2018-07-23 10:20:32 +02:00
Fabien Potencier
47aba84899 Merge branch '4.0' into 4.1
* 4.0:
  fixed UUID error message id in translation files
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
2018-07-23 10:20:20 +02:00
Fabien Potencier
ffb28a360d Merge branch '3.4' into 4.0
* 3.4:
  fixed UUID error message id in translation files
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
2018-07-23 10:19:18 +02:00
Fabien Potencier
a97a6175ba Merge branch '2.8' into 3.4
* 2.8:
  fixed UUID error message id in translation files
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
2018-07-23 10:18:36 +02:00
Fabien Potencier
53cbd0dabf minor #28030 Fix UUID error message id in translation files (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix UUID error message id in translation files

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

Id 82 is already taken for the generic error message.

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

5d76ed7a3a fixed UUID error message id in translation files
2018-07-23 10:16:33 +02:00
Fabien Potencier
5d76ed7a3a fixed UUID error message id in translation files 2018-07-23 10:13:01 +02:00
Maxime Steinhausser
817963d284 bug #28013 [Messenger] Add missing typehint on chain sender (sroze)
This PR was merged into the 4.1 branch.

Discussion
----------

[Messenger] Add missing typehint on chain sender

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

The typehint is part of the `SenderInterface`. Adding it was probably forgotten at some point.

Commits
-------

22b2257609 Add missing typehint on chain sender
2018-07-22 12:26:23 +02:00
Samuel ROZE
22b2257609 Add missing typehint on chain sender 2018-07-20 11:39:40 +01:00
Yonel Ceruto
53347c42fd Fixed templateExists on parse error of the template name 2018-07-19 14:17:34 -04:00