summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json32
-rw-r--r--php-laminas-view.spec78
2 files changed, 55 insertions, 55 deletions
diff --git a/composer.json b/composer.json
index 701c030..10f30b9 100644
--- a/composer.json
+++ b/composer.json
@@ -19,25 +19,22 @@
"sort-packages": true
},
"require": {
- "php": "^7.3 || ~8.0.0",
- "laminas/laminas-eventmanager": "^3.0",
- "laminas/laminas-json": "^2.6.1 || ^3.0",
- "laminas/laminas-loader": "^2.5",
- "laminas/laminas-stdlib": "^3.2.1",
- "laminas/laminas-zendframework-bridge": "^1.0"
+ "php": "^7.3 || ~8.0.0 || ~8.1.0",
+ "laminas/laminas-eventmanager": "^3.4",
+ "laminas/laminas-json": "^2.6.1 || ^3.3",
+ "laminas/laminas-stdlib": "^3.6"
},
"require-dev": {
"laminas/laminas-authentication": "^2.5",
"laminas/laminas-cache": "^2.6.1",
"laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-config": "^2.6",
+ "laminas/laminas-config": "^3.7",
"laminas/laminas-console": "^2.6",
"laminas/laminas-escaper": "^2.5",
- "laminas/laminas-feed": "^2.7",
+ "laminas/laminas-feed": "^2.15",
"laminas/laminas-filter": "^2.6.1",
- "laminas/laminas-http": "^2.5.4",
+ "laminas/laminas-http": "^2.15",
"laminas/laminas-i18n": "^2.6",
- "laminas/laminas-log": "^2.7",
"laminas/laminas-modulemanager": "^2.7.1",
"laminas/laminas-mvc": "^2.7.14 || ^3.0",
"laminas/laminas-mvc-i18n": "^1.1",
@@ -46,17 +43,19 @@
"laminas/laminas-paginator": "^2.5",
"laminas/laminas-permissions-acl": "^2.6",
"laminas/laminas-router": "^3.0.1",
- "laminas/laminas-serializer": "^2.6.1",
"laminas/laminas-servicemanager": "^3.3",
- "laminas/laminas-session": "^2.8.1",
+ "laminas/laminas-session": "^2.12",
"laminas/laminas-uri": "^2.5",
"phpspec/prophecy": "^1.12",
"phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.3"
+ "phpunit/phpunit": "^9.5.5",
+ "psalm/plugin-phpunit": "^0.16.1",
+ "vimeo/psalm": "^4.10"
},
"conflict": {
"laminas/laminas-servicemanager": "<3.3",
- "laminas/laminas-router": "<3.0.1"
+ "laminas/laminas-router": "<3.0.1",
+ "zendframework/zend-view": "*"
},
"suggest": {
"laminas/laminas-authentication": "Laminas\\Authentication component",
@@ -80,6 +79,7 @@
},
"autoload-dev": {
"files": [
+ "polyfill/autoload.php",
"test/autoload.php"
],
"psr-4": {
@@ -96,10 +96,8 @@
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
+ "static-analysis": "psalm --shepherd --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
- },
- "replace": {
- "zendframework/zend-view": "^2.11.4"
}
}
diff --git a/php-laminas-view.spec b/php-laminas-view.spec
index b005807..9d28b50 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 23fc886670e05d3fae34d3ba2c5089e2d29beb03
+%global gh_commit 968738347347234ae1551169a5db0a13dbda8e44
%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.1
+Version: 2.13.1
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -39,23 +39,22 @@ BuildRequires: php-pcre
BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-json) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.3 with php-autoloader(%{gh_owner}/laminas-json) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+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": {
# "laminas/laminas-authentication": "^2.5",
# "laminas/laminas-cache": "^2.6.1",
# "laminas/laminas-coding-standard": "~1.0.0",
-# "laminas/laminas-config": "^2.6",
+# "laminas/laminas-config": "^3.7",
# "laminas/laminas-console": "^2.6",
# "laminas/laminas-escaper": "^2.5",
-# "laminas/laminas-feed": "^2.7",
+# "laminas/laminas-feed": "^2.15",
# "laminas/laminas-filter": "^2.6.1",
-# "laminas/laminas-http": "^2.5.4",
+# "laminas/laminas-http": "^2.15",
# "laminas/laminas-i18n": "^2.6",
-# "laminas/laminas-log": "^2.7",
# "laminas/laminas-modulemanager": "^2.7.1",
# "laminas/laminas-mvc": "^2.7.14 || ^3.0",
# "laminas/laminas-mvc-i18n": "^1.1",
@@ -64,23 +63,23 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0
# "laminas/laminas-paginator": "^2.5",
# "laminas/laminas-permissions-acl": "^2.6",
# "laminas/laminas-router": "^3.0.1",
-# "laminas/laminas-serializer": "^2.6.1",
# "laminas/laminas-servicemanager": "^3.3",
-# "laminas/laminas-session": "^2.8.1",
+# "laminas/laminas-session": "^2.12",
# "laminas/laminas-uri": "^2.5",
# "phpspec/prophecy": "^1.12",
# "phpspec/prophecy-phpunit": "^2.0",
-# "phpunit/phpunit": "^9.3"
+# "phpunit/phpunit": "^9.5.5",
+# "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-config) >= 2.6 with php-autoloader(%{gh_owner}/laminas-config) < 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.7 with php-autoloader(%{gh_owner}/laminas-feed) < 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-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 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-log) >= 2.7 with php-autoloader(%{gh_owner}/laminas-log) < 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)
@@ -91,13 +90,12 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.5
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-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-serializer) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.1 with php-autoloader(%{gh_owner}/laminas-session) < 3)
+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:32
+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
%else
BuildRequires: php-laminas-eventmanager
BuildRequires: php-laminas-json
@@ -106,13 +104,13 @@ 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
BuildRequires: php-laminas-filter
BuildRequires: php-laminas-http
BuildRequires: php-laminas-i18n
-BuildRequires: php-laminas-log
BuildRequires: php-laminas-modulemanager
%if ! %{bootstrap}
BuildRequires: php-laminas-mvc
@@ -123,32 +121,30 @@ BuildRequires: php-laminas-paginator
BuildRequires: php-laminas-permissions-acl
%endif
BuildRequires: php-laminas-router
-BuildRequires: php-laminas-serializer
BuildRequires: php-laminas-servicemanager
BuildRequires: php-laminas-session
BuildRequires: php-laminas-uri
BuildRequires: php-phpspec-prophecy
BuildRequires: php-phpspec-prophecy-phpunit
%endif
-BuildRequires: phpunit9 >= 9.3
+BuildRequires: phpunit9 >= 9.5.5
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0",
-# "laminas/laminas-eventmanager": "^3.0",
-# "laminas/laminas-json": "^2.6.1 || ^3.0",
+# "php": "^7.3 || ~8.0.0 || ~8.1.0",
+# "laminas/laminas-eventmanager": "^3.4",
+# "laminas/laminas-json": "^2.6.1 || ^3.3",
# "laminas/laminas-loader": "^2.5",
-# "laminas/laminas-stdlib": "^3.2.1",
-# "laminas/laminas-zendframework-bridge": "^1.0"
+# "laminas/laminas-stdlib": "^3.6"
Requires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
-Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-json) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.3 with php-autoloader(%{gh_owner}/laminas-json) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
# "laminas/laminas-authentication": "Laminas\\Authentication component",
@@ -283,22 +279,19 @@ 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',
+ dirname(__DIR__) . '/test/autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/%{namespace}/Cache/autoload.php',
- '%{php_home}/%{namespace}/Config/autoload.php',
+ '%{php_home}/%{namespace}/Config3/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',
]);
-\Fedora\Autoloader\Dependencies::optional([
- dirname(__DIR__) . '/test/autoload.php',
-]);
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
EOF
@@ -314,6 +307,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
if which $cmd; then
$cmd %{_bindir}/phpunit9 \
@@ -339,6 +333,14 @@ exit $ret
%changelog
+* Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 2.13.1-1
+- update to 2.13.1
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+- raise dependency on laminas-eventmanager 3.4
+- raise dependency on laminas-json 3.3
+- raise dependency on laminas-stdlib 3.6
+
* Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 2.12.1-1
- update to 2.12.1