Skip to content

Commit

Permalink
Merge pull request #744 from ergebnis/feature/schema
Browse files Browse the repository at this point in the history
Enhancement: Update schema.json
  • Loading branch information
localheinz committed Jun 2, 2021
2 parents a6ec6c6 + df6a7e4 commit 1dc7ef5
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 8 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`2.13.4...main`][2.13.4...main].
For a full diff see [`2.14.0...main`][2.14.0...main].

## [`2.14.0`][2.14.0]

For a full diff see [`2.13.4...2.14.0`][2.13.4...2.14.0].

### Changed

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

## [`2.13.4`][2.13.4]

Expand Down Expand Up @@ -571,6 +579,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.13.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.2
[2.13.3]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.3
[2.13.4]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.4
[2.14.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.14.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
Expand Down Expand Up @@ -626,7 +635,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.13.1...2.13.2]: https://github.com/ergebnis/composer-normalize/compare/2.13.1...2.13.2
[2.13.2...2.13.3]: https://github.com/ergebnis/composer-normalize/compare/2.13.2...2.13.3
[2.13.3...2.13.4]: https://github.com/ergebnis/composer-normalize/compare/2.13.3...2.13.4
[2.13.4...main]: https://github.com/ergebnis/composer-normalize/compare/2.13.4...main
[2.13.4...2.14.0]: https://github.com/ergebnis/composer-normalize/compare/2.13.4...2.14.0
[2.14.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.14.0...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -705,6 +715,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#647]: https://github.com/ergebnis/composer-normalize/pull/647
[#707]: https://github.com/ergebnis/composer-normalize/pull/707
[#743]: https://github.com/ergebnis/composer-normalize/pull/743
[#744]: https://github.com/ergebnis/composer-normalize/pull/744

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand Down
34 changes: 28 additions & 6 deletions resource/schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"$schema": "https://json-schema.org/draft-04/schema#",
"name": "Package",
"title": "Package",
"type": "object",
"additionalProperties": true,
"required": [],
"properties": {
"name": {
"type": "string",
Expand Down Expand Up @@ -42,7 +40,7 @@
"version": {
"type": "string",
"description": "Package version, see https://getcomposer.org/doc/04-schema.md#version for more info on valid schemes.",
"pattern": "^v?\\d+(((\\.\\d+)?\\.\\d+)?\\.\\d+)?|^dev-"
"pattern": "^v?\\d+(\\.\\d+){0,3}|^dev-"
},
"time": {
"type": "string",
Expand Down Expand Up @@ -151,6 +149,14 @@
"type": "string"
}
},
"gitlab-protocol": {
"enum": [
"git",
"http",
"https"
],
"description": "A protocol to force use of when creating a repository URL for the `source` value of the package metadata. One of `git` or `http`. By default, Composer will generate a git URL for private repositories and http one for public repos."
},
"bearer": {
"type": "object",
"description": "A hash of domain name => bearer authentication token, for example {\"example.com\":\"<token>\"}.",
Expand All @@ -166,6 +172,13 @@
"type": "boolean",
"description": "Defaults to `true`. If set to true only HTTPS URLs are allowed to be downloaded via Composer. If you really absolutely need HTTP access to something then you can disable it, but using \"Let's Encrypt\" to get a free SSL certificate is generally a better alternative."
},
"secure-svn-domains": {
"type": "array",
"description": "A list of domains which should be trusted/marked as using a secure Subversion/SVN transport. By default svn:// protocol is seen as insecure and will throw. This is a better/safer alternative to disabling `secure-http` altogether.",
"items": {
"type": "string"
}
},
"cafile": {
"type": "string",
"description": "A way to set the path to the openssl CA file. In PHP 5.6+ you should rather set this via openssl.cafile in php.ini, although PHP 5.6+ should be able to detect your system CA file automatically."
Expand Down Expand Up @@ -453,7 +466,14 @@
"string"
],
"description": "The minimum stability the packages must have to be install-able. Possible values are: dev, alpha, beta, RC, stable.",
"pattern": "^dev|alpha|beta|rc|RC|stable$"
"enum": [
"dev",
"alpha",
"beta",
"rc",
"RC",
"stable"
]
},
"prefer-stable": {
"type": [
Expand Down Expand Up @@ -1263,5 +1283,7 @@
},
"additionalProperties": true
}
}
},
"additionalProperties": true,
"required": []
}

0 comments on commit 1dc7ef5

Please sign in to comment.