v1.1.2

5 files changed, 66 insertions, 309 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..685edce
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,47 @@
+{
+    "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": "zetacomponents/unit-test Component",
+    "homepage": "https://github.com/zetacomponents",
+    "license": "Apache-2.0",
+    "name": "zetacomponents/unit-test",
+    "type": "library",
+    "require": {
+        "phpunit/phpunit": "^7.0"
+    }
+}
diff --git a/php-zetacomponents-unit-test-pr5.patch b/php-zetacomponents-unit-test-pr5.patch
deleted file mode 100644
index b3a211f..0000000
--- a/php-zetacomponents-unit-test-pr5.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e310f21a220f8e52d5ef86d2474bd2fbeeb82e25 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 3 Jun 2015 15:00:36 +0200
-Subject: [PATCH] fix ezcTestConstraintSimilarImage for recent phpunit
-
----
- src/constraint/image.php | 24 +++++-------------------
- 1 file changed, 5 insertions(+), 19 deletions(-)
-
-diff --git a/src/constraint/image.php b/src/constraint/image.php
-index be037c5..7c837ab 100644
---- a/src/constraint/image.php
-+++ b/src/constraint/image.php
-@@ -154,36 +154,22 @@ public function evaluate( $other, $description = '', $returnResult = false )
-      * @param   boolean $not Flag to indicate negation.
-      * @throws  PHPUnit_Framework_ExpectationFailedException
-      */
--    public function fail( $other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL )
-+    public function fail( $other, $description, SebastianBergmann\Comparator\ComparisonFailure  $comparisonFailure = NULL )
-     {
-         $failureDescription = sprintf(
-           'Failed asserting that image "%s" is similar to image "%s".',
--
-            $other,
-            $this->filename
-         );
- 
--        if ($not) {
--            $failureDescription = self::negate($failureDescription);
--        }
--
-         if (!empty($description)) {
-             $failureDescription = $description . "\n" . $failureDescription;
-         }
- 
--        if (!$not) {
--            throw new PHPUnit_Framework_ExpectationFailedException(
--              $failureDescription,
--              PHPUnit_Framework_ComparisonFailure::diffEqual(
--                $this->delta,
--                $this->difference
--              )
--            );
--        } else {
--            throw new PHPUnit_Framework_ExpectationFailedException(
--              $failureDescription
--            );
--        }
-+        throw new PHPUnit_Framework_ExpectationFailedException(
-+          $failureDescription,
-+          $comparisonFailure
-+        );
-     }
- 
-     /**
diff --git a/php-zetacomponents-unit-test-upstream.patch b/php-zetacomponents-unit-test-upstream.patch
deleted file mode 100644
index 7819890..0000000
--- a/php-zetacomponents-unit-test-upstream.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-From c5a6da64b2baca735ce38177ead3af3709da6a9d Mon Sep 17 00:00:00 2001
-From: Derick Rethans <github@derickrethans.nl>
-Date: Wed, 3 Jun 2015 10:26:09 -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-unit-test.spec b/php-zetacomponents-unit-test.spec
index 92bdbad..bde5867 100644
--- a/php-zetacomponents-unit-test.spec
+++ b/php-zetacomponents-unit-test.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-zetacomponents-unit-test
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
-%global gh_commit    075742e2ad692c58da4dc593518a4d110f7eb822
+%global gh_commit    95f0c2e113994f88ab866779d673e285d3da7e66
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zetacomponents
 %global gh_project   UnitTest
@@ -15,23 +15,16 @@
 %global ezcdir       %{_datadir}/php/ezc
 
 Name:           php-%{gh_owner}-%{cname}
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Zeta UnitTest Component
 
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://zetacomponents.org/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 
-# https://github.com/zetacomponents/UnitTest/pull/5
-Patch0:         %{name}-pr5.patch
-# Upstream
-Patch1:         %{name}-upstream.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  %{_bindir}/phpab
+BuildRequires:  php-fedora-autoloader-devel
 
 # From phpcompatinfo report for 1.0.2
 Requires:       php(language) > 5.3
@@ -40,6 +33,7 @@ Requires:       php-reflection
 Requires:       php-spl
 Requires:       php-composer(phpunit/phpunit)
 # Also use Exception for Base, skipped to avoid circular dep.
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{gh_owner}/%{cname}) = %{version}
 
@@ -56,19 +50,16 @@ the mailing list.
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1
-%patch1 -p1
-
 
 %build
 : Generate a simple autoloader
 %{_bindir}/phpab \
+   --template fedora \
    --output src/autoloader.php \
    src
 
 
 %install
-rm -rf   %{buildroot}
 mkdir -p %{buildroot}%{ezcdir}/autoload
 
 : The library
@@ -79,12 +70,8 @@ cp -pr src/*_autoload.php \
        %{buildroot}%{ezcdir}/autoload
 
 
-%clean
-rm -rf %{buildroot}
-
 
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE* CREDITS
 %doc ChangeLog
@@ -97,10 +84,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 27 2019 Remi Collet <remi@remirepo.net> - 1.1.2-1
+- update to 1.1.2
+
 * Thu Jun  4 2015 Remi Collet <remi@fedoraproject.org> - 1.0.2-2
 - add upstream patch for LICENSE file
 
 * Wed Jun  3 2015 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
 - initial package
 - open https://github.com/zetacomponents/UnitTest/issues/4 License
-- open https://github.com/zetacomponents/UnitTest/pull/5 phpunit 4
\ No newline at end of file
+- open https://github.com/zetacomponents/UnitTest/pull/5 phpunit 4