Commit Graph

1902 Commits

Author SHA1 Message Date
Robin Chalas
e632302004 [Serializer] Fix tests marked as incomplete 2021-01-26 11:29:51 +01:00
Nicolas Grekas
c377a795f5 Merge branch '5.2' into 5.x
* 5.2:
  Changed private static array-properties to const
2021-01-25 15:09:21 +01:00
Nicolas Grekas
a5ef152ee2 Merge branch '5.1' into 5.2
* 5.1:
  Changed private static array-properties to const
2021-01-25 15:08:25 +01:00
Nicolas Grekas
6f732876c1 Merge branch '4.4' into 5.1
* 4.4:
  Changed private static array-properties to const
2021-01-25 14:59:38 +01:00
BoShurik
da9100320e Exclude non-initialized properties accessed with getters 2021-01-25 13:41:50 +03:00
Simon Berger
aa79381fe4 Changed private static array-properties to const 2021-01-25 00:44:26 +01:00
Nicolas Grekas
fe49ed2e42 Merge branch '5.2' into 5.x
* 5.2:
  µCS fix
  CS fix
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Add me as a Notifier code owner
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  fix typo
  Make EmailMessage & SmsMessage transport nullable
  remove unused argument
  [SecurityBundle] Drop dead check
  [DI] fix param annotation
  [SecurityBundle] Remove invalid service definition
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param
2021-01-14 16:43:35 +01:00
Nicolas Grekas
106c693c48 Merge branch '5.1' into 5.2
* 5.1:
  µCS fix
  CS fix
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Add me as a Notifier code owner
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  Make EmailMessage & SmsMessage transport nullable
  remove unused argument
  [DI] fix param annotation
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param
2021-01-14 16:42:36 +01:00
Nicolas Grekas
41a7eaa654 Merge branch '4.4' into 5.1
* 4.4:
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  [DI] fix param annotation
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param
2021-01-14 16:25:38 +01:00
Nicolas Grekas
7f5ea78fb8 [travis] use PHP 8.0 to patch return types and run deps=low 2021-01-14 15:31:07 +01:00
Oskar Stark
575d9b04b4 No patch version in CHANGELOG 2021-01-14 08:18:56 +01:00
Fabien Potencier
d23b74ebce bug #39735 [Serializer] Rename normalize param (VincentLanglet)
This PR was merged into the 4.4 branch.

Discussion
----------

[Serializer] Rename normalize param

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| License       | MIT

The ProblemNormalizer is the only one Normalizer which
- Use a different param name `$exception` instead of the one in the interface `$object`.
- Doesn't type check the param.

The first point lead to an unfixable error with Psalm when extending the ProblemNormalizer
- If the variable is named `$object` it does not match with the parent
- If the variable is named `$exception` it does not match with the interface

Commits
-------

7e6eee2789 Rename normalize param
2021-01-13 08:03:18 +01:00
Fabien Potencier
742dd1326a Merge branch '5.2' into 5.x
* 5.2:
  Use ::class keyword when possible
2021-01-11 11:44:47 +01:00
Fabien Potencier
b145df90e6 Merge branch '5.1' into 5.2
* 5.1:
  Use ::class keyword when possible
2021-01-11 11:44:39 +01:00
Fabien Potencier
1f3a29ba83 Use ::class keyword when possible 2021-01-11 11:34:08 +01:00
Fabien Potencier
91d8bebfac Merge branch '5.2' into 5.x
* 5.2:
  Use ::class keyword when possible
2021-01-11 10:52:33 +01:00
Fabien Potencier
b9909c4432 Merge branch '5.1' into 5.2
* 5.1:
  Use ::class keyword when possible
2021-01-11 10:51:46 +01:00
Fabien Potencier
83b087364b Merge branch '4.4' into 5.1
* 4.4:
  Use ::class keyword when possible
2021-01-11 10:50:50 +01:00
Fabien Potencier
6c8d5808a6 Use ::class keyword when possible 2021-01-11 09:57:50 +01:00
Fabien Potencier
c373e24e49 Merge branch '5.2' into 5.x
* 5.2:
  Use ::class keyword when possible
2021-01-11 07:08:00 +01:00
Fabien Potencier
2d3385187c Merge branch '5.1' into 5.2
* 5.1:
  Use ::class keyword when possible
2021-01-11 07:07:06 +01:00
Fabien Potencier
589ab8b8fc Merge branch '4.4' into 5.1
* 4.4:
  Use ::class keyword when possible
2021-01-11 07:06:28 +01:00
Fabien Potencier
c79e61f1f2 minor #39775 [WIP] Use ::class keyword when possible (fabpot)
This PR was merged into the 4.4 branch.

Discussion
----------

[WIP] Use ::class keyword when possible

| Q             | A
| ------------- | ---
| Branch?       | 4.4 <!-- see below -->
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | n/a  <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License       | MIT
| Doc PR        | n/a

Commits
-------

036a36cb14 Use ::class keyword when possible
2021-01-11 07:02:33 +01:00
Fabien Potencier
036a36cb14 Use ::class keyword when possible 2021-01-10 17:45:22 +01:00
Fabien Potencier
7409566cf1 Merge branch '5.2' into 5.x
* 5.2:
  Improve composer.json descriptions
2021-01-10 17:31:27 +01:00
Fabien Potencier
1154fd4059 Merge branch '5.1' into 5.2
* 5.1:
  Improve composer.json descriptions
2021-01-10 17:30:10 +01:00
Fabien Potencier
dbbcb9cd1f Merge branch '4.4' into 5.1
* 4.4:
  Improve composer.json descriptions
2021-01-10 17:29:19 +01:00
Fabien Potencier
611a2dfaf3 Improve composer.json descriptions 2021-01-10 17:25:35 +01:00
Nicolas Grekas
4e0d424666 feature #39675 [Serializer] [UidNormalizer] Add normalization formats (fancyweb)
This PR was merged into the 5.3-dev branch.

Discussion
----------

[Serializer] [UidNormalizer] Add normalization formats

| Q             | A
| ------------- | ---
| Branch?       | 5.x
| Bug fix?      | no
| New feature?  | yes
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Commits
-------

6b88e6f662 [Serializer][UidNormalizer] Add normalization formats
2021-01-07 15:47:08 +01:00
Alexander M. Turek
8bf1669e82 Merge branch '5.2' into 5.x
* 5.2:
  Fix bitnami env PATH
  [Serializer] Drop extra space
  [Notifier] Add tests for SlackOptions
2021-01-07 01:38:58 +01:00
David Prévot
ff05e84553
[Serializer] Drop extra space 2021-01-06 17:15:40 -04:00
Vincent Langlet
7e6eee2789 Rename normalize param 2021-01-06 12:56:58 +01:00
Thomas Calvet
6b88e6f662 [Serializer][UidNormalizer] Add normalization formats 2021-01-06 09:25:33 +01:00
Christian Flothmann
a7600370fa Merge branch '5.2' into 5.x
* 5.2:
  fix code style
  [Uid] Hardcode UuidV3 & UuidV5 TYPE conditional constants
  [Uid] Use the Uuid constructor when reconstructing an Ulid from its RFC-4122 version
  stop using void in test files
  parse cookie values containing the equal sign
  make some time dependent tests more resilient
  fix code style
  Remove full head content in HTML to text converter
  do not break when loading schemas from network paths on Windows
  apply the sort callback on the whole search result
2021-01-05 20:51:30 +01:00
Christian Flothmann
0fdf59c26d fix code style 2021-01-05 20:37:17 +01:00
Christian Flothmann
900cb0eece Merge branch '5.1' into 5.2
* 5.1:
  fix code style
  Remove full head content in HTML to text converter
  apply the sort callback on the whole search result
2021-01-05 16:30:03 +01:00
Christian Flothmann
08fb696dbc fix code style 2021-01-05 08:52:01 +01:00
Alexander M. Turek
90f6d30b06 [Serializer] Migrate ArrayDenormalizer to DenormalizerAwareInterface. 2021-01-01 12:17:22 +01:00
Fabien Potencier
782ed1019f Merge branch '5.2' into 5.x
* 5.2:
  Bump license year
  Bump license year
  Bump license year
  [Form] fix passing null $pattern to IntlDateFormatter
  [Notifier] Add missing LICENSE file
  Add reference link
  [Validator] Update Isin message to match the translation files.
  Update README.md
  Add AuthenticationTokenCreatedEvent to be propagated
2021-01-01 10:27:20 +01:00
Fabien Potencier
2a1a4e7067 Merge branch '5.1' into 5.2
* 5.1:
  Bump license year
  Bump license year
  [Form] fix passing null $pattern to IntlDateFormatter
  Add reference link
  Update README.md
2021-01-01 10:26:45 +01:00
Fabien Potencier
f4ca745086 Merge branch '4.4' into 5.1
* 4.4:
  Bump license year
  [Form] fix passing null $pattern to IntlDateFormatter
  Update README.md
2021-01-01 10:25:51 +01:00
Fabien Potencier
2c4337ae5b Bump license year 2021-01-01 10:24:35 +01:00
Baptiste Leduc
84dd1784cb
Support multiple types for collection keys & values 2020-12-31 10:27:19 +01:00
Alexander M. Turek
7bc051f260 Merge branch '5.1' into 5.2
* 5.1:
  Bump Symfony version to 5.1.11
  Update VERSION for 5.1.10
  Update CHANGELOG for 5.1.10
  Bump Symfony version to 4.4.19
  Update VERSION for 4.4.18
  Update CONTRIBUTORS for 4.4.18
  Update CHANGELOG for 4.4.18
  [Serializer] Fix DenormalizableInterface::denormalize() return type declaration in docblock
2020-12-21 16:33:14 +01:00
Alexander M. Turek
74b132fca2 Merge branch '4.4' into 5.1
* 4.4:
  Bump Symfony version to 4.4.19
  Update VERSION for 4.4.18
  Update CONTRIBUTORS for 4.4.18
  Update CHANGELOG for 4.4.18
  [Serializer] Fix DenormalizableInterface::denormalize() return type declaration in docblock
2020-12-21 16:29:43 +01:00
Jeroen Noten
00c90aed51
[Serializer] Fix DenormalizableInterface::denormalize() return type declaration in docblock 2020-12-18 14:21:55 +01:00
Fabien Potencier
9e87661911 Merge branch '5.1' into 5.2
* 5.1:
  Remove :void in test function signatures
2020-12-18 09:03:05 +01:00
Fabien Potencier
090b4256f0 Merge branch '4.4' into 5.1
* 4.4:
  Remove :void in test function signatures
2020-12-18 09:02:46 +01:00
Fabien Potencier
47fcf4ad5a Remove :void in test function signatures 2020-12-18 08:41:31 +01:00
Fabien Potencier
7d5ddc756c Merge branch '5.1' into 5.2
* 5.1:
  Remove void return type from test methods
  Added basque translations
  Updated Luxembourgish translations
  [Mailer] Fix parsing Dsn with empty user/password
  Normalize exceptions messages containing methods references
  [Ldap] Incorrect determination of RelativeDistinguishedName for the "move" operation
2020-12-18 08:32:35 +01:00
Fabien Potencier
0dc2d55537 Merge branch '4.4' into 5.1
* 4.4:
  Remove void return type from test methods
  Added basque translations
  Updated Luxembourgish translations
  [Mailer] Fix parsing Dsn with empty user/password
  Normalize exceptions messages containing methods references
  [Ldap] Incorrect determination of RelativeDistinguishedName for the "move" operation
2020-12-18 08:32:24 +01:00
Maxime Steinhausser
e2da2acd6d Normalize exceptions messages containing methods references 2020-12-17 14:33:54 +01:00
Nicolas Grekas
b81a03d7a1 Merge branch '5.1' into 5.2
* 5.1:
  Fix EncoderInterface::encode() return type
  [Lock] Prevent store exception break combined store
  Remove check for unsupported PHP version
  [Notifier] Rename test method names
2020-12-14 11:56:50 +01:00
Nicolas Grekas
bae2782cdb Merge branch '4.4' into 5.1
* 4.4:
  Fix EncoderInterface::encode() return type
  [Lock] Prevent store exception break combined store
2020-12-14 11:55:48 +01:00
Jeroen Noten
ae6f054cc1 Fix EncoderInterface::encode() return type 2020-12-14 11:44:14 +01:00
Maxime Steinhausser
3cbe758df3 [Serializer][Validator] Mention annotation loaders handle PHP8 attributes 2020-12-10 14:01:49 +01:00
Maxime Steinhausser
bdcd745232 [Serializer] Make fabbot happy with 5.2 tests CS 2020-12-09 14:07:31 +01:00
Nicolas Grekas
555697df61 Merge branch '5.1' into 5.2
* 5.1:
  Update .php_cs.dist
  Apply "visibility_required" CS rule to constants
2020-12-08 18:03:37 +01:00
Nicolas Grekas
a8b992f8a2 Merge branch '4.4' into 5.1
* 4.4:
  Update .php_cs.dist
  Apply "visibility_required" CS rule to constants
2020-12-08 18:02:38 +01:00
Nicolas Grekas
ff22d30cb0 Apply "visibility_required" CS rule to constants
php-cs-fixer fix --rules='{"visibility_required": ["property", "method", "const"]}'
2020-12-08 17:59:59 +01:00
Fabien Potencier
f4e1556199 Merge branch '5.1' into 5.2
* 5.1:
  [Serializer] Fixed serialize and denormalize return types
  Run intl-data tests on resources change
  [FrameworkBundle] fix preserving some special chars in the query string when redirecting
2020-12-08 08:07:34 +01:00
vudaltsov
67277e55f0 [Serializer] Fixed serialize and denormalize return types 2020-12-08 07:28:50 +01:00
Fabien Potencier
16535b2a64 Merge branch '5.1' into 5.2
* 5.1:
  fix denormalizing scalar with UnwrappingDenormalizer
2020-11-27 11:27:27 +01:00
Fabien Potencier
3d384ba76b bug #39180 [Serializer] Fix denormalizing scalar with UnwrappingDenormalizer (camilledejoye)
This PR was merged into the 5.1 branch.

Discussion
----------

[Serializer] Fix denormalizing scalar with UnwrappingDenormalizer

| Q             | A
| ------------- | ---
| Branch?       | 5.1
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #38983
| License       | MIT
| Doc PR        | none

In order to work the `UnwrappingDenormlizer` needs to be called first to unwrap the data so that it can be handled by other denormalizers.
To not introduce any BC break this PR does not move the logic into it's own class, instead it checks if a denormalizer supports the data and only denormalize scalar values if there is none.

Commits
-------

98cf389fb9 fix denormalizing scalar with UnwrappingDenormalizer
2020-11-27 06:53:16 +01:00
Alexander M. Turek
62184bd8f0 Merge branch '5.1' into 5.2
* 5.1:
  Fix test.
  [PhpUnitBridge] Fix qualification of deprecations triggered by the debug class loader
  Improve return phpdoc for Normalizer
  Use a partial buffer in SymfonyStyle
  Fix console closing tag
  Fix typo in comment
  [VarDumper] fix casting resources turned into objects on PHP 8
2020-11-27 01:39:34 +01:00
Alexander M. Turek
b96d0089a5 Merge branch '4.4' into 5.1
* 4.4:
  [PhpUnitBridge] Fix qualification of deprecations triggered by the debug class loader
  Improve return phpdoc for Normalizer
  Use a partial buffer in SymfonyStyle
  Fix console closing tag
  Fix typo in comment
  [VarDumper] fix casting resources turned into objects on PHP 8
2020-11-27 00:46:31 +01:00
Camille Dejoye
98cf389fb9 fix denormalizing scalar with UnwrappingDenormalizer 2020-11-26 14:58:42 +01:00
Vincent Langlet
f2713d6580 Improve return phpdoc for Normalizer 2020-11-25 12:55:08 +01:00
Denis Brumann
6ebf7e164e
Adds constants for YamlEncoder options 2020-11-08 12:35:30 +01:00
Alexander M. Turek
8bac7a0b5e Merge branch '5.1' into 5.x 2020-11-01 17:14:45 +01:00
Alexander M. Turek
fd4cdba551 Merge branch '4.4' into 5.1 2020-11-01 16:43:26 +01:00
Alexander M. Turek
43ce6dfe44 Set constant visibility in tests to private where possible. 2020-10-31 23:44:29 +01:00
Alexander M. Turek
0fee41a617 Merge branch '5.1' into 5.x 2020-10-28 22:46:03 +01:00
Alexander M. Turek
53f7f5f27e Fix CS 2020-10-28 22:33:29 +01:00
Alexander M. Turek
294cffea25 Merge branch '4.4' into 5.1 2020-10-28 22:31:18 +01:00
Alexander M. Turek
659decf594 Use short array deconstruction syntax. 2020-10-28 21:42:29 +01:00
Nicolas Grekas
605a5674a8 Merge branch '5.1' into 5.x
* 5.1:
  fix merge
  fix merge
  Remove branch-version (keep them for contracts only)
  [HttpClient] relax auth bearer format requirements
  [PHPUnitBridge] Silence errors from mkdir()
  [DependencyInjection] Preload classes with union types correctly.
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  [TwigBridge] Remove "transchoice" from the code base
  Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait
  Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill
  [String] fix before/after[Last]() returning the empty string instead of the original one on non-match
  Add missing exporter function for PHPUnit 7
  [Validator] Add missing romanian translations
  [String] fix slicing in UnicodeString
  [Cache] Use correct expiry in ChainAdapter
  do not translate null placeholders or titles
2020-10-24 14:08:07 +02:00
Nicolas Grekas
65f2620bc4 Merge branch '4.4' into 5.1
* 4.4:
  fix merge
  Remove branch-version (keep them for contracts only)
  [HttpClient] relax auth bearer format requirements
  [PHPUnitBridge] Silence errors from mkdir()
  [DependencyInjection] Preload classes with union types correctly.
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait
  Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill
  Add missing exporter function for PHPUnit 7
  [Validator] Add missing romanian translations
  [Cache] Use correct expiry in ChainAdapter
  do not translate null placeholders or titles
2020-10-24 14:01:57 +02:00
Nicolas Grekas
77aa17401d Merge branch '3.4' into 4.4
* 3.4:
  Remove branch-version (keep them for contracts only)
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  [Validator] Add missing romanian translations
  do not translate null placeholders or titles
2020-10-24 13:50:19 +02:00
Nicolas Grekas
f8fe4bf9f5 Remove branch-version (keep them for contracts only) 2020-10-24 12:57:07 +02:00
Marcin Kruk
97b4306c30 [Serializer] fix decoding float XML attributes starting with 0 2020-10-23 06:26:38 +02:00
Nicolas Grekas
01b064d97a Merge branch '5.1' into 5.x
* 5.1:
  Fix branch-version
2020-10-13 15:22:54 +02:00
Nicolas Grekas
1a0ea4d2f7 Merge branch '4.4' into 5.1
* 4.4:
  Fix branch-version
2020-10-13 15:21:37 +02:00
Nicolas Grekas
58f803f356 Merge branch '3.4' into 4.4
* 3.4:
  Fix branch-version
2020-10-13 15:20:53 +02:00
Nicolas Grekas
44a7e3e920 Fix branch-version 2020-10-13 15:20:16 +02:00
Nicolas Grekas
7f0015ee35 Merge branch '5.1' into 5.x
* 5.1:
  Remove "version" from composer.json files, use "branch-version" instead
  [String] fix "is too large" ValueError on PHP 8
2020-10-13 14:43:06 +02:00
Nicolas Grekas
23ab908213 Merge branch '4.4' into 5.1
* 4.4:
  Remove "version" from composer.json files, use "branch-version" instead
2020-10-13 14:35:38 +02:00
Nicolas Grekas
e953dd3e0d Merge branch '3.4' into 4.4
* 3.4:
  Remove "version" from composer.json files, use "branch-version" instead
2020-10-13 14:30:56 +02:00
Nicolas Grekas
56a7571bab minor #38460 Remove "version" from composer.json files, use "branch-version" instead (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

Remove "version" from composer.json files, use "branch-version" instead

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Waiting for confirmation from @Seldaek or @naderman

Commits
-------

f9ed6940fd Remove "version" from composer.json files, use "branch-version" instead
2020-10-13 14:24:32 +02:00
Nicolas Grekas
f9ed6940fd Remove "version" from composer.json files, use "branch-version" instead 2020-10-13 14:21:16 +02:00
Nicolas Grekas
5baa123aac Merge branch '5.1' into 5.x
* 5.1:
  [DI] fix dumping env vars
  [HttpClient] skip executing the multi handle when it's freed already
  [HttpClient] fix using freed curl resource at destruct time
  [HttpClient] shutdown verbose output from curl at destruction
  fix warning for preloading TranslatorTrait class
  [Typography] Remove unneeded description comments
2020-10-13 13:14:51 +02:00
Nicolas Grekas
63288a6e2e Merge branch '4.4' into 5.1
* 4.4:
  [DI] fix dumping env vars
  [HttpClient] skip executing the multi handle when it's freed already
  [HttpClient] fix using freed curl resource at destruct time
  [HttpClient] shutdown verbose output from curl at destruction
  fix warning for preloading TranslatorTrait class
  [Typography] Remove unneeded description comments
2020-10-13 13:14:18 +02:00
Nicolas Grekas
d79912d3d2 Merge branch '3.4' into 4.4
* 3.4:
  [Typography] Remove unneeded description comments
2020-10-13 13:09:48 +02:00
Alexander M. Turek
cfb9986203 [Serializer] Enabled mapping configuration via attributes. 2020-10-12 14:52:41 +02:00
idetox
48e6976ac8 [Typography] Remove unneeded description comments 2020-10-12 14:32:39 +02:00
Nicolas Grekas
6066462be2 Merge branch '5.1' into 5.x
* 5.1:
  Update versions in composer.json
  [Mime] Fix serialization of RawMessage
2020-10-06 17:53:16 +02:00
Nicolas Grekas
3e492d6e5d Merge branch '4.4' into 5.1
* 4.4:
  Update versions in composer.json
  [Mime] Fix serialization of RawMessage
2020-10-06 17:50:31 +02:00
Nicolas Grekas
55396f90a3 Merge branch '3.4' into 4.4
* 3.4:
  Update versions in composer.json
2020-10-06 17:45:41 +02:00
Nicolas Grekas
8f714a2fd6 Update versions in composer.json 2020-10-06 17:25:25 +02:00
Nicolas Grekas
11c4f28137 Merge branch '5.1' into 5.x
* 5.1:
  fix merge
  [appveyor] fix checking for the .x branch
  Remove "branch-alias", populate "version"
2020-10-06 14:00:29 +02:00