Fix two cases listed in #100

edorian · edorian · commit be7772f7ab25 · 2012-10-15T23:43:30.000+02:00
diff --git a/PHPUnit/Framework/MockObject/Generator/mocked_clone.tpl.dist b/PHPUnit/Framework/MockObject/Generator/mocked_clone.tpl.dist
@@ -1,5 +1,4 @@
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
diff --git a/Tests/MockObject/class.phpt b/Tests/MockObject/class.phpt
@@ -36,7 +36,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(Foo $foo)
diff --git a/Tests/MockObject/class_call_parent_clone.phpt b/Tests/MockObject/class_call_parent_clone.phpt
@@ -32,7 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
         parent::__clone();
     }
 
diff --git a/Tests/MockObject/class_call_parent_constructor.phpt b/Tests/MockObject/class_call_parent_constructor.phpt
@@ -32,7 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/class_dont_call_parent_clone.phpt b/Tests/MockObject/class_dont_call_parent_clone.phpt
@@ -32,7 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/class_dont_call_parent_constructor.phpt b/Tests/MockObject/class_dont_call_parent_constructor.phpt
@@ -32,7 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt b/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
@@ -37,7 +37,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt b/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
@@ -37,7 +37,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/class_partial.phpt b/Tests/MockObject/class_partial.phpt
@@ -37,7 +37,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(Foo $foo)
diff --git a/Tests/MockObject/interface.phpt b/Tests/MockObject/interface.phpt
@@ -31,7 +31,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(Foo $foo)
diff --git a/Tests/MockObject/invocation_object_clone_object.phpt b/Tests/MockObject/invocation_object_clone_object.phpt
@@ -38,7 +38,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(Foo $foo)
diff --git a/Tests/MockObject/invocation_static_clone_object.phpt b/Tests/MockObject/invocation_static_clone_object.phpt
@@ -38,7 +38,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public static function bar(Foo $foo)
diff --git a/Tests/MockObject/namespaced_class.phpt b/Tests/MockObject/namespaced_class.phpt
@@ -39,7 +39,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(NS\Foo $foo)
diff --git a/Tests/MockObject/namespaced_class_call_parent_clone.phpt b/Tests/MockObject/namespaced_class_call_parent_clone.phpt
@@ -34,7 +34,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
         parent::__clone();
     }
 
diff --git a/Tests/MockObject/namespaced_class_call_parent_constructor.phpt b/Tests/MockObject/namespaced_class_call_parent_constructor.phpt
@@ -34,7 +34,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt b/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
@@ -34,7 +34,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt b/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
@@ -34,7 +34,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt b/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
@@ -39,7 +39,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
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
@@ -39,7 +39,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/namespaced_class_partial.phpt b/Tests/MockObject/namespaced_class_partial.phpt
@@ -39,7 +39,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(NS\Foo $foo)
diff --git a/Tests/MockObject/namespaced_interface.phpt b/Tests/MockObject/namespaced_interface.phpt
@@ -33,7 +33,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function bar(NS\Foo $foo)
diff --git a/Tests/MockObject/nonexistent_class.phpt b/Tests/MockObject/nonexistent_class.phpt
@@ -30,7 +30,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/nonexistent_class_with_namespace.phpt b/Tests/MockObject/nonexistent_class_with_namespace.phpt
@@ -36,7 +36,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt b/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
@@ -36,7 +36,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        $this->__phpunit_setId();
     }
 
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`public function __clone()`
`2`	`2`	`{`
`3`	`3`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`4`		`- $this->__phpunit_setId();`
`5`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`36`	`36`	`public function __clone()`
`37`	`37`	`{`
`38`	`38`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`39`		`- $this->__phpunit_setId();`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`public function bar(Foo $foo)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`32`	`32`	`public function __clone()`
`33`	`33`	`{`
`34`	`34`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`35`		`- $this->__phpunit_setId();`
`36`	`35`	`parent::__clone();`
`37`	`36`	`}`
`38`	`37`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`37`	`37`	`public function __clone()`
`38`	`38`	`{`
`39`	`39`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`40`		`- $this->__phpunit_setId();`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo`
`31`	`31`	`public function __clone()`
`32`	`32`	`{`
`33`	`33`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`34`		`- $this->__phpunit_setId();`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`public function bar(Foo $foo)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`38`	`38`	`public function __clone()`
`39`	`39`	`{`
`40`	`40`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`41`		`- $this->__phpunit_setId();`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`public function bar(Foo $foo)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject`
`39`	`39`	`public function __clone()`
`40`	`40`	`{`
`41`	`41`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`42`		`- $this->__phpunit_setId();`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`public function bar(NS\Foo $foo)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject`
`34`	`34`	`public function __clone()`
`35`	`35`	`{`
`36`	`36`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`37`		`- $this->__phpunit_setId();`
`38`	`37`	`parent::__clone();`
`39`	`38`	`}`
`40`	`39`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo`
`33`	`33`	`public function __clone()`
`34`	`34`	`{`
`35`	`35`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`36`		`- $this->__phpunit_setId();`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`public function bar(NS\Foo $foo)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`30`	`30`	`public function __clone()`
`31`	`31`	`{`
`32`	`32`	`$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();`
`33`		`- $this->__phpunit_setId();`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)`