Merge branch '7.5' into 8.1

sebastianbergmann · Apr 19, 2019 · 4dca857 · 4dca857
2 parents 84a63cd + c9ea4fe
commit 4dca857
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 24 deletions.
diff --git a/src/Framework/MockObject/Generator/proxied_method.tpl.dist b/src/Framework/MockObject/Generator/proxied_method.tpl.dist
@@ -12,13 +12,15 @@
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             '{class_name}', '{method_name}', $__phpunit_arguments, '{return_type}', $this, {clone_arguments}
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         return call_user_func_array(array($this->__phpunit_originalObject, "{method_name}"), $__phpunit_arguments);
     }
diff --git a/src/Framework/MockObject/Generator/proxied_method_void.tpl.dist b/src/Framework/MockObject/Generator/proxied_method_void.tpl.dist
@@ -12,13 +12,15 @@
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             '{class_name}', '{method_name}', $__phpunit_arguments, '{return_type}', $this, {clone_arguments}
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         call_user_func_array(array($this->__phpunit_originalObject, "{method_name}"), $__phpunit_arguments);
     }
diff --git a/tests/end-to-end/mock-objects/generator/proxy.phpt b/tests/end-to-end/mock-objects/generator/proxy.phpt
@@ -49,13 +49,15 @@ class ProxyFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'Foo', 'bar', $__phpunit_arguments, '', $this, true
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $__phpunit_arguments);
     }
@@ -73,13 +75,15 @@ class ProxyFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'Foo', 'baz', $__phpunit_arguments, '', $this, true
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
+
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        unset($__phpunit_invocation);
 
         return call_user_func_array(array($this->__phpunit_originalObject, "baz"), $__phpunit_arguments);
     }

diff --git a/tests/end-to-end/mock-objects/mock-method/call_original.phpt b/tests/end-to-end/mock-objects/mock-method/call_original.phpt
@@ -35,13 +35,15 @@ print $code;
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'Foo', 'bar', $__phpunit_arguments, '', $this, false
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $__phpunit_arguments);
     }
diff --git a/tests/end-to-end/mock-objects/mock-method/call_original_with_argument.phpt b/tests/end-to-end/mock-objects/mock-method/call_original_with_argument.phpt
@@ -35,13 +35,15 @@ private function bar($arg)
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'Foo', 'bar', $__phpunit_arguments, '', $this, false
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $__phpunit_arguments);
     }
diff --git a/tests/end-to-end/mock-objects/mock-method/call_original_with_argument_variadic.phpt b/tests/end-to-end/mock-objects/mock-method/call_original_with_argument_variadic.phpt
@@ -35,13 +35,15 @@ private function bar(...$args)
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'Foo', 'bar', $__phpunit_arguments, '', $this, false
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $__phpunit_arguments);
     }
diff --git a/tests/end-to-end/mock-objects/mock-method/call_original_with_return_type_void.phpt b/tests/end-to-end/mock-objects/mock-method/call_original_with_return_type_void.phpt
@@ -35,13 +35,15 @@ print $code;
             }
         }
 
-        $invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+        $__phpunit_invocation = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'Foo', 'bar', $__phpunit_arguments, 'void', $this, false
         );
 
-        $invocation->setProxiedCall();
+        $__phpunit_invocation->setProxiedCall();
 
-        $this->__phpunit_getInvocationMocker()->invoke($invocation);
+        $this->__phpunit_getInvocationMocker()->invoke($__phpunit_invocation);
+
+        unset($__phpunit_invocation);
 
         call_user_func_array(array($this->__phpunit_originalObject, "bar"), $__phpunit_arguments);
     }