summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-10-13 15:53:06 +0200
committerRemi Collet <remi@php.net>2021-10-13 15:53:06 +0200
commitcb4491bd48564fdd264edb06903de6b3ae7a4099 (patch)
treeb96349fcadbee96d707e93acb87a6f39deb0a98e
parentfb295a70367e798fa5de90669891845bee6e864f (diff)
update to 2.14.0
-rw-r--r--composer.json2
-rw-r--r--php-laminas-view.spec17
2 files changed, 9 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 10f30b9..46c247b 100644
--- a/composer.json
+++ b/composer.json
@@ -25,10 +25,10 @@
"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-config": "^3.7",
"laminas/laminas-console": "^2.6",
"laminas/laminas-escaper": "^2.5",
"laminas/laminas-feed": "^2.15",
diff --git a/php-laminas-view.spec b/php-laminas-view.spec
index 9d28b50..8554d11 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 968738347347234ae1551169a5db0a13dbda8e44
+%global gh_commit 3ccd2a745c6a027bcd9add05fa1998d063760096
%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.13.1
+Version: 2.14.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -45,10 +45,10 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5
BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# 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-config": "^3.7",
# "laminas/laminas-console": "^2.6",
# "laminas/laminas-escaper": "^2.5",
# "laminas/laminas-feed": "^2.15",
@@ -73,7 +73,6 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0
# "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-config) >= 3.7 with php-autoloader(%{gh_owner}/laminas-config) < 4)
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)
@@ -95,7 +94,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12
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:31
+# remirepo:30
%else
BuildRequires: php-laminas-eventmanager
BuildRequires: php-laminas-json
@@ -104,7 +103,6 @@ BuildRequires: php-laminas-stdlib
BuildRequires: php-laminas-zendframework-bridge
BuildRequires: php-laminas-authentication
BuildRequires: php-laminas-cache
-BuildRequires: php-laminas-config3
BuildRequires: php-laminas-console
BuildRequires: php-laminas-escaper
BuildRequires: php-laminas-feed
@@ -284,7 +282,6 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
]);
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/%{namespace}/Cache/autoload.php',
- '%{php_home}/%{namespace}/Config3/autoload.php',
'%{php_home}/%{namespace}/Console/autoload.php',
'%{php_home}/%{namespace}/ModuleManager/autoload.php',
'%{php_home}/%{namespace}/Mvc/I18n/autoload.php',
@@ -307,8 +304,7 @@ rm -r test/Helper*
: upstream test suite
ret=0
-# TODO PHP 8.1 not ready (count...)
-for cmd in php php73 php74 php80; do
+for cmd in php php73 php74 php80 php81; do
if which $cmd; then
$cmd %{_bindir}/phpunit9 \
--filter '^((?!(testSetAttribsIsDeprecated|testGetAttribsIsDeprecated)).)*$' \
@@ -333,6 +329,9 @@ exit $ret
%changelog
+* Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 2.14.0-1
+- update to 2.14.0
+
* Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 2.13.1-1
- update to 2.13.1
- keep compatibility using laminas-zendframework-bridge