diff options
| author | Remi Collet <remi@remirepo.net> | 2018-10-15 09:00:01 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-10-15 09:00:01 +0200 |
| commit | 909d6e92707618b8f6322bf99df9a4ff08120377 (patch) | |
| tree | 82fc0717ee79bb1bd98fab4ebe3b03cf18adacc1 | |
| parent | b7e845ca1ca3621822fa4cbf0bb90bfd30453650 (diff) | |
add patch for PHP 7.3 from https://github.com/zendframework/zend-file/pull/45
| -rw-r--r-- | 466f249d772c188d1370545aba65bf0126bdfef0.patch | 23 | ||||
| -rw-r--r-- | php-zendframework-zend-file.spec | 11 |
2 files changed, 32 insertions, 2 deletions
diff --git a/466f249d772c188d1370545aba65bf0126bdfef0.patch b/466f249d772c188d1370545aba65bf0126bdfef0.patch new file mode 100644 index 0000000..1e139ca --- /dev/null +++ b/466f249d772c188d1370545aba65bf0126bdfef0.patch @@ -0,0 +1,23 @@ +From 466f249d772c188d1370545aba65bf0126bdfef0 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 15 Oct 2018 08:53:35 +0200 +Subject: [PATCH] Fix for PHP 7.3: "continue" targeting switch is equivalent to + "break". Did you mean to use "continue 2"? + +--- + src/Transfer/Adapter/AbstractAdapter.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Transfer/Adapter/AbstractAdapter.php b/src/Transfer/Adapter/AbstractAdapter.php +index bc90dfe..48b615d 100644 +--- a/src/Transfer/Adapter/AbstractAdapter.php ++++ b/src/Transfer/Adapter/AbstractAdapter.php +@@ -545,7 +545,7 @@ public function setOptions($options = [], $files = null) + break; + + default: +- continue; ++ break; + } + } + } diff --git a/php-zendframework-zend-file.spec b/php-zendframework-zend-file.spec index a6ccb9f..dbe4e4c 100644 --- a/php-zendframework-zend-file.spec +++ b/php-zendframework-zend-file.spec @@ -21,7 +21,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.8.1 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -29,6 +29,8 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: https://github.com/zendframework/zend-file/commit/466f249d772c188d1370545aba65bf0126bdfef0.patch + BuildArch: noarch # Tests %if %{with_tests} @@ -126,6 +128,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 mv LICENSE.md LICENSE @@ -165,7 +168,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -186,6 +189,10 @@ exit $ret %changelog +* Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 2.8.1-4 +- add patch for PHP 7.3 from + https://github.com/zendframework/zend-file/pull/45 + * Wed May 2 2018 Remi Collet <remi@remirepo.net> - 2.8.1-2 - update to 2.8.1 |