diff options
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | php-laminas-view.spec | 45 |
2 files changed, 28 insertions, 37 deletions
diff --git a/composer.json b/composer.json index e461191..aab6a39 100644 --- a/composer.json +++ b/composer.json @@ -19,33 +19,31 @@ "sort-packages": true }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "ext-json": "*", "laminas/laminas-eventmanager": "^3.4", - "laminas/laminas-json": "^2.6.1 || ^3.3", + "laminas/laminas-json": "^3.3", "laminas/laminas-stdlib": "^3.6" }, "require-dev": { "ext-dom": "*", "laminas/laminas-authentication": "^2.5", - "laminas/laminas-cache": "^2.6.1", - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-console": "^2.6", "laminas/laminas-escaper": "^2.5", "laminas/laminas-feed": "^2.15", - "laminas/laminas-filter": "^2.6.1", + "laminas/laminas-filter": "^2.13.0", "laminas/laminas-http": "^2.15", "laminas/laminas-i18n": "^2.6", "laminas/laminas-modulemanager": "^2.7.1", "laminas/laminas-mvc": "^2.7.14 || ^3.0", "laminas/laminas-mvc-i18n": "^1.1", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.2", - "laminas/laminas-navigation": "^2.8.1", - "laminas/laminas-paginator": "^2.5", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.5.0", + "laminas/laminas-navigation": "^2.13.1", + "laminas/laminas-paginator": "^2.11.0", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", "laminas/laminas-servicemanager": "^3.4", - "laminas/laminas-session": "^2.12", "laminas/laminas-uri": "^2.5", "phpspec/prophecy": "^1.12", "phpspec/prophecy-phpunit": "^2.0", @@ -56,6 +54,7 @@ "conflict": { "container-interop/container-interop": "<1.2", "laminas/laminas-servicemanager": "<3.3", + "laminas/laminas-session": "<2.12", "laminas/laminas-router": "<3.0.1", "zendframework/zend-view": "*" }, @@ -80,9 +79,6 @@ } }, "autoload-dev": { - "files": [ - "polyfill/autoload.php" - ], "psr-4": { "LaminasTest\\View\\": "test/" } diff --git a/php-laminas-view.spec b/php-laminas-view.spec index 7e07afa..6f5957c 100644 --- a/php-laminas-view.spec +++ b/php-laminas-view.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit cc803ea899e6ca35670b3f21f0b74e93053f2c86 +%global gh_commit 196589217721163f950f8c5d6ae5a25337e78216 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-view @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.16.0 +Version: 2.18.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -30,7 +30,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-reflection BuildRequires: php-date BuildRequires: php-dom @@ -47,24 +47,22 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # From composer, "require-dev": { # "ext-dom": "*", # "laminas/laminas-authentication": "^2.5", -# "laminas/laminas-cache": "^2.6.1", -# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-console": "^2.6", # "laminas/laminas-escaper": "^2.5", # "laminas/laminas-feed": "^2.15", -# "laminas/laminas-filter": "^2.6.1", +# "laminas/laminas-filter": "^2.13.0", # "laminas/laminas-http": "^2.15", # "laminas/laminas-i18n": "^2.6", # "laminas/laminas-modulemanager": "^2.7.1", # "laminas/laminas-mvc": "^2.7.14 || ^3.0", # "laminas/laminas-mvc-i18n": "^1.1", -# "laminas/laminas-mvc-plugin-flashmessenger": "^1.2", -# "laminas/laminas-navigation": "^2.8.1", -# "laminas/laminas-paginator": "^2.5", +# "laminas/laminas-mvc-plugin-flashmessenger": "^1.5.0", +# "laminas/laminas-navigation": "^2.13.1", +# "laminas/laminas-paginator": "^2.11.0", # "laminas/laminas-permissions-acl": "^2.6", # "laminas/laminas-router": "^3.0.1", # "laminas/laminas-servicemanager": "^3.4", -# "laminas/laminas-session": "^2.12", # "laminas/laminas-uri": "^2.5", # "phpspec/prophecy": "^1.12", # "phpspec/prophecy-phpunit": "^2.0", @@ -72,29 +70,27 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "psalm/plugin-phpunit": "^0.16.1", # "vimeo/psalm": "^4.10" BuildRequires: (php-autoloader(%{gh_owner}/laminas-authentication) >= 2.5 with php-autoloader(%{gh_owner}/laminas-authentication) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-cache) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-feed) >= 2.15 with php-autoloader(%{gh_owner}/laminas-feed) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.13.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) %if ! %{bootstrap} BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-i18n) >= 1.1 with php-autoloader(%{gh_owner}/laminas-mvc-i18n) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.2 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-navigation) >= 2.5 with php-autoloader(%{gh_owner}/laminas-navigation) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.5 with php-autoloader(%{gh_owner}/laminas-paginator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.5 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-navigation) >= 2.13.1 with php-autoloader(%{gh_owner}/laminas-navigation) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.11.0 with php-autoloader(%{gh_owner}/laminas-paginator) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) %endif BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.1 with php-autoloader(%{gh_owner}/laminas-router) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3) BuildRequires: (php-composer(phpspec/prophecy) >= 1.12.0 with php-composer(phpspec/prophecy) < 2) BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) -# remirepo:30 +# remirepo:28 %else BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-json @@ -102,7 +98,6 @@ BuildRequires: php-laminas-loader BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-laminas-authentication -BuildRequires: php-laminas-cache BuildRequires: php-laminas-console BuildRequires: php-laminas-escaper BuildRequires: php-laminas-feed @@ -120,7 +115,6 @@ BuildRequires: php-laminas-permissions-acl %endif BuildRequires: php-laminas-router BuildRequires: php-laminas-servicemanager -BuildRequires: php-laminas-session BuildRequires: php-laminas-uri BuildRequires: php-phpspec-prophecy BuildRequires: php-phpspec-prophecy-phpunit @@ -131,13 +125,13 @@ BuildRequires: phpunit9 >= 9.5.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "php": "^7.4 || ~8.0.0 || ~8.1.0", # "ext-json": "*", # "laminas/laminas-eventmanager": "^3.4", -# "laminas/laminas-json": "^2.6.1 || ^3.3", +# "laminas/laminas-json": "^3.3", # "laminas/laminas-loader": "^2.5", # "laminas/laminas-stdlib": "^3.6" -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -279,16 +273,13 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{php_home}/Prophecy/autoload.php', '%{php_home}/Prophecy/PhpUnit/autoload.php', - dirname(__DIR__) . '/polyfill/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/%{namespace}/Cache/autoload.php', '%{php_home}/%{namespace}/Console/autoload.php', '%{php_home}/%{namespace}/ModuleManager/autoload.php', '%{php_home}/%{namespace}/Mvc/I18n/autoload.php', '%{php_home}/%{namespace}/Mvc/Plugin/FlashMessenger/autoload.php', '%{php_home}/%{namespace}/Router/autoload.php', - '%{php_home}/%{namespace}/Session/autoload.php', ]); \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); EOF @@ -329,6 +320,10 @@ exit $ret %changelog +* Mon Jan 10 2022 Remi Collet <remi@remirepo.net> - 2.18.0-1 +- update to 2.18.0 +- raise dependency on PHP 7.4 + * Mon Jan 3 2022 Remi Collet <remi@remirepo.net> - 2.16.0-1 - update to 2.16.0 |