summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-phpunit-PHPUnit-MockObject.spec11
-rw-r--r--phpunit-mock-objects-upstream.patch67
2 files changed, 5 insertions, 73 deletions
diff --git a/php-phpunit-PHPUnit-MockObject.spec b/php-phpunit-PHPUnit-MockObject.spec
index 81fadd0..ad9e985 100644
--- a/php-phpunit-PHPUnit-MockObject.spec
+++ b/php-phpunit-PHPUnit-MockObject.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit d87a195502b5e139a665c7b2f962381282878aac
+%global gh_commit 4a6423af97d4b4a0010a1ac5addfad4843c3e97b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpunit-mock-objects
@@ -17,7 +17,7 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: php-phpunit-PHPUnit-MockObject
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
Summary: Mock Object library for PHPUnit
@@ -32,9 +32,6 @@ Source1: Autoload.php.in
# Temporary workaround, under investigation
Patch0: %{gh_project}-rpm.patch
-# Upstream fix for PHP 5.4.29 and 5.5.13
-Patch1: %{gh_project}-upstream.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{_bindir}/phpab
@@ -63,7 +60,6 @@ Mock Object library for PHPUnit
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p1
-%patch1 -p1
find . -name \*.orig -exec rm {} \; -print
@@ -111,6 +107,9 @@ fi
%changelog
+* Sat Jun 7 2014 Remi Collet <remi@fedoraproject.org> - 2.1.2-1
+- update to 2.1.2
+
* Fri Jun 6 2014 Remi Collet <remi@fedoraproject.org> - 2.1.1-1
- update to 2.1.1
diff --git a/phpunit-mock-objects-upstream.patch b/phpunit-mock-objects-upstream.patch
deleted file mode 100644
index 1775124..0000000
--- a/phpunit-mock-objects-upstream.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1c68f1338f1940deb8265428bb2a7cbc5bc074b5 Mon Sep 17 00:00:00 2001
-From: Maksim Kochkin <maxxarts@gmail.com>
-Date: Fri, 11 Apr 2014 21:12:26 +0400
-Subject: [PATCH] Use newInstanceWithoutConstructor when possible
-
-Comment says
-
-// We have to use this dirty trick instead of ReflectionClass::newInstanceWithoutConstructor()
-// because of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/154
-
-As I see the only reason to use unserialize here is internal classes (or not?). So how about using unserialize for internal classes and newInstanceWithoutConstructor for other?
----
- src/Framework/MockObject/Generator.php | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
-index 59f10ad..1d8467b 100644
---- a/src/Framework/MockObject/Generator.php
-+++ b/src/Framework/MockObject/Generator.php
-@@ -267,11 +267,14 @@ protected function getObject($code, $className, $type = '', $callOriginalConstru
- $object = $class->newInstanceArgs($arguments);
- }
- } else {
-- // We have to use this dirty trick instead of ReflectionClass::newInstanceWithoutConstructor()
-- // because of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/154
-- $object = unserialize(
-- sprintf('O:%d:"%s":0:{}', strlen($className), $className)
-- );
-+ $class = new ReflectionClass($className);
-+ if ($class->isInternal()) {
-+ $object = unserialize(
-+ sprintf('O:%d:"%s":0:{}', strlen($className), $className)
-+ );
-+ } else {
-+ $object = $class->newInstanceWithoutConstructor();
-+ }
- }
-
- if ($callOriginalMethods) {
---
-1.9.3
-
-From ba8784d88ff4cc52cf9424d7f7c631ccd867019c Mon Sep 17 00:00:00 2001
-From: Maksim Kochkin <maxxarts@gmail.com>
-Date: Mon, 14 Apr 2014 00:09:22 +0400
-Subject: [PATCH] newInstanceWithoutConstructor only for 5.4+
-
----
- src/Framework/MockObject/Generator.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
-index 1d8467b..a4c7037 100644
---- a/src/Framework/MockObject/Generator.php
-+++ b/src/Framework/MockObject/Generator.php
-@@ -268,7 +268,7 @@ protected function getObject($code, $className, $type = '', $callOriginalConstru
- }
- } else {
- $class = new ReflectionClass($className);
-- if ($class->isInternal()) {
-+ if ($class->isInternal() || version_compare(PHP_VERSION, '5.4.0', '<')) {
- $object = unserialize(
- sprintf('O:%d:"%s":0:{}', strlen($className), $className)
- );
---
-1.9.3
-