From 542e2e81d8ba6ff10f4683408bb6f430b1596469 Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Thu, 10 Jun 2021 09:57:40 +0200
Subject: [PATCH] refs #19868 [fid_bbi] adapt boss config
* use latest finc/boss-module version and update composer.lock
* use getCleanISBN to avoid erroneous request URLs
---
composer.local.2.fid-bbi.json | 2 +-
composer.lock | 140 +++++++++++++++++++++------------
fid_bbi/config/vufind/boss.ini | 2 +-
3 files changed, 92 insertions(+), 52 deletions(-)
diff --git a/composer.local.2.fid-bbi.json b/composer.local.2.fid-bbi.json
index 2e9774aac3a..48a1c665577 100644
--- a/composer.local.2.fid-bbi.json
+++ b/composer.local.2.fid-bbi.json
@@ -5,7 +5,7 @@
}
},
"require": {
- "finc/boss-module": "^0.0.13",
+ "finc/boss-module": "^2.0.0",
"finc/dbis-module": "^3.0.0",
"finc/worldcat-search-module": "^0.0.5"
},
diff --git a/composer.lock b/composer.lock
index bf43c0dc3d1..6824334bf9d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -58,6 +58,10 @@
"user agent",
"useragent"
],
+ "support": {
+ "issues": "https://github.com/ahand/mobileesp/issues",
+ "source": "https://github.com/ahand/mobileesp/"
+ },
"time": "2017-06-06T22:20:56+00:00"
},
{
@@ -510,11 +514,11 @@
},
{
"name": "finc/boss-module",
- "version": "v0.0.13",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://git.sc.uni-leipzig.de/ubl/finc/fid/boss-module.git",
- "reference": "a6e42fac0d6bac6d708694363523b747773fc357"
+ "reference": "5621afcf8bc3cb737e2336057d7d408d4e0bf84a"
},
"require": {
"ext-json": "*",
@@ -549,7 +553,7 @@
}
],
"description": "Module for BOSS Webservice",
- "time": "2020-01-20T11:27:19+00:00"
+ "time": "2021-06-08T07:04:09+00:00"
},
{
"name": "finc/dbis-module",
@@ -821,10 +825,6 @@
"MIT"
],
"authors": [
- {
- "name": "Balázs Németh",
- "email": "zsilbi@zsilbi.hu"
- },
{
"name": "Ghislain de Fontenay",
"homepage": "http://www.ghislainf.me/",
@@ -834,6 +834,10 @@
"name": "Filipe Dobreira",
"homepage": "https://github.com/filp"
},
+ {
+ "name": "Balázs Németh",
+ "email": "zsilbi@zsilbi.hu"
+ },
{
"name": "Andreas Frömer",
"homepage": "https://github.com/icanhazstring"
@@ -841,20 +845,24 @@
],
"description": "PHP whoops error on ZF2 framework",
"homepage": "https://github.com/ghislainf/zf2-whoops",
+ "support": {
+ "issues": "https://github.com/ghislainf/zf2-whoops/issues",
+ "source": "https://github.com/ghislainf/zf2-whoops/tree/master"
+ },
"time": "2016-06-06T08:41:08+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "1.6.1",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+ "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
+ "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
"shasum": ""
},
"require": {
@@ -867,15 +875,15 @@
},
"require-dev": {
"ext-zlib": "*",
- "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
},
"suggest": {
- "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -912,7 +920,7 @@
"uri",
"url"
],
- "time": "2019-07-01T23:21:34+00:00"
+ "time": "2021-04-26T09:17:50+00:00"
},
{
"name": "jasig/phpcas",
@@ -1216,6 +1224,11 @@
}
],
"description": "Map nested JSON structures onto PHP classes",
+ "support": {
+ "email": "cweiske@cweiske.de",
+ "issues": "https://github.com/cweiske/jsonmapper/issues",
+ "source": "https://github.com/cweiske/jsonmapper/tree/master"
+ },
"time": "2019-08-15T19:41:25+00:00"
},
{
@@ -1939,6 +1952,10 @@
}
],
"description": "More info available on: http://pear.php.net/package/Validate_ISPN",
+ "support": {
+ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Validate_ISPN",
+ "source": "https://github.com/pear/Validate_ISPN"
+ },
"time": "2015-04-14T04:17:31+00:00"
},
{
@@ -2631,6 +2648,11 @@
"jCard",
"vCard"
],
+ "support": {
+ "forum": "https://groups.google.com/group/sabredav-discuss",
+ "issues": "https://github.com/sabre-io/vobject/issues",
+ "source": "https://github.com/fruux/sabre-vobject"
+ },
"time": "2016-10-07T03:20:40+00:00"
},
{
@@ -2825,6 +2847,9 @@
],
"description": "Symfony ExpressionLanguage Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/expression-language/tree/v3.4.35"
+ },
"time": "2019-10-24T15:33:53+00:00"
},
{
@@ -2929,32 +2954,30 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/http-foundation/tree/3.4"
+ },
"time": "2019-11-28T12:52:59+00:00"
},
{
"name": "symfony/inflector",
- "version": "v3.4.21",
+ "version": "v4.4.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
- "reference": "71ea67b4843bc668c17302ac79fa6f61437487bb"
+ "reference": "fc695ab721136b27aa84427a0fa80189761266ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/inflector/zipball/71ea67b4843bc668c17302ac79fa6f61437487bb",
- "reference": "71ea67b4843bc668c17302ac79fa6f61437487bb",
+ "url": "https://api.github.com/repos/symfony/inflector/zipball/fc695ab721136b27aa84427a0fa80189761266ef",
+ "reference": "fc695ab721136b27aa84427a0fa80189761266ef",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8",
+ "php": ">=7.1.3",
"symfony/polyfill-ctype": "~1.8"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
"autoload": {
"psr-4": {
"Symfony\\Component\\Inflector\\": ""
@@ -2977,7 +3000,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Inflector Component",
+ "description": "Converts words between their singular and plural forms (English only)",
"homepage": "https://symfony.com",
"keywords": [
"inflection",
@@ -2987,7 +3010,8 @@
"symfony",
"words"
],
- "time": "2019-01-01T13:45:19+00:00"
+ "abandoned": "use `EnglishInflector` from the String component instead",
+ "time": "2021-05-26T17:39:37+00:00"
},
{
"name": "symfony/options-resolver",
@@ -3101,20 +3125,20 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.10.0",
+ "version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+ "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-ctype": "For best performance"
@@ -3122,7 +3146,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-main": "1.23-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -3138,13 +3166,13 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- },
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for ctype functions",
@@ -3155,7 +3183,7 @@
"polyfill",
"portable"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -3345,16 +3373,16 @@
},
{
"name": "symfony/property-info",
- "version": "v3.4.35",
+ "version": "v3.4.47",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-info.git",
- "reference": "5248becda0a0554ca4ae982825f012076f9e66a6"
+ "reference": "a5f1e77c881342a5b1e05fdc12642650853bd112"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/property-info/zipball/5248becda0a0554ca4ae982825f012076f9e66a6",
- "reference": "5248becda0a0554ca4ae982825f012076f9e66a6",
+ "url": "https://api.github.com/repos/symfony/property-info/zipball/a5f1e77c881342a5b1e05fdc12642650853bd112",
+ "reference": "a5f1e77c881342a5b1e05fdc12642650853bd112",
"shasum": ""
},
"require": {
@@ -3380,11 +3408,6 @@
"symfony/serializer": "To use Serializer metadata"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
"autoload": {
"psr-4": {
"Symfony\\Component\\PropertyInfo\\": ""
@@ -3417,7 +3440,7 @@
"type",
"validator"
],
- "time": "2019-10-11T04:14:16+00:00"
+ "time": "2020-10-24T10:57:07+00:00"
},
{
"name": "symfony/serializer",
@@ -3807,12 +3830,12 @@
"version": "1.4.0",
"source": {
"type": "git",
- "url": "https://github.com/webmozart/assert.git",
+ "url": "https://github.com/webmozarts/assert.git",
"reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
"reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
"shasum": ""
},
@@ -5017,6 +5040,14 @@
"translations",
"zf"
],
+ "support": {
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "docs": "https://docs.zendframework.com/zend-i18n-resources/",
+ "forum": "https://discourse.zendframework.com/c/questions/components",
+ "issues": "https://github.com/zendframework/zend-i18n-resources/issues",
+ "rss": "https://github.com/zendframework/zend-i18n-resources/releases.atom",
+ "source": "https://github.com/zendframework/zend-i18n-resources"
+ },
"abandoned": "laminas/laminas-i18n-resources",
"time": "2019-06-25T01:21:12+00:00"
},
@@ -8857,6 +8888,9 @@
"interoperability",
"standards"
],
+ "support": {
+ "source": "https://github.com/symfony/cache-contracts/tree/master"
+ },
"time": "2019-10-04T21:43:27+00:00"
},
{
@@ -9444,6 +9478,9 @@
"interoperability",
"standards"
],
+ "support": {
+ "source": "https://github.com/symfony/service-contracts/tree/v1.1.8"
+ },
"time": "2019-10-14T12:27:06+00:00"
},
{
@@ -9553,6 +9590,9 @@
"instantiate",
"serialize"
],
+ "support": {
+ "source": "https://github.com/symfony/var-exporter/tree/v4.3.8"
+ },
"time": "2019-11-11T12:48:54+00:00"
},
{
diff --git a/fid_bbi/config/vufind/boss.ini b/fid_bbi/config/vufind/boss.ini
index b8b2cfe50fe..6f5c6fa7f2e 100644
--- a/fid_bbi/config/vufind/boss.ini
+++ b/fid_bbi/config/vufind/boss.ini
@@ -44,4 +44,4 @@ swissbib = "https://www.swissbib.ch/Search/Results?lookfor=%s&type=ISN"
sequence[] = zdb
sequence[] = isbn
zdb = getZdbId
-isbn = getISBNs
+isbn = getCleanISBN
--
GitLab