summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-09-08 13:48:04 +0200
committerRemi Collet <remi@remirepo.net>2021-09-08 13:48:04 +0200
commit2343ce9b0d3be82185868783a1026ddcfcc304d6 (patch)
tree8785b19000cd891d814ef5886f5ae9b74c43d4bb
parentacd54cd2652c5c42a77a7ce0f545d33f5f66627b (diff)
update to 3.6.0HEADmaster
drop zendframework compatibility layer
-rw-r--r--composer.json7
-rw-r--r--php-laminas-config3.spec44
2 files changed, 11 insertions, 40 deletions
diff --git a/composer.json b/composer.json
index eddd3ed..adfc01d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,6 @@
"php": "^7.3 || ~8.0.0",
"ext-json": "*",
"laminas/laminas-stdlib": "^2.7.7 || ^3.1",
- "laminas/laminas-zendframework-bridge": "^1.0",
"psr/container": "^1.0"
},
"require-dev": {
@@ -34,7 +33,8 @@
"phpunit/phpunit": "^8.5.8"
},
"conflict": {
- "container-interop/container-interop": "<1.2.0"
+ "container-interop/container-interop": "<1.2.0",
+ "zendframework/zend-config": "*"
},
"suggest": {
"laminas/laminas-filter": "^2.7.2; install if you want to use the Filter processor",
@@ -62,8 +62,5 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"license-check": "docheader check src/"
- },
- "replace": {
- "zendframework/zend-config": "^3.3.0"
}
}
diff --git a/php-laminas-config3.spec b/php-laminas-config3.spec
index 83bbdae..75ffa78 100644
--- a/php-laminas-config3.spec
+++ b/php-laminas-config3.spec
@@ -7,11 +7,10 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit f91cd6fe79e82cbbcaa36485108a04e8ef1e679b
+%global gh_commit 2f2273a6bdf966a9adf6042f8950b6c33199a3b7
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-config
-%global zf_name zend-config
%global php_home %{_datadir}/php
%global namespace Laminas
%global library Config
@@ -23,7 +22,7 @@
%endif
Name: php-%{gh_project}%{major}
-Version: 3.5.0
+Version: 3.6.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component v%{major}
@@ -45,7 +44,6 @@ BuildRequires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 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)
BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
# From composer, "require-dev": {
# "laminas/laminas-filter": "^2.7.2",
@@ -56,10 +54,9 @@ BuildRequires: (php-composer(psr/container) >= 1.0
BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.7.2 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.10.3 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-# remirepo:8
+# remirepo:7
%else
BuildRequires: php-laminas-stdlib
-BuildRequires: php-laminas-zendframework-bridge
BuildRequires: php-psr-container
BuildRequires: php-laminas-filter
BuildRequires: php-laminas-i18n
@@ -74,16 +71,12 @@ BuildRequires: php-fedora-autoloader-devel
# "php": "^7.3 || ~8.0.0",
# "ext-json": "*",
# "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
-# "laminas/laminas-zendframework-bridge": "^1.0",
# "psr/container": "^1.0"
-# "laminas/laminas-stdlib": "^2.7 || ^3.0",
-# "laminas/laminas-zendframework-bridge": "^1.0"
Requires: php(language) >= 7.3
Requires: php-json
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 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)
Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
# From composer, "suggest": {
# "laminas/laminas-filter": "Laminas\\Filter component",
@@ -92,10 +85,9 @@ Requires: (php-composer(psr/container) >= 1.0
Suggests: php-autoloader(%{gh_owner}/laminas-filter)
Suggests: php-autoloader(%{gh_owner}/laminas-i18n)
Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager)
-# remirepo:5
+# remirepo:4
%else
Requires: php-laminas-stdlib
-Requires: php-laminas-zendframework-bridge
Requires: php-psr-container
%endif
# Autoloader
@@ -108,9 +100,7 @@ Requires: php-xmlreader
Requires: php-xmlwriter
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
-Provides: php-composer(zendframework/%{zf_name}) = %{version}
Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
-Provides: php-autoloader(zendframework/%{zf_name}) = %{version}
%description
@@ -143,25 +133,12 @@ cat << 'EOF' | tee -a src/autoload.php
]);
EOF
-cat << 'EOF' | tee zf.php
-<?php
-require_once '%{php_home}/Fedora/Autoloader/autoload.php';
-\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php',
- dirname(dirname(__DIR__)) . '/%{namespace}/%{library}%{major}/autoload.php',
-]);
-EOF
-
%install
: Laminas library
mkdir -p %{buildroot}%{php_home}/%{namespace}/
cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}%{major}
-: Zend equiv
-mkdir -p %{buildroot}%{php_home}/Zend/%{library}%{major}
-cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php
-
%check
%if %{with_tests}
@@ -172,15 +149,9 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
EOF
-: check compat autoloader
-php -r '
-require "%{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php";
-exit (class_exists("\\Zend\\%{library}\\Config") ? 0 : 1);
-'
-
: upstream test suite
ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php73 php74 php80 php81; do
if which $cmd; then
$cmd %{_bindir}/phpunit8 || ret=1
fi
@@ -197,11 +168,14 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%{php_home}/Zend/%{library}%{major}
%{php_home}/%{namespace}/%{library}%{major}
%changelog
+* Wed Sep 8 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+- drop zendframework compatibility layer
+
* Mon Feb 15 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1
- update to 3.5.0