summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json47
-rw-r--r--php-laminas-xml.spec97
2 files changed, 98 insertions, 46 deletions
diff --git a/composer.json b/composer.json
index 045b1ec..ae0046c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,44 +1,46 @@
{
- "name": "zendframework/zendxml",
+ "name": "laminas/laminas-xml",
"description": "Utility library for XML usage, best practices, and security in PHP",
"license": "BSD-3-Clause",
"keywords": [
- "zf",
- "zendframework",
+ "laminas",
"xml",
"security"
],
+ "homepage": "https://laminas.dev",
"support": {
- "issues": "https://github.com/zendframework/ZendXml/issues",
- "source": "https://github.com/zendframework/ZendXml",
- "rss": "https://github.com/zendframework/ZendXml/releases.atom",
- "chat": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
+ "docs": "https://docs.laminas.dev/laminas-xml/",
+ "issues": "https://github.com/laminas/laminas-xml/issues",
+ "source": "https://github.com/laminas/laminas-xml",
+ "rss": "https://github.com/laminas/laminas-xml/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"
+ }
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^5.6 || ^7.0",
+ "laminas/laminas-zendframework-bridge": "^1.0"
},
"require-dev": {
- "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": {
- "ZendXml\\": "src/"
+ "Laminas\\Xml\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "ZendXmlTest\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev",
- "dev-develop": "1.3.x-dev"
+ "LaminasTest\\Xml\\": "test/"
}
},
"scripts": {
@@ -50,5 +52,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zendxml": "self.version"
}
}
diff --git a/php-laminas-xml.spec b/php-laminas-xml.spec
index fe3b197..599ea6f 100644
--- a/php-laminas-xml.spec
+++ b/php-laminas-xml.spec
@@ -1,4 +1,4 @@
-# remirepo/Fedora spec file for php-zendframework-zendxml
+# remirepo/Fedora spec file for php-laminas-xml
#
# Copyright (c) 2015-2020 Remi Collet
# License: CC-BY-SA
@@ -7,49 +7,66 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit eceab37a591c9e140772a1470338258857339e00
+%global gh_commit 879cc66d1bba6a37705e98074f52a6960c220020
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner zendframework
-%global gh_project zendxml
+%global gh_owner laminas
+%global gh_project laminas-xml
+%global zf_name zendxml
%global php_home %{_datadir}/php
-%global library ZendXml
+%global namespace Laminas
+%global library Xml
%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 %{library} component
+Summary: Laminas Framework %{library} component
License: BSD
-URL: https://framework.zend.com/
+URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.3.3
+BuildRequires: php(language) >= 5.6
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# remirepo:3
+%else
+BuildRequires: php-laminas-zendframework-bridge
+%endif
BuildRequires: php-simplexml
BuildRequires: php-dom
BuildRequires: php-libxml
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer, "require-dev": {
-# "phpunit/phpunit": "^3.7 || ^4.0",
-# "squizlabs/php_codesniffer": "~1.5"
-BuildRequires: php-composer(phpunit/phpunit) >= 3.7
+# "laminas/laminas-coding-standard": "~1.0.0",
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+BuildRequires: phpunit7 >= 7.1.4
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^5.3.3 || ^7.0"
-Requires: php(language) >= 5.3.3
-# From phpcompatinfo report for version 1.0.1
+# "php": "^5.6 || ^7.0",
+# "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}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# remirepo:3
+%else
+Requires: php-laminas-zendframework-bridge
+%endif
+# From phpcompatinfo report for version 1.2.0
Requires: php-simplexml
Requires: php-dom
Requires: php-libxml
@@ -58,10 +75,13 @@ Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
-Obsoletes: php-ZendFramework2-%{library} < 2.5
-Provides: php-ZendFramework2-%{library} = 1:%{version}
-Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
+# 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
@@ -78,10 +98,25 @@ mv LICENSE.md LICENSE
: Create autoloader
phpab --template fedora --output src/autoload.php src
+# Notice ZendXml instead of Zend/Xml
+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(__DIR__) . '/%{namespace}/%{library}/autoload.php',
+]);
+EOF
+
%install
-mkdir -p %{buildroot}%{php_home}
-cp -pr src %{buildroot}%{php_home}/%{library}
+: Laminas library
+mkdir -p %{buildroot}%{php_home}/%{namespace}/
+cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}
+
+: Zend equiv
+mkdir -p %{buildroot}%{php_home}/Zend%{library}
+cp -pr zf.php %{buildroot}%{php_home}/Zend%{library}/autoload.php
%check
@@ -89,16 +124,24 @@ cp -pr src %{buildroot}%{php_home}/%{library}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
-require_once '%{buildroot}%{php_home}/%{library}/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\Xml\\', dirname(__DIR__) . '/test');
+require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
EOF
+: upstream test suite
ret=0
-for cmd in php php56 php70 php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
if which $cmd; then
- $cmd %{_bindir}/phpunit --verbose || ret=1
+ $cmd %{_bindir}/phpunit7 --verbose || ret=1
fi
done
+
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend%{library}/autoload.php";
+return (class_exists("\\Zend%{library}\\Security") ? 0 : 1);
+'
+
exit $ret
%else
: Test suite disabled
@@ -110,10 +153,14 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%{php_home}/%{library}
+%{php_home}/Zend%{library}
+%{php_home}/%{namespace}/%{library}
%changelog
+* Wed Jan 8 2020 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- switch to Laminas
+
* Wed Jan 23 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1
- update to 1.2.0