[php-ocramius-instantiator/f20] update to 1.1.4

[Remi Collet]

commit 5746f7d148ad94a1d14adeecf661b028533d3d39
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Oct 6 07:38:46 2014 +0200

    update to 1.1.4

 .gitignore                     |    2 ++
 php-ocramius-instantiator.spec |   33 ++++++++++++++++++++-------------
 sources                        |    2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbeaea5..b9f5852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /Instantiator-1.0.0.tar.gz
 /Instantiator-1.1.2.tar.gz
+/Instantiator-1.1.3.tar.gz
+/Instantiator-1.1.4.tar.gz
diff --git a/php-ocramius-instantiator.spec b/php-ocramius-instantiator.spec
index 7917f8f..3dd0c30 100644
--- a/php-ocramius-instantiator.spec
+++ b/php-ocramius-instantiator.spec
@@ -9,7 +9,7 @@
 
 # bootstrap needed when rebuilding PHPUnit for new major version
 %global bootstrap    0
-%global gh_commit    a7abbb5fc9df6e7126af741dd6c140d1a7369435
+%global gh_commit    51bbc28391ff3c16fb6fd8bf8e10b5f9bb944bed
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     Ocramius
 %global gh_project   Instantiator
@@ -18,11 +18,10 @@
 %else
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %endif
-%global phpverid     %(%{_bindir}/php -r 'echo PHP_VERSION_ID;' || echo 50000)
 
 Name:           php-ocramius-instantiator
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Instantiate objects in PHP without invoking their constructors
 
 Group:          Development/Libraries
@@ -31,11 +30,14 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
 
 BuildArch:      noarch
+%if %{with_tests}
 BuildRequires:  php(language) >= 5.3.3
+BuildRequires:  php-pdo
 BuildRequires:  php-phpunit-PHPUnit
 BuildRequires:  php-theseer-autoload
 BuildRequires:  php-composer(ocramius/lazy-map) >= 1.0.0
 BuildRequires:  php-composer(ocramius/lazy-map) <  1.1
+%endif
 
 # From composer.json
 #        "php": ">=5.3.3"
@@ -76,23 +78,25 @@ cp -pr src/* %{buildroot}%{_datadir}/php
     --output autoload.php \
     src tests %{_datadir}/php/LazyMap
 
-if [ -d /usr/share/php/PHPUnit ]; then
-# Hack PHPUnit 4.x autoloader to not use system Instantiator
-mkdir PHPUnit
-sed -e '/Instantiator/d' \
+if [ -d /usr/share/php/PHPUnit ] \
+   && ! grep -q Doctrine /usr/share/php/PHPUnit/Autoload.php
+then
+  # Hack PHPUnit 4.2 autoloader to not use system Instantiator
+  mkdir PHPUnit
+  sed -e '/Instantiator/d' \
     -e 's:dirname(__FILE__):"/usr/share/php/PHPUnit":' \
     /usr/share/php/PHPUnit/Autoload.php \
     >PHPUnit/Autoload.php
 fi
 
-: Run test suite with PHP  %{phpverid}
+sed -e 's/colors="true"//' \
+    -e '/log/d' \
+    phpunit.xml.dist >phpunit.xml
+
+: Run test suite
 %{_bindir}/phpunit \
     --bootstrap autoload.php \
-%if %{phpverid} >= 50600
-    -d date.timezone=UTC || : Ignore test suite result
-%else
     -d date.timezone=UTC
-%endif
 %else
 : Test suite disabled
 %endif
@@ -106,6 +110,9 @@ fi
 
 
 %changelog
+* Sun Oct  5 2014 Remi Collet <remi at fedoraproject.org> - 1.1.4-1
+- update to 1.1.4
+
 * Sat Aug 16 2014 Remi Collet <remi at fedoraproject.org> - 1.1.2-2
 - fix test suite
 
diff --git a/sources b/sources
index f1f7b78..7d0873e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b46e1851190fca3a4e7d19da6b311f9a  Instantiator-1.1.2.tar.gz
+720800c86c3593f5438242966ce44f0e  Instantiator-1.1.4.tar.gz