diff options
| -rw-r--r-- | composer.json | 50 | ||||
| -rw-r--r-- | php-laminas-escaper.spec | 96 |
2 files changed, 94 insertions, 52 deletions
diff --git a/composer.json b/composer.json index 890d03a..c39174f 100644 --- a/composer.json +++ b/composer.json @@ -1,44 +1,45 @@ { - "name": "zendframework/zend-escaper", + "name": "laminas/laminas-escaper", "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs", "license": "BSD-3-Clause", "keywords": [ - "zf", - "zendframework", + "laminas", "escaper" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-escaper/", - "issues": "https://github.com/zendframework/zend-escaper/issues", - "source": "https://github.com/zendframework/zend-escaper", - "rss": "https://github.com/zendframework/zend-escaper/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-escaper/", + "issues": "https://github.com/laminas/laminas-escaper/issues", + "source": "https://github.com/laminas/laminas-escaper", + "rss": "https://github.com/laminas/laminas-escaper/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.x-dev" + } }, "require": { - "php": "^5.6 || ^7.0" + "php": "^5.6 || ^7.0", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", - "zendframework/zend-coding-standard": "~1.0.0" + "laminas/laminas-coding-standard": "~1.0.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" }, "autoload": { "psr-4": { - "Zend\\Escaper\\": "src/" + "Laminas\\Escaper\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Escaper\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.6.x-dev", - "dev-develop": "2.7.x-dev" + "LaminasTest\\Escaper\\": "test/" } }, "scripts": { @@ -50,5 +51,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-escaper": "self.version" } } diff --git a/php-laminas-escaper.spec b/php-laminas-escaper.spec index b17115b..7e4ab8c 100644 --- a/php-laminas-escaper.spec +++ b/php-laminas-escaper.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-zendframework-zend-escaper +# remirepo/Fedora spec file for php-laminas-escaper # # Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA @@ -7,11 +7,13 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 3801caa21b0ca6aca57fa1c42b08d35c395ebd5f +%global gh_commit 25f2a053eadfa92ddacb609dcbbc39362610da70 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-escaper +%global gh_owner laminas +%global gh_project laminas-escaper +%global zf_name zend-escaper %global php_home %{_datadir}/php +%global namespace Laminas %global library Escaper %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -19,13 +21,13 @@ %global with_tests 0%{!?_without_tests:1} %endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 2.6.1 Release: 1%{?dist} -Summary: Zend Framework %{library} component +Summary: Laminas Framework %{library} 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,31 +35,39 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:3 +%else +BuildRequires: php-laminas-zendframework-bridge +%endif BuildRequires: php-ctype BuildRequires: php-iconv BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", -# "zendframework/zend-coding-standard": "~1.0.0" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +# "laminas/laminas-coding-standard": "~1.0.0", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.1.2 -# remirepo:4 -%else -%global phpunit %{_bindir}/phpunit -BuildRequires: php-composer(phpunit/phpunit) >= 5.7 -%endif # Autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer, "require": { -# "php": "^5.6 || ^7.0" +# "php": "^5.6 || ^7.0", +# "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 -# From phpcompatinfo report for version 2.5.1 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:3 +%else +Requires: php-laminas-zendframework-bridge +%endif +# From phpcompatinfo report for version 2.6.1 Requires: php-ctype Requires: php-iconv Requires: php-mbstring @@ -66,21 +76,24 @@ Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.6.1-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 The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in second place. PHP’s sole functionality against XSS is limited to two -functions of which one is commonly misapplied. Thus, the Zend\Escaper +functions of which one is commonly misapplied. Thus, the %{gh_project} component was written. It offers developers a way to escape output and defend from XSS and related vulnerabilities by introducing contextual escaping based on peer-reviewed rules. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -92,10 +105,24 @@ mv LICENSE.md LICENSE %build phpab --template fedora --output src/autoload.php src +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}/autoload.php', +]); +EOF + %install -mkdir -p %{buildroot}%{php_home}/Zend/ -cp -pr src %{buildroot}%{php_home}/Zend/%{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 @@ -103,17 +130,25 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php -require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', 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 cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" 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 fi done + +: check compat autoloader +php -r ' +require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php"; +return (class_exists("\\Zend\\%{library}\\%{library}") ? 0 : 1); +' + exit $ret %else : Test suite disabled @@ -126,11 +161,14 @@ exit $ret %license LICENSE %doc *.md %doc composer.json -%dir %{php_home}/Zend %{php_home}/Zend/%{library} +%{php_home}/%{namespace}/%{library} %changelog +* Mon Jan 6 2020 Remi Collet <remi@remirepo.net> - 2.6.1-1 +- switch to Laminas + * Fri Sep 6 2019 Remi Collet <remi@remirepo.net> - 2.6.1-1 - update to 2.6.1 (no change) |