diff options
| -rw-r--r-- | composer.json | 48 | ||||
| -rw-r--r-- | php-zetacomponents-base-pr8.patch | 62 | ||||
| -rw-r--r-- | php-zetacomponents-base-upstream.patch | 233 | ||||
| -rw-r--r-- | php-zetacomponents-base.spec | 15 |
4 files changed, 54 insertions, 304 deletions
diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..94ff06f --- /dev/null +++ b/composer.json @@ -0,0 +1,48 @@ +{ + "authors": [ + { + "name": "Sergey Alexeev" + }, + { + "name": "Sebastian Bergmann" + }, + { + "name": "Jan Borsodi" + }, + { + "name": "Raymond Bosman" + }, + { + "name": "Frederik Holljen" + }, + { + "name": "Kore Nordmann" + }, + { + "name": "Derick Rethans" + }, + { + "name": "Vadym Savchuk" + }, + { + "name": "Tobias Schlitt" + }, + { + "name": "Alexandru Stanoi" + } + ], + "autoload": { + "classmap": [ + "src" + ] + }, + "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", + "homepage": "https://github.com/zetacomponents", + "license": "Apache-2.0", + "name": "zetacomponents/base", + "type": "library", + "require-dev": { + "phpunit/phpunit": "~5.7", + "zetacomponents/unit-test": "*" + } +} diff --git a/php-zetacomponents-base-pr8.patch b/php-zetacomponents-base-pr8.patch deleted file mode 100644 index d0c8d1c..0000000 --- a/php-zetacomponents-base-pr8.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 850e8287b035fa8b13bd5ab563eacaf1ee2ec1b5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 30 Oct 2017 12:27:03 +0100 -Subject: [PATCH] object is a reserved keywork in PHP 7.2 - ---- - tests/base_test.php | 4 ++-- - tests/test_repository/autoload_files/object_autoload.php | 5 ----- - tests/test_repository/autoload_files/objet_autoload.php | 5 +++++ - tests/test_repository/object/object.php | 3 ++- - 4 files changed, 9 insertions(+), 8 deletions(-) - delete mode 100644 tests/test_repository/autoload_files/object_autoload.php - create mode 100644 tests/test_repository/autoload_files/objet_autoload.php - -diff --git a/tests/base_test.php b/tests/base_test.php -index 9ab3821..ce410bb 100644 ---- a/tests/base_test.php -+++ b/tests/base_test.php -@@ -424,8 +424,8 @@ public function testBaseAddAndGetAutoloadDirs4() - public function testNoPrefixAutoload() - { - ezcBase::addClassRepository( __DIR__ . '/test_repository', __DIR__ . '/test_repository/autoload_files' ); -- ezc_autoload( 'Object' ); -- if ( !class_exists( 'Object' ) ) -+ ezc_autoload( 'Objet' ); -+ if ( !class_exists( 'Objet' ) ) - { - $this->fail( "Autoload does not handle classes with no prefix" ); - } -diff --git a/tests/test_repository/autoload_files/object_autoload.php b/tests/test_repository/autoload_files/object_autoload.php -deleted file mode 100644 -index 5e3dc90..0000000 ---- a/tests/test_repository/autoload_files/object_autoload.php -+++ /dev/null -@@ -1,5 +0,0 @@ --<?php --return array( -- 'Object' => 'object/object.php', --); --?> -diff --git a/tests/test_repository/autoload_files/objet_autoload.php b/tests/test_repository/autoload_files/objet_autoload.php -new file mode 100644 -index 0000000..1e81bb0 ---- /dev/null -+++ b/tests/test_repository/autoload_files/objet_autoload.php -@@ -0,0 +1,5 @@ -+<?php -+return array( -+ 'Objet' => 'object/object.php', -+); -+?> -diff --git a/tests/test_repository/object/object.php b/tests/test_repository/object/object.php -index 3b46ba6..6c39fcd 100644 ---- a/tests/test_repository/object/object.php -+++ b/tests/test_repository/object/object.php -@@ -1,4 +1,5 @@ - <?php --class Object{ -+class Objet{ -+// Objet is not a typo, Object is a reserved keywork in 7.2+ - } - ?> diff --git a/php-zetacomponents-base-upstream.patch b/php-zetacomponents-base-upstream.patch deleted file mode 100644 index b913ef2..0000000 --- a/php-zetacomponents-base-upstream.patch +++ /dev/null @@ -1,233 +0,0 @@ -From d816bd6d7902d949fae43df135c0ca36bfcf742d Mon Sep 17 00:00:00 2001 -From: Derick Rethans <github@derickrethans.nl> -Date: Wed, 3 Jun 2015 10:25:37 -0400 -Subject: [PATCH] Added full Apache license into LICENSE file - ---- - LICENSE | 11 ---- - LICENSE.txt | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 215 insertions(+), 11 deletions(-) - delete mode 100644 LICENSE - create mode 100644 LICENSE.txt - -diff --git a/LICENSE.txt b/LICENSE.txt -new file mode 100644 -index 0000000..4b88e0a ---- /dev/null -+++ b/LICENSE.txt -@@ -0,0 +1,215 @@ -+Zeta Components -+Copyright 2011-2015 The Zeta Components development group -+ -+Apache Zeta Components -+Copyright 2010-2011 The Apache Software Foundation -+ -+This product includes software developed at -+The Apache Software Foundation (http://www.apache.org/). -+ -+Originally developed by eZ Systems as eZ Components -+Copyright 2005-2010 eZ Systems AS (http://ez.no) -+ -+----- -+ -+ Apache License -+ Version 2.0, January 2004 -+ http://www.apache.org/licenses/ -+ -+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -+ -+ 1. Definitions. -+ -+ "License" shall mean the terms and conditions for use, reproduction, -+ and distribution as defined by Sections 1 through 9 of this document. -+ -+ "Licensor" shall mean the copyright owner or entity authorized by -+ the copyright owner that is granting the License. -+ -+ "Legal Entity" shall mean the union of the acting entity and all -+ other entities that control, are controlled by, or are under common -+ control with that entity. For the purposes of this definition, -+ "control" means (i) the power, direct or indirect, to cause the -+ direction or management of such entity, whether by contract or -+ otherwise, or (ii) ownership of fifty percent (50%) or more of the -+ outstanding shares, or (iii) beneficial ownership of such entity. -+ -+ "You" (or "Your") shall mean an individual or Legal Entity -+ exercising permissions granted by this License. -+ -+ "Source" form shall mean the preferred form for making modifications, -+ including but not limited to software source code, documentation -+ source, and configuration files. -+ -+ "Object" form shall mean any form resulting from mechanical -+ transformation or translation of a Source form, including but -+ not limited to compiled object code, generated documentation, -+ and conversions to other media types. -+ -+ "Work" shall mean the work of authorship, whether in Source or -+ Object form, made available under the License, as indicated by a -+ copyright notice that is included in or attached to the work -+ (an example is provided in the Appendix below). -+ -+ "Derivative Works" shall mean any work, whether in Source or Object -+ form, that is based on (or derived from) the Work and for which the -+ editorial revisions, annotations, elaborations, or other modifications -+ represent, as a whole, an original work of authorship. For the purposes -+ of this License, Derivative Works shall not include works that remain -+ separable from, or merely link (or bind by name) to the interfaces of, -+ the Work and Derivative Works thereof. -+ -+ "Contribution" shall mean any work of authorship, including -+ the original version of the Work and any modifications or additions -+ to that Work or Derivative Works thereof, that is intentionally -+ submitted to Licensor for inclusion in the Work by the copyright owner -+ or by an individual or Legal Entity authorized to submit on behalf of -+ the copyright owner. For the purposes of this definition, "submitted" -+ means any form of electronic, verbal, or written communication sent -+ to the Licensor or its representatives, including but not limited to -+ communication on electronic mailing lists, source code control systems, -+ and issue tracking systems that are managed by, or on behalf of, the -+ Licensor for the purpose of discussing and improving the Work, but -+ excluding communication that is conspicuously marked or otherwise -+ designated in writing by the copyright owner as "Not a Contribution." -+ -+ "Contributor" shall mean Licensor and any individual or Legal Entity -+ on behalf of whom a Contribution has been received by Licensor and -+ subsequently incorporated within the Work. -+ -+ 2. Grant of Copyright License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ copyright license to reproduce, prepare Derivative Works of, -+ publicly display, publicly perform, sublicense, and distribute the -+ Work and such Derivative Works in Source or Object form. -+ -+ 3. Grant of Patent License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ (except as stated in this section) patent license to make, have made, -+ use, offer to sell, sell, import, and otherwise transfer the Work, -+ where such license applies only to those patent claims licensable -+ by such Contributor that are necessarily infringed by their -+ Contribution(s) alone or by combination of their Contribution(s) -+ with the Work to which such Contribution(s) was submitted. If You -+ institute patent litigation against any entity (including a -+ cross-claim or counterclaim in a lawsuit) alleging that the Work -+ or a Contribution incorporated within the Work constitutes direct -+ or contributory patent infringement, then any patent licenses -+ granted to You under this License for that Work shall terminate -+ as of the date such litigation is filed. -+ -+ 4. Redistribution. You may reproduce and distribute copies of the -+ Work or Derivative Works thereof in any medium, with or without -+ modifications, and in Source or Object form, provided that You -+ meet the following conditions: -+ -+ (a) You must give any other recipients of the Work or -+ Derivative Works a copy of this License; and -+ -+ (b) You must cause any modified files to carry prominent notices -+ stating that You changed the files; and -+ -+ (c) You must retain, in the Source form of any Derivative Works -+ that You distribute, all copyright, patent, trademark, and -+ attribution notices from the Source form of the Work, -+ excluding those notices that do not pertain to any part of -+ the Derivative Works; and -+ -+ (d) If the Work includes a "NOTICE" text file as part of its -+ distribution, then any Derivative Works that You distribute must -+ include a readable copy of the attribution notices contained -+ within such NOTICE file, excluding those notices that do not -+ pertain to any part of the Derivative Works, in at least one -+ of the following places: within a NOTICE text file distributed -+ as part of the Derivative Works; within the Source form or -+ documentation, if provided along with the Derivative Works; or, -+ within a display generated by the Derivative Works, if and -+ wherever such third-party notices normally appear. The contents -+ of the NOTICE file are for informational purposes only and -+ do not modify the License. You may add Your own attribution -+ notices within Derivative Works that You distribute, alongside -+ or as an addendum to the NOTICE text from the Work, provided -+ that such additional attribution notices cannot be construed -+ as modifying the License. -+ -+ You may add Your own copyright statement to Your modifications and -+ may provide additional or different license terms and conditions -+ for use, reproduction, or distribution of Your modifications, or -+ for any such Derivative Works as a whole, provided Your use, -+ reproduction, and distribution of the Work otherwise complies with -+ the conditions stated in this License. -+ -+ 5. Submission of Contributions. Unless You explicitly state otherwise, -+ any Contribution intentionally submitted for inclusion in the Work -+ by You to the Licensor shall be under the terms and conditions of -+ this License, without any additional terms or conditions. -+ Notwithstanding the above, nothing herein shall supersede or modify -+ the terms of any separate license agreement you may have executed -+ with Licensor regarding such Contributions. -+ -+ 6. Trademarks. This License does not grant permission to use the trade -+ names, trademarks, service marks, or product names of the Licensor, -+ except as required for reasonable and customary use in describing the -+ origin of the Work and reproducing the content of the NOTICE file. -+ -+ 7. Disclaimer of Warranty. Unless required by applicable law or -+ agreed to in writing, Licensor provides the Work (and each -+ Contributor provides its Contributions) on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -+ implied, including, without limitation, any warranties or conditions -+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -+ PARTICULAR PURPOSE. You are solely responsible for determining the -+ appropriateness of using or redistributing the Work and assume any -+ risks associated with Your exercise of permissions under this License. -+ -+ 8. Limitation of Liability. In no event and under no legal theory, -+ whether in tort (including negligence), contract, or otherwise, -+ unless required by applicable law (such as deliberate and grossly -+ negligent acts) or agreed to in writing, shall any Contributor be -+ liable to You for damages, including any direct, indirect, special, -+ incidental, or consequential damages of any character arising as a -+ result of this License or out of the use or inability to use the -+ Work (including but not limited to damages for loss of goodwill, -+ work stoppage, computer failure or malfunction, or any and all -+ other commercial damages or losses), even if such Contributor -+ has been advised of the possibility of such damages. -+ -+ 9. Accepting Warranty or Additional Liability. While redistributing -+ the Work or Derivative Works thereof, You may choose to offer, -+ and charge a fee for, acceptance of support, warranty, indemnity, -+ or other liability obligations and/or rights consistent with this -+ License. However, in accepting such obligations, You may act only -+ on Your own behalf and on Your sole responsibility, not on behalf -+ of any other Contributor, and only if You agree to indemnify, -+ defend, and hold each Contributor harmless for any liability -+ incurred by, or claims asserted against, such Contributor by reason -+ of your accepting any such warranty or additional liability. -+ -+ END OF TERMS AND CONDITIONS -+ -+ APPENDIX: How to apply the Apache License to your work. -+ -+ To apply the Apache License to your work, attach the following -+ boilerplate notice, with the fields enclosed by brackets "[]" -+ replaced with your own identifying information. (Don't include -+ the brackets!) The text should be enclosed in the appropriate -+ comment syntax for the file format. We also recommend that a -+ file or class name and description of purpose be included on the -+ same "printed page" as the copyright notice for easier -+ identification within third-party archives. -+ -+ Copyright [yyyy] [name of copyright owner] -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. diff --git a/php-zetacomponents-base.spec b/php-zetacomponents-base.spec index ec5ddc9..b759dfd 100644 --- a/php-zetacomponents-base.spec +++ b/php-zetacomponents-base.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit f20df24e8de3e48b6b69b2503f917e457281e687 +%global gh_commit 489e20235989ddc97fdd793af31ac803972454f1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zetacomponents %global gh_project Base @@ -16,8 +16,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-%{gh_owner}-%{cname} -Version: 1.9 -Release: 6%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Zeta Base Component Group: Development/Libraries @@ -27,10 +27,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Use old PEAR layout Patch0: %{name}-layout.patch -# Upstream -Patch1: %{name}-upstream.patch -# For PHP 7.2 -Patch2: %{name}-pr8.patch BuildArch: noarch BuildRequires: %{_bindir}/phpab @@ -61,8 +57,6 @@ autoload support. %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p0 -%patch1 -p1 -%patch2 -p1 %build @@ -122,6 +116,9 @@ exit $ret %changelog +* Wed Nov 29 2017 Remi Collet <remi@remirepo.net> - 1.9.1-1 +- Update to 1.9.1 + * Mon Oct 30 2017 Remi Collet <remi@fedoraproject.org> - 1.9-6 - fix FTBFS from Koschei, add patch for tests from https://github.com/zetacomponents/Base/pull/8 |