From e4ba30c63be0cfebfe999f84ee7155c123da1399 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Nov 2015 08:41:15 +0100 Subject: apigen: 4.1.2 --- apigen-upstream.patch | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 apigen-upstream.patch (limited to 'apigen-upstream.patch') 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 -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); - -- cgit