summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-16 12:00:13 +0100
committerRemi Collet <remi@remirepo.net>2020-01-16 12:00:13 +0100
commitb69acd7d8dccdd3f2279387d56166dd0ea63bbb4 (patch)
tree0c6ce3d38a4a513a1e3582b4c46d24dc896b3907
parentbb1b1aa233adf05c7b4a583c1123b290450ac7fe (diff)
switch to Laminas
-rw-r--r--composer.json62
-rw-r--r--php-laminas-mvc-plugin-prg.spec146
2 files changed, 122 insertions, 86 deletions
diff --git a/composer.json b/composer.json
index 74f617b..a1ad2fa 100644
--- a/composer.json
+++ b/composer.json
@@ -1,50 +1,51 @@
{
- "name": "zendframework/zend-mvc-plugin-prg",
- "description": "Post/Redirect/Get plugin for zend-mvc controllers",
+ "name": "laminas/laminas-mvc-plugin-prg",
+ "description": "Post/Redirect/Get plugin for laminas-mvc controllers",
"license": "BSD-3-Clause",
"keywords": [
- "zf",
- "zendframework",
+ "laminas",
"mvc"
],
+ "homepage": "https://laminas.dev",
"support": {
- "docs": "https://docs.zendframework.com/zend-mvc-plugin-prg/",
- "issues": "https://github.com/zendframework/zend-mvc-plugin-prg/issues",
- "source": "https://github.com/zendframework/zend-mvc-plugin-prg",
- "rss": "https://github.com/zendframework/zend-mvc-plugin-prg/releases.atom",
- "chat": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
+ "docs": "https://docs.laminas.dev/laminas-mvc-plugin-prg/",
+ "issues": "https://github.com/laminas/laminas-mvc-plugin-prg/issues",
+ "source": "https://github.com/laminas/laminas-mvc-plugin-prg",
+ "rss": "https://github.com/laminas/laminas-mvc-plugin-prg/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev",
+ "dev-develop": "1.3.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Mvc\\Plugin\\Prg"
+ }
},
"require": {
"php": "^5.6 || ^7.0",
- "zendframework/zend-mvc": "^3.0",
- "zendframework/zend-session": "^2.8.5",
- "zendframework/zend-stdlib": "^3.2.1"
+ "laminas/laminas-mvc": "^3.0",
+ "laminas/laminas-session": "^2.8.5",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
},
"autoload": {
"psr-4": {
- "Zend\\Mvc\\Plugin\\Prg\\": "src/"
+ "Laminas\\Mvc\\Plugin\\Prg\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "ZendTest\\Mvc\\Plugin\\Prg\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev",
- "dev-develop": "1.3.x-dev"
- },
- "zf": {
- "component": "Zend\\Mvc\\Plugin\\Prg"
+ "LaminasTest\\Mvc\\Plugin\\Prg\\": "test/"
}
},
"scripts": {
@@ -56,5 +57,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-mvc-plugin-prg": "self.version"
}
}
diff --git a/php-laminas-mvc-plugin-prg.spec b/php-laminas-mvc-plugin-prg.spec
index 68a381c..fb2f5e8 100644
--- a/php-laminas-mvc-plugin-prg.spec
+++ b/php-laminas-mvc-plugin-prg.spec
@@ -1,31 +1,35 @@
-# remirepo/Fedora spec file for php-zendframework-zend-mvc-plugin-prg
+# remirepo/Fedora spec file for php-laminas-mvc-plugin-prg
#
-# Copyright (c) 2016-2018 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 090afc28bcf0f7043ed8d7da712ac1b5964ab7d7
+%global gh_commit f9b094373795dd4250d3551a1fbd6d304762b621
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner zendframework
-%global gh_project zend-mvc-plugin-prg
+%global gh_owner laminas
+%global gh_project laminas-mvc-plugin-prg
+%global zf_name zend-mvc-plugin-prg
%global php_home %{_datadir}/php
-%global library Prg
+%global namespace Laminas
+%global library Mvc
+%global subproj Plugin
+%global subsubp Prg
%if %{bootstrap}
%global with_tests 0%{?_with_tests:1}
%else
%global with_tests 0%{!?_without_tests:1}
%endif
-Name: php-%{gh_owner}-%{gh_project}
+Name: php-%{gh_project}
Version: 1.2.0
Release: 1%{?dist}
-Summary: Zend Framework Mvc-Plugin-%{library} component
+Summary: %{namespace} Framework %{library}/%{subproj}/%{subsubp} component
License: BSD
-URL: https://zendframework.github.io/%{gh_project}/
+URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
@@ -33,66 +37,67 @@ BuildArch: noarch
# Tests
%if %{with_tests}
BuildRequires: php(language) >= 5.6
-# From composer, "require-dev": {
-# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-# "zendframework/zend-coding-standard": "~1.0.0"
# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
-%global phpunit %{_bindir}/phpunit7
-BuildRequires: phpunit7 >= 7.1.4
-# remirepo:10
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.5 with php-autoloader(%{gh_owner}/laminas-session) < 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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# From composer, "require-dev": {
+# "laminas/laminas-coding-standard": "~1.0.0",
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+# remirepo:6
%else
-BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) < 4
-BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
-BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3
-BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
-BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1
-%global phpunit %{_bindir}/phpunit6
-BuildRequires: phpunit6 >= 6.5.8
+BuildRequires: php-laminas-mvc
+BuildRequires: php-laminas-session
+BuildRequires: php-laminas-stdlib
+BuildRequires: php-laminas-zendframework-bridge
%endif
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.4
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^5.6 || ^7.0",
-# "zendframework/zend-mvc": "^3.0",
-# "zendframework/zend-session": "^2.8.5",
-# "zendframework/zend-stdlib": "^3.2.1"
+# "laminas/laminas-mvc": "^3.0",
+# "laminas/laminas-session": "^2.8.5",
+# "laminas/laminas-stdlib": "^3.2.1",
+# "laminas/laminas-zendframework-bridge": "^1.0"
Requires: php(language) >= 5.6
# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4)
-Requires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
-# remirepo:8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.5 with php-autoloader(%{gh_owner}/laminas-session) < 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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# remirepo:6
%else
-Requires: php-autoloader(%{gh_owner}/zend-mvc) < 4
-Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
-Requires: php-autoloader(%{gh_owner}/zend-session) < 3
-Requires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1
+Requires: php-laminas-mvc
+Requires: php-laminas-session
+Requires: php-laminas-stdlib
+Requires: php-laminas-zendframework-bridge
%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
-# From phpcompatinfo report for version 1.0.0
-# Nothing
-
-Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
+# From phpcompatinfo report for version 1.2.0
+# only Core
+
+# Compatibily ensure by the bridge
+Obsoletes: php-zendframework-%{zf_name} < 1.2.0-99
+Provides: php-zendframework-%{zf_name} = %{version}-99
+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
-Provides a Post-Redirect-Get controller plugin for zend-mvc versions 3.0
+Provides a Post-Redirect-Get controller plugin for laminas-mvc versions 3.0
and up.
-* Issues at https://github.com/zendframework/zend-mvc-plugin-prg/issues
-* Documentation is at https://zendframework.github.io/zend-mvc-plugin-prg/
+Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
@@ -106,16 +111,30 @@ mv LICENSE.md LICENSE
phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/Zend/Mvc/autoload.php',
- '%{php_home}/Zend/Session/autoload.php',
- '%{php_home}/Zend/Stdlib/autoload.php',
+ '%{php_home}/%{namespace}/Mvc/autoload.php',
+ '%{php_home}/%{namespace}/Session/autoload.php',
+ '%{php_home}/%{namespace}/Stdlib/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(dirname(dirname(__DIR__)))) . '/%{namespace}/%{library}/%{subproj}/%{subsubp}/autoload.php',
]);
EOF
%install
-mkdir -p %{buildroot}%{php_home}/Zend/Mvc/Plugin
-cp -pr src %{buildroot}%{php_home}/Zend/Mvc/Plugin/%{library}
+: Laminas library
+mkdir -p %{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}
+cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}/%{subsubp}
+
+: Zend equiv
+mkdir -p %{buildroot}%{php_home}/Zend/%{library}/%{subproj}/%{subsubp}
+cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/%{subproj}/%{subsubp}/autoload.php
%check
@@ -123,12 +142,19 @@ cp -pr src %{buildroot}%{php_home}/Zend/Mvc/Plugin/%{library}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
-require_once '%{buildroot}%{php_home}/Zend/Mvc/Plugin/%{library}/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\Mvc\\Plugin\\%{library}\\', dirname(__DIR__) . '/test');
++require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}/%{subsubp}/autoload.php';
++\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\%{subproj}\\%{subsubp}\\', dirname(__DIR__) . '/test');
EOF
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend/%{library}/%{subproj}/%{subsubp}/autoload.php";
+exit (class_exists("\\Zend\\%{library}\\%{subproj}\\%{subsubp}\\Module") ? 0 : 1);
+'
+
+: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
@@ -146,10 +172,16 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%{php_home}/Zend/Mvc/Plugin/%{library}
+%dir %{php_home}/Zend/%{library}/%{subproj}
+ %{php_home}/Zend/%{library}/%{subproj}/%{subsubp}
+%dir %{php_home}/%{namespace}/%{library}/%{subproj}
+ %{php_home}/%{namespace}/%{library}/%{subproj}/%{subsubp}
%changelog
+* Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- switch to Laminas
+
* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1
- update to 1.2.0 (no change)
- raise dependency on zend-stdlib 3.2.1