From 16746b88cf730d4ba661b3dbc9d7be35808a78c9 Mon Sep 17 00:00:00 2001 From: Scott Aubrey Date: Thu, 7 Nov 2024 15:15:54 +0000 Subject: [PATCH 1/2] Update to latest stable versions of eLife libraries --- composer.json | 10 ++-- composer.lock | 144 +++++++++++++++++++++++--------------------------- 2 files changed, 72 insertions(+), 82 deletions(-) diff --git a/composer.json b/composer.json index 6253680d..164530b0 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,13 @@ "doctrine/cache": "^1.6", "elasticsearch/elasticsearch": "^7.11", "elife/api": "^2.30", - "elife/api-client": "dev-master", + "elife/api-client": "^1.0", "elife/api-problem": "^1.1", - "elife/api-sdk": "^1.0@dev", - "elife/api-validator": "dev-master", - "elife/bus-sdk": "dev-master", + "elife/api-sdk": "dev-support-php-8.x", + "elife/api-validator": "^1.0", + "elife/bus-sdk": "^1.0", "elife/content-negotiator": "^1.0.3", - "elife/logging-sdk": "^1.0@dev", + "elife/logging-sdk": "^1.0", "elife/ping": "^1.0.1", "guzzlehttp/guzzle": "^6.3", "jms/serializer": "^1.5@dev", diff --git a/composer.lock b/composer.lock index f84fec28..709acf1f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c58befbbc1693db9c1b08aff807256e9", + "content-hash": "d8ec0d824aac035311d584478e2f1617", "packages": [ { "name": "aws/aws-crt-php", @@ -895,16 +895,16 @@ }, { "name": "elife/api-client", - "version": "dev-master", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/elifesciences/api-client-php.git", - "reference": "0129edae7dcf6018d629fa7ec2d4519009cec975" + "reference": "576268640729faa66d2ab1a0b2d942e3403243ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/api-client-php/zipball/0129edae7dcf6018d629fa7ec2d4519009cec975", - "reference": "0129edae7dcf6018d629fa7ec2d4519009cec975", + "url": "https://api.github.com/repos/elifesciences/api-client-php/zipball/576268640729faa66d2ab1a0b2d942e3403243ba", + "reference": "576268640729faa66d2ab1a0b2d942e3403243ba", "shasum": "" }, "require": { @@ -912,12 +912,12 @@ "composer/package-versions-deprecated": "1.11.99.2", "crell/api-problem": "^3.6", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.0", - "php": "^7.1", + "guzzlehttp/psr7": "^1.0 || ^2.7", + "php": "^7.1 || ^8.0", "psr/http-message": "^1.0" }, "require-dev": { - "guzzlehttp/guzzle": "^6.0", + "guzzlehttp/guzzle": "^6.0 || ^7.0", "mtdowling/jmespath.php": "^2.0", "phpspec/phpspec": "^5.1 || ^6.3 || ^7.5", "phpspec/prophecy": "^1.10", @@ -931,13 +931,7 @@ "mtdowling/jmespath.php": "^2.0, to use the Result::search() method", "psr/log": "^1.0, to use the WarningCheckingHttpClient adapter" }, - "default-branch": true, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "eLife\\ApiClient\\": "./src" @@ -950,40 +944,40 @@ "description": "eLife Sciences API client", "support": { "issues": "https://github.com/elifesciences/api-client-php/issues", - "source": "https://github.com/elifesciences/api-client-php/tree/master" + "source": "https://github.com/elifesciences/api-client-php/tree/v1.1.0" }, - "time": "2024-10-18T07:00:08+00:00" + "time": "2024-11-07T14:19:35+00:00" }, { "name": "elife/api-problem", - "version": "1.2.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/elifesciences/api-problem-php.git", - "reference": "51f8e6fb3b5f78fab5b2a31b6ee51b132e38a635" + "reference": "167d17407b1fddc5af9639f4708461bbd937da30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/api-problem-php/zipball/51f8e6fb3b5f78fab5b2a31b6ee51b132e38a635", - "reference": "51f8e6fb3b5f78fab5b2a31b6ee51b132e38a635", + "url": "https://api.github.com/repos/elifesciences/api-problem-php/zipball/167d17407b1fddc5af9639f4708461bbd937da30", + "reference": "167d17407b1fddc5af9639f4708461bbd937da30", "shasum": "" }, "require": { "crell/api-problem": "^3.6", - "php": ">=7.0", - "symfony/http-foundation": ">=2.8.52 || ^4.0" + "php": "^7.1 || ^8.0", + "symfony/http-foundation": ">=2.8.52 || ^4.4" }, "conflict": { "sebastian/comparator": "<1.2.3" }, "require-dev": { "guzzlehttp/psr7": "^1.0", - "phpunit/phpunit": "^5.7.7 || ^6.0", + "phpunit/phpunit": "^7.5 || ^9.6", "pimple/pimple": "^3.0", - "silex/silex": "^2.0", + "silex/silex": "^2.3", "squizlabs/php_codesniffer": "^3.10", - "symfony/browser-kit": "^2.7 || ^3.0", - "symfony/http-kernel": "^2.7 || ^3.0" + "symfony/browser-kit": "^3.0 || ^4.4", + "symfony/http-kernel": "^3.0 || ^4.4" }, "suggest": { "silex/silex": "^2.0, to use ApiProblemProvider" @@ -1006,29 +1000,30 @@ "description": "eLife Sciences RFC 7807 handler", "support": { "issues": "https://github.com/elifesciences/api-problem-php/issues", - "source": "https://github.com/elifesciences/api-problem-php/tree/1.2.0" + "source": "https://github.com/elifesciences/api-problem-php/tree/v1.3.1" }, - "time": "2024-05-27T09:16:16+00:00" + "time": "2024-10-25T13:29:00+00:00" }, { "name": "elife/api-sdk", - "version": "dev-master", + "version": "dev-support-php-8.x", "source": { "type": "git", "url": "https://github.com/elifesciences/api-sdk-php.git", - "reference": "04301024471139499313520a6907369937bae67d" + "reference": "de3a9e37858d0e7b636cd5fc02bd23d62ea32ceb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/api-sdk-php/zipball/04301024471139499313520a6907369937bae67d", - "reference": "04301024471139499313520a6907369937bae67d", + "url": "https://api.github.com/repos/elifesciences/api-sdk-php/zipball/de3a9e37858d0e7b636cd5fc02bd23d62ea32ceb", + "reference": "de3a9e37858d0e7b636cd5fc02bd23d62ea32ceb", "shasum": "" }, "require": { "composer/package-versions-deprecated": "1.11.99.2", - "elife/api-client": "^1.0@dev", + "elife/api-client": "^1.1", "guzzlehttp/promises": "^1.0", - "php": "^7.1", + "guzzlehttp/psr7": "^1.7 || ^2.7", + "php": "^7.1 || ^8.0", "symfony/serializer": "^2.8.2 || ^3.0.2" }, "conflict": { @@ -1037,16 +1032,17 @@ "require-dev": { "csa/guzzle-cache-middleware": "^1.0", "elife/api": "^2.30", - "elife/api-validator": "^1.0@dev", + "elife/api-validator": "dev-support-php-8.x", "guzzlehttp/guzzle": "^6.0", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "mindplay/composer-locator": "^2.1.1", "mtdowling/jmespath.php": "^2.0", - "phpunit/phpunit": "^5.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.5", + "phpspec/prophecy": "^1.10", + "phpunit/phpunit": "^7.5 || 9.6", "psr/http-message": "^1.0", "squizlabs/php_codesniffer": "^3.5" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -1065,22 +1061,22 @@ "description": "eLife Sciences API SDK", "support": { "issues": "https://github.com/elifesciences/api-sdk-php/issues", - "source": "https://github.com/elifesciences/api-sdk-php/tree/master" + "source": "https://github.com/elifesciences/api-sdk-php/tree/support-php-8.x" }, - "time": "2024-10-18T07:38:31+00:00" + "time": "2024-11-07T14:53:24+00:00" }, { "name": "elife/api-validator", - "version": "dev-master", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/elifesciences/api-validator-php.git", - "reference": "b70d55f4b52adeefc83830f92fe571bbaa510461" + "reference": "62e51f1911f9544ffcac5d38958dbaef4325047a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/api-validator-php/zipball/b70d55f4b52adeefc83830f92fe571bbaa510461", - "reference": "b70d55f4b52adeefc83830f92fe571bbaa510461", + "url": "https://api.github.com/repos/elifesciences/api-validator-php/zipball/62e51f1911f9544ffcac5d38958dbaef4325047a", + "reference": "62e51f1911f9544ffcac5d38958dbaef4325047a", "shasum": "" }, "require": { @@ -1096,7 +1092,6 @@ "phpunit/phpunit": "^5.2", "squizlabs/php_codesniffer": "^3.5" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -1115,45 +1110,44 @@ "description": "eLife Sciences API validator", "support": { "issues": "https://github.com/elifesciences/api-validator-php/issues", - "source": "https://github.com/elifesciences/api-validator-php/tree/master" + "source": "https://github.com/elifesciences/api-validator-php/tree/v1.0.0" }, - "time": "2021-03-09T20:14:39+00:00" + "time": "2024-10-18T07:21:27+00:00" }, { "name": "elife/bus-sdk", - "version": "dev-master", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/elifesciences/bus-sdk-php.git", - "reference": "6a0b51d9d554b2bd3ab2f62ab2fbfdcdc5094c51" + "reference": "50e20576827e87549e4c2552c79a8cd01ea922c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/bus-sdk-php/zipball/6a0b51d9d554b2bd3ab2f62ab2fbfdcdc5094c51", - "reference": "6a0b51d9d554b2bd3ab2f62ab2fbfdcdc5094c51", + "url": "https://api.github.com/repos/elifesciences/bus-sdk-php/zipball/50e20576827e87549e4c2552c79a8cd01ea922c4", + "reference": "50e20576827e87549e4c2552c79a8cd01ea922c4", "shasum": "" }, "require": { "aws/aws-sdk-php": "^3.238", "doctrine/cache": "^1.6", - "elife/api-sdk": "^1.0", - "elife/logging-sdk": "^1.0", - "jms/serializer": "^1.4", - "php": "^7.0", + "elife/api-sdk": "dev-support-php-8.x", + "elife/logging-sdk": "^1.1", + "jms/serializer": "^1.4 || ^3.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0" }, "conflict": { "sebastian/comparator": "<1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^6.5 | ^9.5", "squizlabs/php_codesniffer": "^3.5", "symfony/console": "^2.7 || ^3.2" }, "suggest": { "symfony/console": "^2.7 || ^3.2, to use Command classes" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -1172,9 +1166,9 @@ "description": "eLife Sciences Bus SDK", "support": { "issues": "https://github.com/elifesciences/bus-sdk-php/issues", - "source": "https://github.com/elifesciences/bus-sdk-php/tree/master" + "source": "https://github.com/elifesciences/bus-sdk-php/tree/v1.1.1" }, - "time": "2022-10-12T13:29:26+00:00" + "time": "2024-10-25T05:51:45+00:00" }, { "name": "elife/content-negotiator", @@ -1235,36 +1229,36 @@ }, { "name": "elife/logging-sdk", - "version": "dev-master", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/elifesciences/logging-sdk-php.git", - "reference": "dfdd87eb422d36f9e82c3066ad05abb2d199a68b" + "reference": "74885b9a81c865e889769e5aa37d1e910f1624f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/logging-sdk-php/zipball/dfdd87eb422d36f9e82c3066ad05abb2d199a68b", - "reference": "dfdd87eb422d36f9e82c3066ad05abb2d199a68b", + "url": "https://api.github.com/repos/elifesciences/logging-sdk-php/zipball/74885b9a81c865e889769e5aa37d1e910f1624f8", + "reference": "74885b9a81c865e889769e5aa37d1e910f1624f8", "shasum": "" }, "require": { "monolog/monolog": "^1.22", - "php": "^7.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0" }, "require-dev": { - "crell/api-problem": "^2.0", + "crell/api-problem": "^2.0 || ^3.0", "elife/api-problem": "^1.0", - "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^5.7.7 || ^6.0", + "mikey179/vfsstream": "^1.6.11", + "phpunit/phpunit": "^7.5 || ^9.6", "pimple/pimple": "^3.0", - "silex/silex": "^2.0", - "symfony/browser-kit": "^3.0", - "symfony/debug": "^2.8 || ^3.0", - "symfony/http-kernel": "^2.7 || ^3.0" + "silex/silex": "^2.2", + "squizlabs/php_codesniffer": "^3.5", + "symfony/browser-kit": "^3.4", + "symfony/debug": "^3.4", + "symfony/http-kernel": "^3.4" }, "suggest": { - "ext/newrelic": "Enables the Monitoring class", "silex/silex": "^2.0, to use LoggerProvider" }, "type": "library", @@ -1285,9 +1279,9 @@ "description": "eLife Sciences logging SDK", "support": { "issues": "https://github.com/elifesciences/logging-sdk-php/issues", - "source": "https://github.com/elifesciences/logging-sdk-php/tree/master" + "source": "https://github.com/elifesciences/logging-sdk-php/tree/v1.1.1" }, - "time": "2018-03-15T10:08:12+00:00" + "time": "2024-10-25T13:31:24+00:00" }, { "name": "elife/ping", @@ -7064,11 +7058,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "elife/api-client": 20, "elife/api-sdk": 20, - "elife/api-validator": 20, - "elife/bus-sdk": 20, - "elife/logging-sdk": 20, "jms/serializer": 20 }, "prefer-stable": false, From 59a52ae763b850c618d71747461e410780d88709 Mon Sep 17 00:00:00 2001 From: Scott Aubrey Date: Thu, 7 Nov 2024 17:02:35 +0000 Subject: [PATCH 2/2] support latest stable version of api-sdk --- composer.json | 2 +- composer.lock | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 164530b0..357a6566 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "elife/api": "^2.30", "elife/api-client": "^1.0", "elife/api-problem": "^1.1", - "elife/api-sdk": "dev-support-php-8.x", + "elife/api-sdk": "dev-master", "elife/api-validator": "^1.0", "elife/bus-sdk": "^1.0", "elife/content-negotiator": "^1.0.3", diff --git a/composer.lock b/composer.lock index 709acf1f..1cecc728 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8ec0d824aac035311d584478e2f1617", + "content-hash": "3045e7e3c66554d83b86cec3de5d6d38", "packages": [ { "name": "aws/aws-crt-php", @@ -1006,23 +1006,23 @@ }, { "name": "elife/api-sdk", - "version": "dev-support-php-8.x", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/elifesciences/api-sdk-php.git", - "reference": "de3a9e37858d0e7b636cd5fc02bd23d62ea32ceb" + "reference": "8c3ca7dd8d4dfb2c3b6bd25a19cd245c6c025e6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/api-sdk-php/zipball/de3a9e37858d0e7b636cd5fc02bd23d62ea32ceb", - "reference": "de3a9e37858d0e7b636cd5fc02bd23d62ea32ceb", + "url": "https://api.github.com/repos/elifesciences/api-sdk-php/zipball/8c3ca7dd8d4dfb2c3b6bd25a19cd245c6c025e6f", + "reference": "8c3ca7dd8d4dfb2c3b6bd25a19cd245c6c025e6f", "shasum": "" }, "require": { "composer/package-versions-deprecated": "1.11.99.2", - "elife/api-client": "^1.1", + "elife/api-client": "^1.0", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.7 || ^2.7", + "guzzlehttp/psr7": "^1.0", "php": "^7.1 || ^8.0", "symfony/serializer": "^2.8.2 || ^3.0.2" }, @@ -1032,17 +1032,18 @@ "require-dev": { "csa/guzzle-cache-middleware": "^1.0", "elife/api": "^2.30", - "elife/api-validator": "dev-support-php-8.x", + "elife/api-validator": "^1.0", "guzzlehttp/guzzle": "^6.0", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "mindplay/composer-locator": "^2.1.1", "mtdowling/jmespath.php": "^2.0", "phpspec/phpspec": "^5.1 || ^6.3 || ^7.5", "phpspec/prophecy": "^1.10", - "phpunit/phpunit": "^7.5 || 9.6", + "phpunit/phpunit": "^7.5 || ^9.6", "psr/http-message": "^1.0", "squizlabs/php_codesniffer": "^3.5" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -1061,9 +1062,9 @@ "description": "eLife Sciences API SDK", "support": { "issues": "https://github.com/elifesciences/api-sdk-php/issues", - "source": "https://github.com/elifesciences/api-sdk-php/tree/support-php-8.x" + "source": "https://github.com/elifesciences/api-sdk-php/tree/master" }, - "time": "2024-11-07T14:53:24+00:00" + "time": "2024-11-07T16:58:39+00:00" }, { "name": "elife/api-validator", @@ -1116,22 +1117,22 @@ }, { "name": "elife/bus-sdk", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/elifesciences/bus-sdk-php.git", - "reference": "50e20576827e87549e4c2552c79a8cd01ea922c4" + "reference": "3fb22e93f4f371af5227e8e1f14b42e362b77dcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/bus-sdk-php/zipball/50e20576827e87549e4c2552c79a8cd01ea922c4", - "reference": "50e20576827e87549e4c2552c79a8cd01ea922c4", + "url": "https://api.github.com/repos/elifesciences/bus-sdk-php/zipball/3fb22e93f4f371af5227e8e1f14b42e362b77dcd", + "reference": "3fb22e93f4f371af5227e8e1f14b42e362b77dcd", "shasum": "" }, "require": { "aws/aws-sdk-php": "^3.238", "doctrine/cache": "^1.6", - "elife/api-sdk": "dev-support-php-8.x", + "elife/api-sdk": "dev-master", "elife/logging-sdk": "^1.1", "jms/serializer": "^1.4 || ^3.0", "php": "^7.1 || ^8.0", @@ -1166,9 +1167,9 @@ "description": "eLife Sciences Bus SDK", "support": { "issues": "https://github.com/elifesciences/bus-sdk-php/issues", - "source": "https://github.com/elifesciences/bus-sdk-php/tree/v1.1.1" + "source": "https://github.com/elifesciences/bus-sdk-php/tree/v1.1.2" }, - "time": "2024-10-25T05:51:45+00:00" + "time": "2024-11-07T17:01:10+00:00" }, { "name": "elife/content-negotiator",