diff options
| -rw-r--r-- | composer.json | 60 | ||||
| -rw-r--r-- | php-zendframework-zend-mvc.spec | 79 |
2 files changed, 78 insertions, 61 deletions
diff --git a/composer.json b/composer.json index 983bfa5..4d740ed 100644 --- a/composer.json +++ b/composer.json @@ -1,33 +1,37 @@ { "name": "zendframework/zend-mvc", - "description": " ", + "description": "Zend Framework's event-driven MVC layer, including MVC Applications, Controllers, and Plugins", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "mvc" ], - "homepage": "https://github.com/zendframework/zend-mvc", - "autoload": { - "psr-4": { - "Zend\\Mvc\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-mvc/", + "issues": "https://github.com/zendframework/zend-mvc/issues", + "source": "https://github.com/zendframework/zend-mvc", + "rss": "https://github.com/zendframework/zend-mvc/releases.atom", + "slack": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "container-interop/container-interop": "^1.1", + "container-interop/container-interop": "^1.2", "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^3.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-router": "^3.0.1", - "zendframework/zend-servicemanager": "^3.0.3", - "zendframework/zend-stdlib": "^3.0", - "zendframework/zend-view": "^2.6.7" + "zendframework/zend-eventmanager": "^3.2", + "zendframework/zend-http": "^2.7", + "zendframework/zend-modulemanager": "^2.8", + "zendframework/zend-router": "^3.0.2", + "zendframework/zend-servicemanager": "^3.3", + "zendframework/zend-stdlib": "^3.1", + "zendframework/zend-view": "^2.9" }, "require-dev": { - "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "http-interop/http-middleware": "^0.4.1", + "phpunit/phpunit": "^6.4.4 || ^5.7.14", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-json": "^2.6.1 || ^3.0", - "zendframework/zend-psr7bridge": "^0.2", + "zendframework/zend-psr7bridge": "^1.0", "zendframework/zend-stratigility": "^2.0.1" }, "suggest": { @@ -42,15 +46,12 @@ "zendframework/zend-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager", "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application", - "zendframework/zend-stratigility": "zend-stratigility is required to use middleware pipes in the MiddlewareListener" - }, - "config": { - "sort-packages": true + "zendframework/zend-stratigility": "zend-stratigility is required to use middleware pipes in the MiddlewareListener", + "http-interop/http-middleware": "^0.4.1 to be used together with zend-stratigility" }, - "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "autoload": { + "psr-4": { + "Zend\\Mvc\\": "src/" } }, "autoload-dev": { @@ -61,6 +62,15 @@ "test/_autoload.php" ] }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" + } + }, "scripts": { "check": [ "@cs-check", diff --git a/php-zendframework-zend-mvc.spec b/php-zendframework-zend-mvc.spec index 49e6b50..a6614e1 100644 --- a/php-zendframework-zend-mvc.spec +++ b/php-zendframework-zend-mvc.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit ba40f2c795403ce8b95f9251657cc2b96c40c417 +%global gh_commit 236e7e1e3757e988fa06530c0a3f96a148858ae8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-mvc @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -30,7 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} @@ -39,21 +38,23 @@ BuildRequires: php-reflection BuildRequires: php-intl BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-composer(container-interop/container-interop) >= 1.1 -BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 3.0 -BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5.4 -BuildRequires: php-composer(%{gh_owner}/zend-modulemanager) >= 2.7.1 -BuildRequires: php-composer(%{gh_owner}/zend-router) >= 3.0.1 -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 3.0.3 -BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 3.0 -BuildRequires: php-composer(%{gh_owner}/zend-view) >= 2.6.7 +BuildRequires: php-composer(container-interop/container-interop) >= 1.2 +BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 3.2 +BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.7 +BuildRequires: php-composer(%{gh_owner}/zend-modulemanager) >= 2.8 +BuildRequires: php-composer(%{gh_owner}/zend-router) >= 3.0.2 +BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 3.3 +BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 3.1 +BuildRequires: php-composer(%{gh_owner}/zend-view) >= 2.9 # From composer, "require-dev": { -# "phpunit/phpunit": "^6.0.7 || ^5.7.14", +# "http-interop/http-middleware": "^0.4.1", +# "phpunit/phpunit": "^6.4.4 || ^5.7.14", # "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-json": "^2.6.1 || ^3.0", -# "zendframework/zend-psr7bridge": "^0.2", +# "zendframework/zend-psr7bridge": "^1.0", # "zendframework/zend-stratigility": "^2.0.1" BuildRequires: php-composer(%{gh_owner}/zend-json) >= 2.6.1 +# ignore min version as we don't test stratigility 2.0.1" BuildRequires: php-composer(%{gh_owner}/zend-psr7bridge) >= 0.2 # ignore min version (and skip test relying on it) BuildRequires: php-composer(%{gh_owner}/zend-stratigility) @@ -70,32 +71,32 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-3 %endif # From composer, "require": { -# "container-interop/container-interop": "^1.1", +# "container-interop/container-interop": "^1.2", # "php": "^5.6 || ^7.0", -# "zendframework/zend-eventmanager": "^3.0", -# "zendframework/zend-http": "^2.5.4", -# "zendframework/zend-modulemanager": "^2.7.1", -# "zendframework/zend-router": "^3.0.1", -# "zendframework/zend-servicemanager": "^3.0.3", -# "zendframework/zend-stdlib": "^3.0", -# "zendframework/zend-view": "^2.6.7" +# "zendframework/zend-eventmanager": "^3.2", +# "zendframework/zend-http": "^2.7", +# "zendframework/zend-modulemanager": "^2.8", +# "zendframework/zend-router": "^3.0.2", +# "zendframework/zend-servicemanager": "^3.3", +# "zendframework/zend-stdlib": "^3.1", +# "zendframework/zend-view": "^2.9" Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-composer(container-interop/container-interop) >= 1.1 +Requires: php-composer(container-interop/container-interop) >= 1.2 Requires: php-composer(container-interop/container-interop) < 2 -Requires: php-composer(%{gh_owner}/zend-eventmanager) >= 3.0 +Requires: php-composer(%{gh_owner}/zend-eventmanager) >= 3.2 Requires: php-composer(%{gh_owner}/zend-eventmanager) < 4 -Requires: php-composer(%{gh_owner}/zend-http) >= 2.5.4 +Requires: php-composer(%{gh_owner}/zend-http) >= 2.7 Requires: php-composer(%{gh_owner}/zend-http) < 3 -Requires: php-composer(%{gh_owner}/zend-modulemanager) >= 2.7.1 +Requires: php-composer(%{gh_owner}/zend-modulemanager) >= 2.8 Requires: php-composer(%{gh_owner}/zend-modulemanager) < 3 -Requires: php-composer(%{gh_owner}/zend-router) >= 3.0.1 +Requires: php-composer(%{gh_owner}/zend-router) >= 3.0.2 Requires: php-composer(%{gh_owner}/zend-router) < 4 -Requires: php-composer(%{gh_owner}/zend-servicemanager) >= 3.0.3 +Requires: php-composer(%{gh_owner}/zend-servicemanager) >= 3.3 Requires: php-composer(%{gh_owner}/zend-servicemanager) < 4 -Requires: php-composer(%{gh_owner}/zend-stdlib) >= 3.0 +Requires: php-composer(%{gh_owner}/zend-stdlib) >= 3.1 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 -Requires: php-composer(%{gh_owner}/zend-view) >= 2.6.7 +Requires: php-composer(%{gh_owner}/zend-view) >= 2.9 Requires: php-composer(%{gh_owner}/zend-http) < 3 # From composer, "suggest": { # "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", @@ -109,7 +110,8 @@ Requires: php-composer(%{gh_owner}/zend-http) < 3 # "zendframework/zend-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager", # "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", # "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application", -# "zendframework/zend-stratigility": "zend-stratigility is required to use middleware pipes in the MiddlewareListener" +# "zendframework/zend-stratigility": "zend-stratigility is required to use middleware pipes in the MiddlewareListener", +# "http-interop/http-middleware": "^0.4.1 to be used together with zend-stratigility" %if 0%{?fedora} >= 21 Suggests: php-composer(%{gh_owner}/zend-json) Suggests: php-composer(%{gh_owner}/zend-log) @@ -206,7 +208,6 @@ require_once 'test/_autoload.php'; EOF ret=0 -# 7.2: https://github.com/zendframework/zend-form/issues/157 for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do if which $cmdarg; then set $cmdarg @@ -219,12 +220,7 @@ exit $ret %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -234,6 +230,17 @@ rm -rf %{buildroot} %changelog +* Mon Nov 27 2017 Remi Collet <remi@remirepo.net> - 3.1.1-1 +- Update to 3.1.1 +- raise dependency on container-interop/container-interop 1.2 +- raise dependency on zend-eventmanager 3.2 +- raise dependency on zend-http 2.7 +- raise dependency on zend-modulemanager 2.8 +- raise dependency on zend-router 3.0.2 +- raise dependency on zend-servicemanager 3.3 +- raise dependency on zend-stdlib 3.1 +- raise dependency on zend-view 2.9 + * Tue May 2 2017 Remi Collet <remi@remirepo.net> - 3.1.0-1 - Update to 3.1.0 - use phpunit6 |