summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json22
-rw-r--r--php-laminas-xmlrpc.spec65
2 files changed, 51 insertions, 36 deletions
diff --git a/composer.json b/composer.json
index 87a41e3..b82fc49 100644
--- a/composer.json
+++ b/composer.json
@@ -21,17 +21,18 @@
"extra": {
},
"require": {
- "php": "^7.4 || ~8.0.0",
- "laminas/laminas-http": "^2.5.4",
- "laminas/laminas-math": "^3.3.0",
- "laminas/laminas-server": "^2.9.1",
- "laminas/laminas-stdlib": "^3.2.1",
- "laminas/laminas-xml": "^1.3.1",
- "laminas/laminas-zendframework-bridge": "^1.0"
+ "php": "^7.4 || ~8.0.0 || ~8.1.0",
+ "laminas/laminas-code": "^4.4",
+ "laminas/laminas-http": "^2.15",
+ "laminas/laminas-math": "^3.4.0",
+ "laminas/laminas-server": "^2.11",
+ "laminas/laminas-stdlib": "^3.6.1",
+ "laminas/laminas-xml": "^1.4.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.2.1",
- "phpunit/phpunit": "^9.3"
+ "squizlabs/php_codesniffer": "^3.6.1",
+ "phpunit/phpunit": "^9.5.8"
},
"suggest": {
"laminas/laminas-cache": "To support Laminas\\XmlRpc\\Server\\Cache usage"
@@ -46,7 +47,6 @@
"LaminasTest\\XmlRpc\\": "test/"
},
"files": [
- "test/autoload.php",
"test/TestAsset/functions.php"
]
},
@@ -60,7 +60,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
- "replace": {
- "zendframework/zend-xmlrpc": "^2.9.0"
+ "conflict": {
+ "zendframework/zend-xmlrpc": "*"
}
}
diff --git a/php-laminas-xmlrpc.spec b/php-laminas-xmlrpc.spec
index ab538b6..1f6d710 100644
--- a/php-laminas-xmlrpc.spec
+++ b/php-laminas-xmlrpc.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit e94de8161821b6c82ba2892b398ad005f7be5ec3
+%global gh_commit 15849ccd9bb479ebe63ca3a6614930eda1ed33eb
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-xmlrpc
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 2.11.0
+Version: 2.12.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -45,17 +45,20 @@ BuildRequires: php-spl
BuildRequires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-math) >= 3.3.0 with php-autoloader(%{gh_owner}/laminas-math) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-server) < 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-xml) >= 1.3 with php-autoloader(%{gh_owner}/laminas-xml) < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 4.4 with php-autoloader(%{gh_owner}/laminas-code) < 5)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-math) >= 3.4 with php-autoloader(%{gh_owner}/laminas-math) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.11 with php-autoloader(%{gh_owner}/laminas-server) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-xml) >= 1.4 with php-autoloader(%{gh_owner}/laminas-xml) < 2)
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-coding-standard": "~2.2.1",
-# "phpunit/phpunit": "^9.3"
-# remirepo:8
+# "squizlabs/php_codesniffer": "^3.6.1",
+# "phpunit/phpunit": "^9.5.8"
+# remirepo:9
%else
+BuildRequires: php-laminas-code4
BuildRequires: php-laminas-http
BuildRequires: php-laminas-math
BuildRequires: php-laminas-server
@@ -64,34 +67,36 @@ BuildRequires: php-laminas-xml
BuildRequires: php-laminas-zendframework-bridge
%endif
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.3
+BuildRequires: phpunit9 >= 9.5.8
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.4 || ~8.0.0",
-# "laminas/laminas-http": "^2.5.4",
-# "laminas/laminas-math": "^3.3.0",
-# "laminas/laminas-server": "^2.9.1",
-# "laminas/laminas-stdlib": "^3.2.1",
-# "laminas/laminas-xml": "^1.3.1",
-# "laminas/laminas-zendframework-bridge": "^1.0"
+# "php": "^7.4 || ~8.0.0 || ~8.1.0",
+# "laminas/laminas-code": "^4.4",
+# "laminas/laminas-http": "^2.15",
+# "laminas/laminas-math": "^3.4.0",
+# "laminas/laminas-server": "^2.11",
+# "laminas/laminas-stdlib": "^3.6.1",
+# "laminas/laminas-xml": "^1.4.0"
Requires: php(language) >= 7.3
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-math) >= 3.3.0 with php-autoloader(%{gh_owner}/laminas-math) < 4)
-Requires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-server) < 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-code) >= 4.4 with php-autoloader(%{gh_owner}/laminas-code) < 5)
+Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-math) >= 3.4 with php-autoloader(%{gh_owner}/laminas-math) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.11 with php-autoloader(%{gh_owner}/laminas-server) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-xml) >= 1.3 with php-autoloader(%{gh_owner}/laminas-xml) < 2)
-Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.4 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
# "laminas/laminas-cache": "To support Laminas\\XmlRpc\\Server\\Cache usage"
Suggests: php-autoloader(%{gh_owner}/laminas-cache)
-# remirepo:8
+# remirepo:9
%else
+Requires: php-laminas-code4
Requires: php-laminas-http
Requires: php-laminas-math
Requires: php-laminas-server
@@ -185,7 +190,6 @@ cat << 'EOF' | tee vendor/autoload.php
<?php
require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
-require_once 'test/autoload.php';
require_once 'test/TestAsset/functions.php';
EOF
@@ -197,7 +201,7 @@ exit (class_exists("\\Zend\\%{library}\\Server") ? 0 : 1);
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -220,6 +224,17 @@ exit $ret
%changelog
+* Fri Dec 3 2021 Remi Collet <remi@remirepo.net> - 2.12.0-1
+- update to 2.12.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+- add dependency on laminas-code
+- raise dependency on laminas-http 2.15
+- raise dependency on laminas-math 3.4
+- raise dependency on laminas-server 2.11
+- raise dependency on laminas-stdlib 3.6.1
+- raise dependency on laminas-xml 1.4
+
* Tue Oct 12 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1
- update to 2.11.0
generated by cgit (git 2.34.1) at 2024-04-30 07:29:27 +0000