Merge branch '2.0'

sebastianbergmann · sebastianbergmann · commit 4b4b23cec13b · 2014-04-16T16:50:15.000+02:00
diff --git a/src/Framework/MockObject/Generator/mocked_class.tpl.dist b/src/Framework/MockObject/Generator/mocked_class.tpl.dist
@@ -31,5 +31,6 @@
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }{epilogue}
diff --git a/tests/MockObject/class.phpt b/tests/MockObject/class.phpt
@@ -116,5 +116,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_call_parent_clone.phpt b/tests/MockObject/class_call_parent_clone.phpt
@@ -68,5 +68,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_call_parent_constructor.phpt b/tests/MockObject/class_call_parent_constructor.phpt
@@ -67,5 +67,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_dont_call_parent_clone.phpt b/tests/MockObject/class_dont_call_parent_clone.phpt
@@ -67,5 +67,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_dont_call_parent_constructor.phpt b/tests/MockObject/class_dont_call_parent_constructor.phpt
@@ -67,5 +67,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt b/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
@@ -72,5 +72,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt b/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
@@ -72,5 +72,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_partial.phpt b/tests/MockObject/class_partial.phpt
@@ -94,5 +94,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/class_with_method_named_method.phpt b/tests/MockObject/class_with_method_named_method.phpt
@@ -83,5 +83,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/interface.phpt b/tests/MockObject/interface.phpt
@@ -88,5 +88,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/invocation_object_clone_object.phpt b/tests/MockObject/invocation_object_clone_object.phpt
@@ -117,5 +117,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class.phpt b/tests/MockObject/namespaced_class.phpt
@@ -118,5 +118,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_call_parent_clone.phpt b/tests/MockObject/namespaced_class_call_parent_clone.phpt
@@ -70,5 +70,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_call_parent_constructor.phpt b/tests/MockObject/namespaced_class_call_parent_constructor.phpt
@@ -69,5 +69,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt b/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
@@ -69,5 +69,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt b/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
@@ -69,5 +69,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt b/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
@@ -74,5 +74,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt b/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
@@ -74,5 +74,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_class_partial.phpt b/tests/MockObject/namespaced_class_partial.phpt
@@ -96,5 +96,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/namespaced_interface.phpt b/tests/MockObject/namespaced_interface.phpt
@@ -90,5 +90,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/nonexistent_class.phpt b/tests/MockObject/nonexistent_class.phpt
@@ -65,5 +65,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/tests/MockObject/nonexistent_class_with_namespace.phpt b/tests/MockObject/nonexistent_class_with_namespace.phpt
@@ -71,6 +71,7 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
 
diff --git a/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt b/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
@@ -71,6 +71,7 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
 
diff --git a/tests/MockObject/proxy.phpt b/tests/MockObject/proxy.phpt
@@ -112,5 +112,6 @@ class ProxyFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __phpunit_verify()
     {
         $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,6 @@`
`31`	`31`	`public function __phpunit_verify()`
`32`	`32`	`{`
`33`	`33`	`$this->__phpunit_getInvocationMocker()->verify();`
	`34`	`+ $this->__phpunit_invocationMocker = NULL;`
`34`	`35`	`}`
`35`	`36`	`}{epilogue}`
Original file line number	Diff line number	Diff line change
`@@ -116,5 +116,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`116`	`116`	`public function __phpunit_verify()`
`117`	`117`	`{`
`118`	`118`	`$this->__phpunit_getInvocationMocker()->verify();`
	`119`	`+ $this->__phpunit_invocationMocker = NULL;`
`119`	`120`	`}`
`120`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`68`	`68`	`public function __phpunit_verify()`
`69`	`69`	`{`
`70`	`70`	`$this->__phpunit_getInvocationMocker()->verify();`
	`71`	`+ $this->__phpunit_invocationMocker = NULL;`
`71`	`72`	`}`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`67`	`67`	`public function __phpunit_verify()`
`68`	`68`	`{`
`69`	`69`	`$this->__phpunit_getInvocationMocker()->verify();`
	`70`	`+ $this->__phpunit_invocationMocker = NULL;`
`70`	`71`	`}`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,5 +72,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`72`	`72`	`public function __phpunit_verify()`
`73`	`73`	`{`
`74`	`74`	`$this->__phpunit_getInvocationMocker()->verify();`
	`75`	`+ $this->__phpunit_invocationMocker = NULL;`
`75`	`76`	`}`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,5 +94,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`94`	`94`	`public function __phpunit_verify()`
`95`	`95`	`{`
`96`	`96`	`$this->__phpunit_getInvocationMocker()->verify();`
	`97`	`+ $this->__phpunit_invocationMocker = NULL;`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,5 +83,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`83`	`83`	`public function __phpunit_verify()`
`84`	`84`	`{`
`85`	`85`	`$this->__phpunit_getInvocationMocker()->verify();`
	`86`	`+ $this->__phpunit_invocationMocker = NULL;`
`86`	`87`	`}`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo`
`88`	`88`	`public function __phpunit_verify()`
`89`	`89`	`{`
`90`	`90`	`$this->__phpunit_getInvocationMocker()->verify();`
	`91`	`+ $this->__phpunit_invocationMocker = NULL;`
`91`	`92`	`}`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,5 +117,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`117`	`117`	`public function __phpunit_verify()`
`118`	`118`	`{`
`119`	`119`	`$this->__phpunit_getInvocationMocker()->verify();`
	`120`	`+ $this->__phpunit_invocationMocker = NULL;`
`120`	`121`	`}`
`121`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,5 +118,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject`
`118`	`118`	`public function __phpunit_verify()`
`119`	`119`	`{`
`120`	`120`	`$this->__phpunit_getInvocationMocker()->verify();`
	`121`	`+ $this->__phpunit_invocationMocker = NULL;`
`121`	`122`	`}`
`122`	`123`	`}`