From 3375c0fdd57e03b886c537cab53419ef6dab878e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 May 2023 08:29:12 +0200
Subject: update to 1.8.0

drop dependency on php-http/message-factory
---
 composer.json        |  8 ++++----
 php-nyholm-psr7.spec | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 470c937..c607615 100644
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,12 @@
     "require": {
         "php": ">=7.2",
         "psr/http-message": "^1.1 || ^2.0",
-        "php-http/message-factory": "^1.0",
         "psr/http-factory": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 || 8.5 || 9.4",
-        "php-http/psr7-integration-tests": "^1.0@dev",
+        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+        "php-http/message-factory": "^1.0",
+        "php-http/psr7-integration-tests": "^1.0",
         "http-interop/http-factory-tests": "^0.9",
         "symfony/error-handler": "^4.4"
     },
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7-dev"
+            "dev-master": "1.8-dev"
         }
     }
 }
diff --git a/php-nyholm-psr7.spec b/php-nyholm-psr7.spec
index 301076a..f82ec1c 100644
--- a/php-nyholm-psr7.spec
+++ b/php-nyholm-psr7.spec
@@ -8,7 +8,7 @@
 #
 %global bootstrap    0
 # github
-%global gh_commit    ed7cf98f6562831dbc3c962406b5e49dc8179c8c
+%global gh_commit    3cb4d163b58589e47b35103e8e5e6a6a475b47be
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     Nyholm
 %global gh_project   psr7
@@ -31,7 +31,7 @@
 %global http_factory_tests_short      %(c=%{http_factory_tests_commit}; echo ${c:0:7})
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        1.7.0
+Version:        1.8.0
 Release:        1%{?dist}
 Summary:        A fast PHP7 implementation of PSR-7
 
@@ -63,8 +63,9 @@ BuildRequires:  php-psr-http-factory
 BuildRequires:  php-symfony4-error-handler              >= 4.4
 %endif
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^7.5 || 8.5 || 9.4",
-#        "php-http/psr7-integration-tests": "^1.0@dev",
+#        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+#        "php-http/message-factory": "^1.0",
+#        "php-http/psr7-integration-tests": "^1.0",
 #        "http-interop/http-factory-tests": "^0.9",
 #        "symfony/error-handler": "^4.4"
 %global phpunit %{_bindir}/phpunit9
@@ -76,18 +77,15 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 # from composer.json, "require": {
 #        "php": ">=7.2",
 #        "psr/http-message": "^1.1 ||  || ^2.0",
-#        "php-http/message-factory": "^1.0",
 #        "psr/http-factory": "^1.0"
 Requires:       php(language) >= 7.2
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-composer(psr/http-message)          >= 1.1 with php-composer(psr/http-message)         < 3)
-Requires:      (php-composer(php-http/message-factory)  >= 1.0 with php-composer(php-http/message-factory) < 2)
 Requires:      (php-composer(psr/http-factory)          >= 1.0 with php-composer(psr/http-factory)         < 2)
-# remirepo:5
+# remirepo:4
 %else
 Requires:       php-psr-http-message                    >= 1.1
-Requires:       php-http-message-factory
 Requires:       php-psr-http-factory
 %endif
 # from phpcompatinfo report for version 1.1.0
@@ -122,7 +120,6 @@ cat << 'EOF' | tee -a src/autoload.php
         '%{_datadir}/php/Psr/Http/Message/autoload.php',
     ],
     '%{_datadir}/php/Http/Message/autoload.php',
-    '%{_datadir}/php/Psr/Http/Message/http-factory-autoload.php',
 ]);
 EOF
 
@@ -144,6 +141,7 @@ cat <<EOF | tee vendor/autoload.php
 <?php
 require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php';
 require_once '%{php_home}/Symfony4/Component/ErrorHandler/autoload.php';
+require_once '%{_datadir}/php/Psr/Http/Message/http-factory-autoload.php';
 require_once dirname(__DIR__) . '/test-autoload.php';
 EOF
 
@@ -180,6 +178,10 @@ exit $ret
 
 
 %changelog
+* Wed May  3 2023 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+- drop dependency on php-http/message-factory
+
 * Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 1.7.0-1
 - update to 1.7.0
 - raise dependency on psr/http-message 1.1 and allow 2.0
-- 
cgit