From 1d86d9d91b5a26e8c5e36b8daa7f6b814c637725 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 May 2019 13:40:43 +0200 Subject: v3.95.0 from Fedora --- composer.json | 3 ++- php-aws-sdk3.spec | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ca5dc4b..20e3353 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "aws/aws-php-sns-message-validator": "~1.0", "nette/neon": "^2.3", "andrewsville/php-token-reflection": "^1.4", - "psr/cache": "^1.0" + "psr/cache": "^1.0", + "psr/simple-cache": "^1.0" }, "suggest": { "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", diff --git a/php-aws-sdk3.spec b/php-aws-sdk3.spec index 0924b60..58d8b8f 100644 --- a/php-aws-sdk3.spec +++ b/php-aws-sdk3.spec @@ -12,8 +12,8 @@ %global github_owner aws %global github_name aws-sdk-php -%global github_version 3.91.0 -%global github_commit b33f6ed79c207f5dfd38f187337a31e4c7619699 +%global github_version 3.95.0 +%global github_commit ae8bb13c2f53d0f6779bafde8a10e4b857263ad7 %global composer_vendor aws %global composer_project aws-sdk-php @@ -45,6 +45,9 @@ # "psr/cache": "^1.0" %global psr_cache_min_ver 1.0 %global psr_cache_max_ver 2.0 +# "psr/simple-cache": "^1.0" +%global psr_simple_cache_min_ver 1.0 +%global psr_simple_cache_max_ver 2.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -97,6 +100,7 @@ BuildRequires: (php-composer(andrewsville/php-token-reflection) >= %{tokenreflec BuildRequires: (php-composer(aws/aws-php-sns-message-validator) >= %{aws_sns_message_validator_min_ver} with php-composer(aws/aws-php-sns-message-validator) < %{aws_sns_message_validator_max_ver}) BuildRequires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver}) BuildRequires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) +BuildRequires: (php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} with php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver}) %else BuildRequires: php-composer(andrewsville/php-token-reflection) < %{tokenreflection_max_ver} BuildRequires: php-composer(andrewsville/php-token-reflection) >= %{tokenreflection_min_ver} @@ -106,6 +110,8 @@ BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver} BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver} +BuildRequires: php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver} +BuildRequires: php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} %endif BuildRequires: php-dom BuildRequires: php-json @@ -253,6 +259,7 @@ require_once '%{buildroot}%{phpdir}/Aws3/autoload.php'; \Fedora\Autoloader\Dependencies::required([ __DIR__.'/bootstrap.classmap.php', '%{phpdir}/Psr/Cache/autoload.php', + '%{phpdir}/Psr/SimpleCache/autoload.php', ]); class_alias('PHPUnit_Framework_Error_Warning', 'PHPUnit\\Framework\\Error\\Warning'); @@ -298,6 +305,7 @@ export AWS_SECRET_ACCESS_KEY=bar : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) +# TODO 7.4 PHP Fatal error: Method GuzzleHttp\Psr7\CachingStream::__toString() must not throw an exception for PHP_EXEC in "" php71 php72 php73; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT -d memory_limit=1G --verbose --testsuite=unit \ @@ -321,6 +329,9 @@ exit $RETURN_CODE %changelog +* Fri May 24 2019 Shawn Iwinski - 3.95.0-1 +- Update to 3.95.0 (RHBZ #1695281) + * Mon Apr 01 2019 Shawn Iwinski - 3.91.0-1 - Update to 3.91.0 (RHBZ #1680149) -- cgit