Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always use a single space for and combinator #819

Merged
merged 2 commits into from
Feb 21, 2023
Merged

Always use a single space for and combinator #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1e7cd7
Always use a single space for 'and' combinator
fredden Jan 10, 2023
4df293a
Fix: Update CHANGELOG.md
localheinz Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ For a full diff see [`3.0.0...main`][3.0.0...main].
- Adjusted `Vendor\Composer\ComposerJsonNormalizer` to reject JSON when it is not an object ([#804]), by [@localheinz]
- Adjusted `Vendor\Composer\ComposerJsonNormalizer` to compose `WithFinalNewLineNormalizer` ([#806]), by [@localheinz]
- Adjusted `Vendor\Composer\VersionConstraintNormalizer` to skip normalization of version constraints when they can not be parsed by `Composer\Semver\VersionParser` ([#813]), by [@fredden] and [@localheinz]
- Adjusted `Vendor\Composer\VersionConstraintNormalizer` to normalize version constraints separators in `and` constraints from space (` `) or comma (`,`) to space (` `) ([#819]), by [@fredden]

### Fixed

Expand Down Expand Up @@ -559,6 +560,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[#804]: https://github.com/ergebnis/json-normalizer/pull/804
[#805]: https://github.com/ergebnis/json-normalizer/pull/805
[#813]: https://github.com/ergebnis/json-normalizer/pull/813
[#819]: https://github.com/ergebnis/json-normalizer/pull/819

[@BackEndTea]: https://github.com/BackEndTea
[@dependabot]: https://github.com/dependabot
Expand Down
15 changes: 14 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,20 @@ When `composer.json` contains version constraints in the
sections, the `Vendor\Composer\VersionConstraintNormalizer` will ensure that

- all constraints are trimmed
- *and- constraints are separated by a single space (` `) or a comma (`,`)

- version constraints separated by a space (` `) or comma (`,`) - treated as a logical and - are separated by a space (` `) instead

```diff
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
"require": {
- "foo/bar": "1.2.3,2.3.4",
- "foo/baz": "2.3.4 3.4.5"
+ "foo/bar": "1.2.3 2.3.4",
+ "foo/baz": "2.3.4 3.4.5"
}
```

- *or- constraints are separated by double-pipe with a single space before and after (` || `)
- *range- constraints are separated by a single space (` `)

Expand Down
2 changes: 1 addition & 1 deletion src/Vendor/Composer/VersionConstraintNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class VersionConstraintNormalizer implements Normalizer
private const MAP = [
'and' => [
'{\s*,\s*}',
',',
' ',
],
'or' => [
'{\s*\|\|?\s*}',
Expand Down
12 changes: 6 additions & 6 deletions ...malizedVersionConstraints/No/Combination/And/Comma/ExactVersion/Duplicate/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
"value-contains-packages-and-version-constraints": {
"combination-and-comma-exact-version-duplicate/01-without-spaces-trimmed": "0,0,1.2,1.2,2.3.4,2.3.4",
"combination-and-comma-exact-version-duplicate/02-without-spaces-untrimmed": "0,0,1.2,1.2,2.3.4,2.3.4",
"combination-and-comma-exact-version-duplicate/03-with-space-single-trimmed": "0,0,1.2,1.2,2.3.4,2.3.4",
"combination-and-comma-exact-version-duplicate/04-with-space-single-untrimmed": "0,0,1.2,1.2,2.3.4,2.3.4",
"combination-and-comma-exact-version-duplicate/05-with-space-double-trimmed": "0,0,1.2,1.2,2.3.4,2.3.4",
"combination-and-comma-exact-version-duplicate/06-with-space-double-untrimmed": "0,0,1.2,1.2,2.3.4,2.3.4"
"combination-and-comma-exact-version-duplicate/01-without-spaces-trimmed": "0 0 1.2 1.2 2.3.4 2.3.4",
"combination-and-comma-exact-version-duplicate/02-without-spaces-untrimmed": "0 0 1.2 1.2 2.3.4 2.3.4",
"combination-and-comma-exact-version-duplicate/03-with-space-single-trimmed": "0 0 1.2 1.2 2.3.4 2.3.4",
"combination-and-comma-exact-version-duplicate/04-with-space-single-untrimmed": "0 0 1.2 1.2 2.3.4 2.3.4",
"combination-and-comma-exact-version-duplicate/05-with-space-double-trimmed": "0 0 1.2 1.2 2.3.4 2.3.4",
"combination-and-comma-exact-version-duplicate/06-with-space-double-untrimmed": "0 0 1.2 1.2 2.3.4 2.3.4"
}
}
12 changes: 6 additions & 6 deletions ...NormalizedVersionConstraints/No/Combination/And/Comma/ExactVersion/Unique/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
"value-contains-packages-and-version-constraints": {
"combination-and-comma-exact-version-unique/01-without-spaces-trimmed": "0,1.2,2.3.4",
"combination-and-comma-exact-version-unique/02-without-spaces-untrimmed": "0,1.2,2.3.4",
"combination-and-comma-exact-version-unique/03-with-space-single-trimmed": "0,1.2,2.3.4",
"combination-and-comma-exact-version-unique/04-with-space-single-untrimmed": "0,1.2,2.3.4",
"combination-and-comma-exact-version-unique/05-with-space-double-trimmed": "0,1.2,2.3.4",
"combination-and-comma-exact-version-unique/06-with-space-double-untrimmed": "0,1.2,2.3.4"
"combination-and-comma-exact-version-unique/01-without-spaces-trimmed": "0 1.2 2.3.4",
"combination-and-comma-exact-version-unique/02-without-spaces-untrimmed": "0 1.2 2.3.4",
"combination-and-comma-exact-version-unique/03-with-space-single-trimmed": "0 1.2 2.3.4",
"combination-and-comma-exact-version-unique/04-with-space-single-untrimmed": "0 1.2 2.3.4",
"combination-and-comma-exact-version-unique/05-with-space-double-trimmed": "0 1.2 2.3.4",
"combination-and-comma-exact-version-unique/06-with-space-double-untrimmed": "0 1.2 2.3.4"
}
}
12 changes: 6 additions & 6 deletions ...rmalizedVersionConstraints/No/Combination/And/Comma/ExactVersion/Unsorted/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
"value-contains-packages-and-version-constraints": {
"combination-and-comma-exact-version-unsorted/01-without-spaces-trimmed": "2.3.4,1.2,0",
"combination-and-comma-exact-version-unsorted/02-without-spaces-untrimmed": "2.3.4,1.2,0",
"combination-and-comma-exact-version-unsorted/03-with-space-single-trimmed": "2.3.4,1.2,0",
"combination-and-comma-exact-version-unsorted/04-with-space-single-untrimmed": "2.3.4,1.2,0",
"combination-and-comma-exact-version-unsorted/05-with-space-double-trimmed": "2.3.4,1.2,0",
"combination-and-comma-exact-version-unsorted/06-with-space-double-untrimmed": "2.3.4,1.2,0"
"combination-and-comma-exact-version-unsorted/01-without-spaces-trimmed": "2.3.4 1.2 0",
"combination-and-comma-exact-version-unsorted/02-without-spaces-untrimmed": "2.3.4 1.2 0",
"combination-and-comma-exact-version-unsorted/03-with-space-single-trimmed": "2.3.4 1.2 0",
"combination-and-comma-exact-version-unsorted/04-with-space-single-untrimmed": "2.3.4 1.2 0",
"combination-and-comma-exact-version-unsorted/05-with-space-double-trimmed": "2.3.4 1.2 0",
"combination-and-comma-exact-version-unsorted/06-with-space-double-untrimmed": "2.3.4 1.2 0"
}
}
12 changes: 6 additions & 6 deletions .../HasNormalizedVersionConstraints/No/Combination/And/Comma/Or/ExactVersion/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
"value-contains-packages-and-version-constraints": {
"combination-and-comma-or-exact-version/01-without-spaces-trimmed": "1,2.3 || 3.4.5",
"combination-and-comma-or-exact-version/02-without-spaces-untrimmed": "1,2.3 || 3.4.5",
"combination-and-comma-or-exact-version/03-with-space-single-trimmed": "1,2.3 || 3.4.5",
"combination-and-comma-or-exact-version/04-with-space-single-untrimmed": "1,2.3 || 3.4.5",
"combination-and-comma-or-exact-version/05-with-space-double-trimmed": "1,2.3 || 3.4.5",
"combination-and-comma-or-exact-version/06-with-space-double-untrimmed": "1,2.3 || 3.4.5"
"combination-and-comma-or-exact-version/01-without-spaces-trimmed": "1 2.3 || 3.4.5",
"combination-and-comma-or-exact-version/02-without-spaces-untrimmed": "1 2.3 || 3.4.5",
"combination-and-comma-or-exact-version/03-with-space-single-trimmed": "1 2.3 || 3.4.5",
"combination-and-comma-or-exact-version/04-with-space-single-untrimmed": "1 2.3 || 3.4.5",
"combination-and-comma-or-exact-version/05-with-space-double-trimmed": "1 2.3 || 3.4.5",
"combination-and-comma-or-exact-version/06-with-space-double-untrimmed": "1 2.3 || 3.4.5"
}
}