diff options
| -rw-r--r-- | composer.json | 21 | ||||
| -rw-r--r-- | php-symfony-psr-http-message-bridge.spec | 53 |
2 files changed, 29 insertions, 45 deletions
diff --git a/composer.json b/composer.json index 76513b1..c1eb5fb 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "symfony/psr-http-message-bridge", "type": "symfony-bridge", "description": "PSR HTTP message bridge", - "keywords": ["http", "psr-7", "http-message"], + "keywords": ["http", "psr-7", "psr-17", "http-message"], "homepage": "http://symfony.com", "license": "MIT", "authors": [ @@ -16,24 +16,25 @@ } ], "require": { - "php": ">=5.3.3", - "psr/http-message": "~1.0", - "symfony/http-foundation": "~2.3|~3.0|~4.0" + "php": "^5.3.3 || ^7.0", + "psr/http-message": "^1.0", + "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0" }, "require-dev": { - "symfony/phpunit-bridge": "~3.2|4.0" + "symfony/phpunit-bridge": "^3.4 || ^4.0" }, "suggest": { - "psr/http-message-implementation": "To use the HttpFoundation factory", - "zendframework/zend-diactoros": "To use the Zend Diactoros factory" + "nyholm/psr7": "For a super lightweight PSR-7/17 implementation" }, "autoload": { - "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" } + "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] }, - "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } } } diff --git a/php-symfony-psr-http-message-bridge.spec b/php-symfony-psr-http-message-bridge.spec index d8ab02f..14b98fb 100644 --- a/php-symfony-psr-http-message-bridge.spec +++ b/php-symfony-psr-http-message-bridge.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-symfony-psr-http-message-bridge # -# Copyright (c) 2015-2018 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,28 +12,25 @@ %global github_owner symfony %global github_name psr-http-message-bridge -%global github_version 1.0.2 -%global github_commit c2b757934f2d9681a287e662efbc27c41fe8ef86 +%global github_version 1.1.2 +%global github_commit a33352af16f78a5ff4f9d90811536abf210df12b %global composer_vendor symfony %global composer_project psr-http-message-bridge -# "php": ">=5.3.3", +# "php": "^5.3.3 || ^7.0" %global php_min_ver 5.3.3 -# "psr/http-message": "~1.0" +# "psr/http-message": "^1.0" %global psr_http_message_min_ver 1.0 %global psr_http_message_max_ver 2.0 -# "symfony/http-foundation": "~2.3|~3.0|~4.0" -# NOTE: Min version not 2.3 because autoloader required -%global symfony_min_ver %{?el6:2.3.31}%{!?el6:2.7.1} +# "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0" +%global symfony_min_ver %{?el6:2.3.42}%{!?el6:2.7.1} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 %global symfony_max_ver 5.0 %else %global symfony_max_ver 4.0 %endif -%global with_zend_diactoros 0%{!?el6:1} - # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -41,10 +38,9 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Symfony PSR HTTP message bridge -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -52,9 +48,6 @@ Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu BuildArch: noarch # Tests %if %{with_tests} -%if %{with_zend_diactoros} -BuildRequires: php-composer(zendframework/zend-diactoros) -%endif BuildRequires: php-composer(phpunit/phpunit) ## composer.json BuildRequires: php(language) >= %{php_min_ver} @@ -65,8 +58,9 @@ BuildRequires: (php-composer(symfony/http-foundation) >= %{symfony_min_ver} with BuildRequires: php-composer(psr/http-message) < %{psr_http_message_max_ver} BuildRequires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} BuildRequires: php-composer(symfony/http-foundation) < %{symfony_max_ver} +#BuildRequires: php-composer(symfony/http-foundation) >= %%{symfony_min_ver} %endif -## phpcompatinfo (computed from version 1.0.2) +## phpcompatinfo (computed from version 1.1.2) BuildRequires: php-date BuildRequires: php-reflection BuildRequires: php-spl @@ -83,21 +77,14 @@ Requires: (php-composer(symfony/http-foundation) >= %{symfony_min_ver} with Requires: php-composer(psr/http-message) < %{psr_http_message_max_ver} Requires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} Requires: php-composer(symfony/http-foundation) < %{symfony_max_ver} +#Requires: php-composer(symfony/http-foundation) >= %%{symfony_min_ver} %endif -# phpcompatinfo (computed from version 1.0.2) +# phpcompatinfo (computed from version 1.1.2) Requires: php-date Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) -# Weak dependencies -%if 0%{?fedora} >= 21 -Suggests: php-composer(psr/http-message-implementation) -%if %{with_zend_diactoros} -Suggests: php-composer(zendframework/zend-diactoros) -%endif -%endif - # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -133,15 +120,6 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; )); AUTOLOAD -%if %{with_zend_diactoros} -cat <<'AUTOLOAD' | tee -a autoload.php - -\Fedora\Autoloader\Dependencies::optional(array( - '%{phpdir}/Zend/Diactoros/autoload.php', -)); -AUTOLOAD -%endif - %install mkdir -p %{buildroot}%{phpdir}/Symfony/Bridge/PsrHttpMessage @@ -162,7 +140,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55 php56 php70} php71 php72; do +for PHP_EXEC in "" %{?rhel:php54 php55 php56 php70} php71 php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -184,6 +162,11 @@ exit $RETURN_CODE %changelog +* Wed May 15 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.1.2-1 +- Update to 1.1.2 +- Remove php-composer(zendframework/zend-diactoros) interoperability (no longer + suggested in composer.json) + * Sun Apr 22 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.2-2 - Fix el6 tests |