diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | php-laminas-view.spec | 27 |
2 files changed, 26 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 4b96dca..701c030 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,9 @@ "laminas/laminas-log": "^2.7", "laminas/laminas-modulemanager": "^2.7.1", "laminas/laminas-mvc": "^2.7.14 || ^3.0", - "laminas/laminas-navigation": "^2.5", + "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-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", @@ -48,12 +50,13 @@ "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-session": "^2.8.1", "laminas/laminas-uri": "^2.5", - "phpspec/prophecy-phpunit": "^2.0", "phpspec/prophecy": "^1.12", + "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.3" }, "conflict": { - "laminas/laminas-servicemanager": "<3.3" + "laminas/laminas-servicemanager": "<3.3", + "laminas/laminas-router": "<3.0.1" }, "suggest": { "laminas/laminas-authentication": "Laminas\\Authentication component", diff --git a/php-laminas-view.spec b/php-laminas-view.spec index 553ca0c..b005807 100644 --- a/php-laminas-view.spec +++ b/php-laminas-view.spec @@ -6,8 +6,8 @@ # # Please, preserve the changelog entries # -%global bootstrap 1 -%global gh_commit 3ef103da6887809f08ecf52f42c31a76c9bf08b1 +%global bootstrap 0 +%global gh_commit 23fc886670e05d3fae34d3ba2c5089e2d29beb03 %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.12.0 +Version: 2.12.1 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -58,7 +58,9 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "laminas/laminas-log": "^2.7", # "laminas/laminas-modulemanager": "^2.7.1", # "laminas/laminas-mvc": "^2.7.14 || ^3.0", -# "laminas/laminas-navigation": "^2.5", +# "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-permissions-acl": "^2.6", # "laminas/laminas-router": "^3.0.1", @@ -66,8 +68,8 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "laminas/laminas-servicemanager": "^3.3", # "laminas/laminas-session": "^2.8.1", # "laminas/laminas-uri": "^2.5", -# "phpspec/prophecy-phpunit": "^2.0", # "phpspec/prophecy": "^1.12", +# "phpspec/prophecy-phpunit": "^2.0", # "phpunit/phpunit": "^9.3" 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) @@ -82,6 +84,8 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-log) >= 2.7 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-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) @@ -93,7 +97,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8. 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:32 %else BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-json @@ -112,6 +116,8 @@ BuildRequires: php-laminas-log BuildRequires: php-laminas-modulemanager %if ! %{bootstrap} BuildRequires: php-laminas-mvc +BuildRequires: php-laminas-mvc-i18n +BuildRequires: php-laminas-mvc-plugin-flashmessenger BuildRequires: php-laminas-navigation BuildRequires: php-laminas-paginator BuildRequires: php-laminas-permissions-acl @@ -284,6 +290,8 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; '%{php_home}/%{namespace}/Console/autoload.php', '%{php_home}/%{namespace}/Log/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}/Serializer/autoload.php', '%{php_home}/%{namespace}/Session/autoload.php', @@ -308,7 +316,9 @@ rm -r test/Helper* ret=0 for cmd in php php73 php74 php80; do if which $cmd; then - $cmd %{_bindir}/phpunit9 --verbose || ret=1 + $cmd %{_bindir}/phpunit9 \ + --filter '^((?!(testSetAttribsIsDeprecated|testGetAttribsIsDeprecated)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -329,6 +339,9 @@ exit $ret %changelog +* Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 2.12.1-1 +- update to 2.12.1 + * Thu Jan 7 2021 Remi Collet <remi@remirepo.net> - 2.12.0-1 - update to 2.12.0 - raise dependency on PHP 7.3 |