two fixes for [packagist] schemas (#7782)

* never check for 'require' key in [packagist] /v badge

always use `schema`
closes #7779

* accept str '__unset' for 'require' key in [packagist] /php-v badge

Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
This commit is contained in:
chris48s
2022-03-28 18:46:17 +01:00
committed by GitHub
parent ca1e77436b
commit f45d25c2cc
2 changed files with 7 additions and 5 deletions

View File

@@ -5,9 +5,12 @@ import { isStable, latest } from '../php-version.js'
const packageSchema = Joi.array().items(
Joi.object({
version: Joi.string().required(),
require: Joi.object({
php: Joi.string(),
}),
require: Joi.alternatives(
Joi.object({
php: Joi.string(),
}).required(),
Joi.string().valid('__unset')
),
})
)

View File

@@ -3,7 +3,6 @@ import { renderVersionBadge } from '../version.js'
import { optionalUrl } from '../validators.js'
import { redirector } from '../index.js'
import {
allVersionsSchema,
keywords,
BasePackagistService,
customServerDocumentationFragment,
@@ -84,7 +83,7 @@ class PackagistVersion extends BasePackagistService {
const json = await this.fetch({
user,
repo,
schema: includePrereleases ? schema : allVersionsSchema,
schema,
server,
})
const versions = json.packages[this.getPackageName(user, repo)]