apigen: 4.1.2

2 files changed, 10 insertions, 33 deletions

diff --git a/apigen-upstream.patch b/apigen-upstream.patch
deleted file mode 100644
index 1ce36fa..0000000
--- a/apigen-upstream.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Adapted for 4.1.1 from:
-
-
-From e943361d3d2aff9fed9f68865f259f6da64106c0 Mon Sep 17 00:00:00 2001
-From: jadb <jadbitar@mac.com>
-Date: Sun, 4 Oct 2015 10:50:24 -0400
-Subject: [PATCH] Fix #631 - Add condition for expected type
-
----
- src/Generator/Resolvers/ElementResolver.php | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -up ./src/Generator/Resolvers/ElementResolver.php.orig ./src/Generator/Resolvers/ElementResolver.php
---- ./src/Generator/Resolvers/ElementResolver.php.orig	2015-11-05 12:48:47.582855729 +0100
-+++ ./src/Generator/Resolvers/ElementResolver.php	2015-11-05 12:51:25.721529497 +0100
-@@ -151,7 +151,8 @@ class ElementResolver
- 			}
- 		}
- 
--		if (($pos = strpos($definition, '::')) || ($pos = strpos($definition, '->'))) {
-+		if (($reflectionElement instanceof ClassReflectionInterface)
-+			&& ($pos = strpos($definition, '::') || $pos = strpos($definition, '->'))) {
- 			$reflectionElement = $this->resolveContextForClassProperty($definition, $reflectionElement, $pos);
- 			$definition = substr($definition, $pos + 2);
- 
diff --git a/apigen.spec b/apigen.spec
index 45cb395..21ae9fe 100644
--- a/apigen.spec
+++ b/apigen.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e9aff53d56d2b74104dee2b88396eb614e9717d5
+%global gh_commit    3365433ea3433b0e5c8f763608f8e63cbedb2a3a
 #global gh_date      20150728
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     ApiGen
@@ -16,8 +16,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           %{c_project}
-Version:        4.1.1
-%global specrel 3
+Version:        4.1.2
+%global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        PHP source code API generator
 
@@ -32,9 +32,6 @@ Source1:        makesrc.sh
 # and drop Herrera dependencies (only used for phar selfupdate command)
 Patch0:         %{name}-rpm.patch
 
-# From upstream git repo
-Patch1:         %{name}-upstream.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
@@ -82,7 +79,7 @@ BuildRequires:  php-composer(mockery/mockery) >= 0.9.3
 #        "nette/mail": "~2.2",
 #        "nette/robot-loader": "~2.2",
 #        "nette/safe-stream": "~2.2",
-#        "latte/latte": "~2.2",
+#        "latte/latte": ">=2.2.0,<2.3.5",
 #        "tracy/tracy": "~2.2",
 #        "kukulich/fshl": "~2.1",
 #        "andrewsville/php-token-reflection": "~1.4",
@@ -110,6 +107,7 @@ Requires:       php-composer(nette/robot-loader) <  3
 Requires:       php-composer(nette/safe-stream) >= 2.2
 Requires:       php-composer(nette/safe-stream) <  3
 Requires:       php-composer(latte/latte) >= 2.2
+# Max version 2.3.5 ignored
 Requires:       php-composer(latte/latte) <  3
 Requires:       php-composer(tracy/tracy) >= 2.2
 Requires:       php-composer(tracy/tracy) <  3
@@ -155,7 +153,7 @@ Smart and Readable Documentation for your PHP project.
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
-%patch1 -p1
+
 rm -r tests/Herrera
 rm -r src/Herrera
 rm    src/Command/SelfUpdateCommand.php
@@ -185,6 +183,10 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 sed -e 's:@BUILDROOT@:%{buildroot}:' -i tests/bootstrap.php
 : Run test suite
 %{_bindir}/phpunit --verbose
+
+if which php70; then
+  php70 %{_bindir}/phpunit --verbose
+fi
 %else
 : Test suite disabled
 %endif