Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ergebnis/composer-normalize
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.25.2
Choose a base ref
...
head repository: ergebnis/composer-normalize
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.26.0
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on May 2, 2022

  1. Fix: Update CHANGELOG.md

    localheinz committed May 2, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    localheinz Andreas Möller
    Copy the full SHA
    8ef0995 View commit details
  2. Enhancement: Update schema.json

    ergebnis-bot authored and localheinz committed May 2, 2022
    Copy the full SHA
    a95e15c View commit details
  3. Fix: Update CHANGELOG.md

    localheinz committed May 2, 2022
    Copy the full SHA
    684cba4 View commit details
  4. Merge pull request #923 from ergebnis/feature/schema

    Enhancement: Update `schema.json`
    localheinz authored May 2, 2022
    Copy the full SHA
    0045fae View commit details
Showing with 48 additions and 6 deletions.
  1. +19 −2 CHANGELOG.md
  2. +29 −4 resource/schema.json
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`2.25.1...main`][2.25.1...main].
For a full diff see [`2.26.0...main`][2.26.0...main].

## [`2.26.0`][2.26.0]

For a full diff see [`2.25.2...2.26.0`][2.25.2....2.26.0].

### Changed

- Updated `schema.json` ([#923]), by [@ergebnis-bot]

## [`2.25.2`][2.25.2]

For a full diff see [`2.25.1...2.25.2`][2.25.1....2.25.2].

### Changed

@@ -731,6 +743,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.24.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.1
[2.25.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.0
[2.25.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.1
[2.25.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.2
[2.26.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.26.0

[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
@@ -801,7 +815,9 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.24.0...2.24.1]: https://github.com/ergebnis/composer-normalize/compare/2.24.0...2.24.1
[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.0
[2.25.0...2.25.1]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...2.25.1
[2.25.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.25.1...main
[2.25.1...2.25.2]: https://github.com/ergebnis/composer-normalize/compare/2.25.1...2.25.2
[2.25.2...2.26.0]: https://github.com/ergebnis/composer-normalize/compare/2.25.2...2.26.0
[2.26.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.26.0...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -905,6 +921,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#916]: https://github.com/ergebnis/composer-normalize/pull/916
[#920]: https://github.com/ergebnis/composer-normalize/pull/920
[#922]: https://github.com/ergebnis/composer-normalize/pull/922
[#923]: https://github.com/ergebnis/composer-normalize/pull/923

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
33 changes: 29 additions & 4 deletions resource/schema.json
Original file line number Diff line number Diff line change
@@ -343,7 +343,7 @@
"properties": {
"platform": {
"type": "object",
"description": "This is an object of package name (keys) and version (values) that will be used to mock the platform packages on this machine.",
"description": "This is an object of package name (keys) and version (values) that will be used to mock the platform packages on this machine, the version can be set to false to make it appear like the package is not present.",
"additionalProperties": {
"type": [
"string",
@@ -396,7 +396,7 @@
},
"github-protocols": {
"type": "array",
"description": "A list of protocols to use for github.com clones, in priority order, defaults to [\"git\", \"https\", \"http\"].",
"description": "A list of protocols to use for github.com clones, in priority order, defaults to [\"https\", \"ssh\", \"git\"].",
"items": {
"type": "string"
}
@@ -417,9 +417,26 @@
},
"gitlab-token": {
"type": "object",
"description": "An object of domain name => gitlab private tokens, typically {\"gitlab.com\":\"<token>\"}.",
"description": "An object of domain name => gitlab private tokens, typically {\"gitlab.com\":\"<token>\"}, or an object with username and token keys.",
"additionalProperties": {
"type": "string"
"type": [
"string",
"object"
],
"required": [
"username",
"token"
],
"properties": {
"username": {
"type": "string",
"description": "The username used for GitLab authentication"
},
"token": {
"type": "string",
"description": "The token used for GitLab authentication"
}
}
}
},
"gitlab-protocol": {
@@ -608,6 +625,14 @@
"consumer-secret": {
"type": "string",
"description": "The consumer-secret used for OAuth authentication"
},
"access-token": {
"type": "string",
"description": "The OAuth token retrieved from Bitbucket's API, this is written by Composer and you should not set it nor modify it."
},
"access-token-expiration": {
"type": "integer",
"description": "The generated token's expiration timestamp, this is written by Composer and you should not set it nor modify it."
}
}
}