Skip to content
This repository was archived by the owner on Feb 20, 2023. It is now read-only.

Commit a0bfade

Browse files
sebastianbergmannsebastianbergmann
committed
Closes #100.
1 parent b167e11 commit a0bfade

28 files changed

+7
-208
lines changed

‎ChangeLog.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ PHPUnit_MockObject 1.2
33

44
This is the list of changes for the PHPUnit_MockObject 1.2 release series.
55

6+
PHPUnit_MockObject 1.2.2
7+
------------------------
8+
9+
* Fixed #100: Removed the unique mock object ID introduced in version 1.2.
10+
611
PHPUnit_MockObject 1.2.1
712
------------------------
813

‎PHPUnit/Framework/MockObject/Generator.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,6 @@ protected static function getObject($code, $className, $originalClassName = '',
247247
);
248248
}
249249

250-
if ($object instanceof PHPUnit_Framework_MockObject_MockObject) {
251-
$object->__phpunit_setId();
252-
}
253-
254250
return $object;
255251
}
256252

‎PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
{
33
private static $__phpunit_staticInvocationMocker;
44
private $__phpunit_invocationMocker;
5-
private $__phpunit_id;
6-
private static $__phpunit_nextId = 0;
75

86
{clone}{mocked_methods}
97
public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
@@ -50,11 +48,5 @@
5048
{
5149
self::$__phpunit_staticInvocationMocker = NULL;
5250
$this->__phpunit_invocationMocker = NULL;
53-
$this->__phpunit_id = NULL;
54-
}
55-
56-
public function __phpunit_setId()
57-
{
58-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
5951
}
6052
}{epilogue}

‎Tests/GeneratorTest.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ public function testGetMockGeneratorFails()
2929
$mock = PHPUnit_Framework_MockObject_Generator::getMock('StdClass', array('foo', 'foo'));
3030
}
3131

32-
/**
33-
* @covers PHPUnit_Framework_MockObject_Generator::getObject
34-
*/
35-
public function testMockObjectHasUniqueIdSoThatTwoMockObjectsOfTheSameClassAreNotEqual()
36-
{
37-
$mock1 = PHPUnit_Framework_MockObject_Generator::getMock('stdClass');
38-
$mock2 = PHPUnit_Framework_MockObject_Generator::getMock('stdClass');
39-
$this->assertNotEquals($mock1, $mock2);
40-
}
41-
4232
/**
4333
* @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
4434
*/

‎Tests/MockObject/class.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3030
{
3131
private static $__phpunit_staticInvocationMocker;
3232
private $__phpunit_invocationMocker;
33-
private $__phpunit_id;
34-
private static $__phpunit_nextId = 0;
3533

3634
public function __clone()
3735
{
@@ -126,11 +124,5 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
126124
{
127125
self::$__phpunit_staticInvocationMocker = NULL;
128126
$this->__phpunit_invocationMocker = NULL;
129-
$this->__phpunit_id = NULL;
130-
}
131-
132-
public function __phpunit_setId()
133-
{
134-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
135127
}
136128
}

‎Tests/MockObject/class_call_parent_clone.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
2727
private static $__phpunit_staticInvocationMocker;
2828
private $__phpunit_invocationMocker;
29-
private $__phpunit_id;
30-
private static $__phpunit_nextId = 0;
3129

3230
public function __clone()
3331
{
@@ -79,12 +77,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7977
{
8078
self::$__phpunit_staticInvocationMocker = NULL;
8179
$this->__phpunit_invocationMocker = NULL;
82-
$this->__phpunit_id = NULL;
83-
}
84-
85-
public function __phpunit_setId()
86-
{
87-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8880
}
8981
}
9082

‎Tests/MockObject/class_call_parent_constructor.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
2727
private static $__phpunit_staticInvocationMocker;
2828
private $__phpunit_invocationMocker;
29-
private $__phpunit_id;
30-
private static $__phpunit_nextId = 0;
3129

3230
public function __clone()
3331
{
@@ -78,12 +76,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7876
{
7977
self::$__phpunit_staticInvocationMocker = NULL;
8078
$this->__phpunit_invocationMocker = NULL;
81-
$this->__phpunit_id = NULL;
82-
}
83-
84-
public function __phpunit_setId()
85-
{
86-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8779
}
8880
}
8981

‎Tests/MockObject/class_dont_call_parent_clone.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
2727
private static $__phpunit_staticInvocationMocker;
2828
private $__phpunit_invocationMocker;
29-
private $__phpunit_id;
30-
private static $__phpunit_nextId = 0;
3129

3230
public function __clone()
3331
{
@@ -78,12 +76,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7876
{
7977
self::$__phpunit_staticInvocationMocker = NULL;
8078
$this->__phpunit_invocationMocker = NULL;
81-
$this->__phpunit_id = NULL;
82-
}
83-
84-
public function __phpunit_setId()
85-
{
86-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8779
}
8880
}
8981

‎Tests/MockObject/class_dont_call_parent_constructor.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
2727
private static $__phpunit_staticInvocationMocker;
2828
private $__phpunit_invocationMocker;
29-
private $__phpunit_id;
30-
private static $__phpunit_nextId = 0;
3129

3230
public function __clone()
3331
{
@@ -78,12 +76,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7876
{
7977
self::$__phpunit_staticInvocationMocker = NULL;
8078
$this->__phpunit_invocationMocker = NULL;
81-
$this->__phpunit_id = NULL;
82-
}
83-
84-
public function __phpunit_setId()
85-
{
86-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8779
}
8880
}
8981

‎Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3131
{
3232
private static $__phpunit_staticInvocationMocker;
3333
private $__phpunit_invocationMocker;
34-
private $__phpunit_id;
35-
private static $__phpunit_nextId = 0;
3634

3735
public function __clone()
3836
{
@@ -83,12 +81,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
8381
{
8482
self::$__phpunit_staticInvocationMocker = NULL;
8583
$this->__phpunit_invocationMocker = NULL;
86-
$this->__phpunit_id = NULL;
87-
}
88-
89-
public function __phpunit_setId()
90-
{
91-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
9284
}
9385
}
9486

‎Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3131
{
3232
private static $__phpunit_staticInvocationMocker;
3333
private $__phpunit_invocationMocker;
34-
private $__phpunit_id;
35-
private static $__phpunit_nextId = 0;
3634

3735
public function __clone()
3836
{
@@ -83,12 +81,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
8381
{
8482
self::$__phpunit_staticInvocationMocker = NULL;
8583
$this->__phpunit_invocationMocker = NULL;
86-
$this->__phpunit_id = NULL;
87-
}
88-
89-
public function __phpunit_setId()
90-
{
91-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
9284
}
9385
}
9486

‎Tests/MockObject/class_partial.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3131
{
3232
private static $__phpunit_staticInvocationMocker;
3333
private $__phpunit_invocationMocker;
34-
private $__phpunit_id;
35-
private static $__phpunit_nextId = 0;
3634

3735
public function __clone()
3836
{
@@ -105,11 +103,5 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
105103
{
106104
self::$__phpunit_staticInvocationMocker = NULL;
107105
$this->__phpunit_invocationMocker = NULL;
108-
$this->__phpunit_id = NULL;
109-
}
110-
111-
public function __phpunit_setId()
112-
{
113-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
114106
}
115107
}

‎Tests/MockObject/interface.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
2525
{
2626
private static $__phpunit_staticInvocationMocker;
2727
private $__phpunit_invocationMocker;
28-
private $__phpunit_id;
29-
private static $__phpunit_nextId = 0;
3028

3129
public function __clone()
3230
{
@@ -99,11 +97,5 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
9997
{
10098
self::$__phpunit_staticInvocationMocker = NULL;
10199
$this->__phpunit_invocationMocker = NULL;
102-
$this->__phpunit_id = NULL;
103-
}
104-
105-
public function __phpunit_setId()
106-
{
107-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
108100
}
109101
}

‎Tests/MockObject/invocation_object_clone_object.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3232
{
3333
private static $__phpunit_staticInvocationMocker;
3434
private $__phpunit_invocationMocker;
35-
private $__phpunit_id;
36-
private static $__phpunit_nextId = 0;
3735

3836
public function __clone()
3937
{
@@ -128,11 +126,5 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
128126
{
129127
self::$__phpunit_staticInvocationMocker = NULL;
130128
$this->__phpunit_invocationMocker = NULL;
131-
$this->__phpunit_id = NULL;
132-
}
133-
134-
public function __phpunit_setId()
135-
{
136-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
137129
}
138130
}

‎Tests/MockObject/invocation_static_clone_object.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3232
{
3333
private static $__phpunit_staticInvocationMocker;
3434
private $__phpunit_invocationMocker;
35-
private $__phpunit_id;
36-
private static $__phpunit_nextId = 0;
3735

3836
public function __clone()
3937
{
@@ -128,11 +126,5 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
128126
{
129127
self::$__phpunit_staticInvocationMocker = NULL;
130128
$this->__phpunit_invocationMocker = NULL;
131-
$this->__phpunit_id = NULL;
132-
}
133-
134-
public function __phpunit_setId()
135-
{
136-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
137129
}
138130
}

‎Tests/MockObject/namespaced_class.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
3333
{
3434
private static $__phpunit_staticInvocationMocker;
3535
private $__phpunit_invocationMocker;
36-
private $__phpunit_id;
37-
private static $__phpunit_nextId = 0;
3836

3937
public function __clone()
4038
{
@@ -129,11 +127,5 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
129127
{
130128
self::$__phpunit_staticInvocationMocker = NULL;
131129
$this->__phpunit_invocationMocker = NULL;
132-
$this->__phpunit_id = NULL;
133-
}
134-
135-
public function __phpunit_setId()
136-
{
137-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
138130
}
139131
}

‎Tests/MockObject/namespaced_class_call_parent_clone.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
2828
{
2929
private static $__phpunit_staticInvocationMocker;
3030
private $__phpunit_invocationMocker;
31-
private $__phpunit_id;
32-
private static $__phpunit_nextId = 0;
3331

3432
public function __clone()
3533
{
@@ -81,12 +79,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
8179
{
8280
self::$__phpunit_staticInvocationMocker = NULL;
8381
$this->__phpunit_invocationMocker = NULL;
84-
$this->__phpunit_id = NULL;
85-
}
86-
87-
public function __phpunit_setId()
88-
{
89-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
9082
}
9183
}
9284

‎Tests/MockObject/namespaced_class_call_parent_constructor.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
2828
{
2929
private static $__phpunit_staticInvocationMocker;
3030
private $__phpunit_invocationMocker;
31-
private $__phpunit_id;
32-
private static $__phpunit_nextId = 0;
3331

3432
public function __clone()
3533
{
@@ -80,12 +78,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
8078
{
8179
self::$__phpunit_staticInvocationMocker = NULL;
8280
$this->__phpunit_invocationMocker = NULL;
83-
$this->__phpunit_id = NULL;
84-
}
85-
86-
public function __phpunit_setId()
87-
{
88-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8981
}
9082
}
9183

‎Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
2828
{
2929
private static $__phpunit_staticInvocationMocker;
3030
private $__phpunit_invocationMocker;
31-
private $__phpunit_id;
32-
private static $__phpunit_nextId = 0;
3331

3432
public function __clone()
3533
{
@@ -80,12 +78,6 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
8078
{
8179
self::$__phpunit_staticInvocationMocker = NULL;
8280
$this->__phpunit_invocationMocker = NULL;
83-
$this->__phpunit_id = NULL;
84-
}
85-
86-
public function __phpunit_setId()
87-
{
88-
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8981
}
9082
}
9183

0 commit comments

Comments
 (0)