From 2be94bd93ce8c324a6ac9f9aeba2072d660f21fa Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Fri, 15 Nov 2019 13:24:56 +0100
Subject: [PATCH] refs #16236 [fid_bbi] comptibility update for compser.json
structure
* updates composer.lock
* updates npnm-shrinkwrap.json
---
composer.lock | 549 +++++++++++++++++++++++++++++++++++++++++++-
npm-shrinkwrap.json | 8 +-
2 files changed, 552 insertions(+), 5 deletions(-)
diff --git a/composer.lock b/composer.lock
index b4904fd4098..8672d7fa461 100644
--- a/composer.lock
+++ b/composer.lock
@@ -577,6 +577,124 @@
"description": "Reusable adapters for usage with zend-serializer.",
"time": "2019-05-07T12:27:13+00:00"
},
+ {
+ "name": "finc/vufindhttp-psrcompat",
+ "version": "v0.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://git.sc.uni-leipzig.de/ubl/finc/fid/vufindhttp-psrcompat.git",
+ "reference": "462ebd51d69f3e81e6c2167dda05f7ffa18fa942"
+ },
+ "require": {
+ "finc/zend-psr18bridge": "~0.0.1",
+ "php": "^7.1",
+ "vufind-org/vufindhttp": "~2.1"
+ },
+ "require-dev": {
+ "bamarni/composer-bin-plugin": "^1.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "finc\\VuFindHttpPsrCompat\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Kehr",
+ "email": "kehr@ub.uni-leipzig.de"
+ }
+ ],
+ "description": "PSR compatibility layer for vufind-org/vufindhttp",
+ "time": "2019-06-13T10:58:08+00:00"
+ },
+ {
+ "name": "finc/worldcat-search-module",
+ "version": "v0.0.4",
+ "source": {
+ "type": "git",
+ "url": "https://git.sc.uni-leipzig.de/ubl/finc/fid/worldcat-search-module.git",
+ "reference": "6a5d4f706406f079cbf6ea2a96f248a62b938c26"
+ },
+ "require": {
+ "finc/vufindhttp-psrcompat": "^0.0",
+ "guzzlehttp/psr7": "^1.4",
+ "netresearch/jsonmapper": "^1.4",
+ "php": ">=7.1",
+ "psr/http-client": "^1.0"
+ },
+ "require-dev": {
+ "http-interop/http-factory-guzzle": "^1.0",
+ "php-http/guzzle6-adapter": "^2.0",
+ "php-http/mock-client": "^1.2"
+ },
+ "type": "library",
+ "extra": {
+ "vufind": {
+ "themes": {
+ "res/theme": "worldcat"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "finc\\WorldCat\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Gregor Gawol",
+ "email": "gawol@ub.uni-leipzig.de"
+ },
+ {
+ "name": "Sebastian Kehr",
+ "email": "kehr@ub.uni-leipzig.de"
+ }
+ ],
+ "description": "Worldcat Search Module",
+ "time": "2019-09-02T16:28:35+00:00"
+ },
+ {
+ "name": "finc/zend-psr18bridge",
+ "version": "v0.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://git.sc.uni-leipzig.de/ubl/finc/fid/zend-psr18bridge.git",
+ "reference": "6f97dd4c6949e44c144631bf428f48d4298149b8"
+ },
+ "require": {
+ "php": "^7.1",
+ "psr/http-client": "^1.0",
+ "psr/http-message": "^1.0",
+ "zendframework/zend-psr7bridge": "^1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "finc\\ZendPsr18Bridge\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Kehr",
+ "email": "kehr@ub.uni-leipzig.de"
+ }
+ ],
+ "description": "PSR 18 compatibility for zend-http clients.",
+ "time": "2019-03-15T09:49:28+00:00"
+ },
{
"name": "ghislainf/zf2-whoops",
"version": "dev-master",
@@ -635,6 +753,77 @@
"homepage": "https://github.com/ghislainf/zf2-whoops",
"time": "2016-06-06T08:41:08+00:00"
},
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "1.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+ "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0",
+ "psr/http-message": "~1.0",
+ "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "ext-zlib": "*",
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ },
+ "suggest": {
+ "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.6-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
+ }
+ ],
+ "description": "PSR-7 message implementation that also provides common utility methods",
+ "keywords": [
+ "http",
+ "message",
+ "psr-7",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "time": "2019-07-01T23:21:34+00:00"
+ },
{
"name": "jasig/phpcas",
"version": "1.3.6",
@@ -893,6 +1082,52 @@
],
"time": "2018-10-30T14:36:18+00:00"
},
+ {
+ "name": "netresearch/jsonmapper",
+ "version": "v1.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/cweiske/jsonmapper.git",
+ "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06",
+ "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-reflection": "*",
+ "ext-spl": "*",
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4",
+ "squizlabs/php_codesniffer": "~1.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "JsonMapper": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "OSL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Christian Weiske",
+ "email": "cweiske@cweiske.de",
+ "homepage": "http://github.com/cweiske/jsonmapper/",
+ "role": "Developer"
+ }
+ ],
+ "description": "Map nested JSON structures onto PHP classes",
+ "time": "2019-08-15T19:41:25+00:00"
+ },
{
"name": "ocramius/package-versions",
"version": "1.2.0",
@@ -1955,6 +2190,157 @@
],
"time": "2017-02-14T16:28:37+00:00"
},
+ {
+ "name": "psr/http-client",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-client.git",
+ "reference": "496a823ef742b632934724bf769560c2a5c7c44e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e",
+ "reference": "496a823ef742b632934724bf769560c2a5c7c44e",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP clients",
+ "homepage": "https://github.com/php-fig/http-client",
+ "keywords": [
+ "http",
+ "http-client",
+ "psr",
+ "psr-18"
+ ],
+ "time": "2018-10-30T23:29:13+00:00"
+ },
+ {
+ "name": "psr/http-factory",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2019-04-30T12:38:16+00:00"
+ },
+ {
+ "name": "psr/http-message",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2016-08-06T14:39:51+00:00"
+ },
{
"name": "psr/log",
"version": "1.1.0",
@@ -2050,6 +2436,46 @@
],
"time": "2017-10-23T01:57:42+00:00"
},
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "3.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^5 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "time": "2019-03-08T08:55:37+00:00"
+ },
{
"name": "sabre/vobject",
"version": "3.5.3",
@@ -3219,7 +3645,7 @@
{
"name": "David Maus",
"email": "maus@hab.de",
- "role": "Developer"
+ "role": "developer"
},
{
"name": "Demian Katz",
@@ -3784,6 +4210,73 @@
],
"time": "2018-04-09T13:21:36+00:00"
},
+ {
+ "name": "zendframework/zend-diactoros",
+ "version": "2.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-diactoros.git",
+ "reference": "de5847b068362a88684a55b0dbb40d85986cfa52"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/de5847b068362a88684a55b0dbb40d85986cfa52",
+ "reference": "de5847b068362a88684a55b0dbb40d85986cfa52",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "http-interop/http-factory-tests": "^0.5.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^7.0.2",
+ "zendframework/zend-coding-standard": "~1.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.1.x-dev",
+ "dev-develop": "2.2.x-dev",
+ "dev-release-1.8": "1.8.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php"
+ ],
+ "psr-4": {
+ "Zend\\Diactoros\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR HTTP Message implementations",
+ "keywords": [
+ "http",
+ "psr",
+ "psr-7"
+ ],
+ "time": "2019-11-13T19:16:13+00:00"
+ },
{
"name": "zendframework/zend-dom",
"version": "2.7.1",
@@ -5133,6 +5626,60 @@
],
"time": "2018-01-30T15:52:44+00:00"
},
+ {
+ "name": "zendframework/zend-psr7bridge",
+ "version": "1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-psr7bridge.git",
+ "reference": "99c558f96be01d535fc9692250312342d76d4098"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/99c558f96be01d535fc9692250312342d76d4098",
+ "reference": "99c558f96be01d535fc9692250312342d76d4098",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.6 || ^7.0",
+ "psr/http-message": "^1.0",
+ "zendframework/zend-diactoros": "^1.7 || ^2.0",
+ "zendframework/zend-http": "^2.7"
+ },
+ "conflict": {
+ "zendframework/zend-stdlib": "< 3.2.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7.15 || ^6.5.6",
+ "zendframework/zend-coding-standard": "~1.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev",
+ "dev-develop": "1.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Zend\\Psr7Bridge\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR-7 <-> zend-http message conversions",
+ "keywords": [
+ "ZendFramework",
+ "http",
+ "psr",
+ "psr-7",
+ "zend",
+ "zf"
+ ],
+ "time": "2018-12-20T16:48:40+00:00"
+ },
{
"name": "zendframework/zend-router",
"version": "3.2.0",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c5bcf73a96d..14eedc67299 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -7,7 +7,7 @@
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
- "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+ "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
},
"ajv": {
"version": "6.10.2",
@@ -41,7 +41,7 @@
"aproba": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
- "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+ "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
},
"are-we-there-yet": {
"version": "1.1.5",
@@ -1957,7 +1957,7 @@
"npmlog": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
- "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+ "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
"requires": {
"are-we-there-yet": "1.1.5",
"console-control-strings": "1.1.0",
@@ -2189,7 +2189,7 @@
"promise": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
- "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+ "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
"optional": true,
"requires": {
"asap": "2.0.6"
--
GitLab