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

Commit 42009bc

Browse files
sebastianbergmannsebastianbergmann
committed
Namespace internal mock object attributes.
1 parent d3c676d commit 42009bc

26 files changed

+361
-361
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{prologue}{class_declaration}
22
{
3-
private static $staticInvocationMocker;
4-
private $invocationMocker;
5-
private $id;
6-
private static $nextId = 0;
3+
private static $__phpunit_staticInvocationMocker;
4+
private $__phpunit_invocationMocker;
5+
private $__phpunit_id;
6+
private static $__phpunit_nextId = 0;
77

88
{clone}{mocked_methods}
99
public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
@@ -18,20 +18,20 @@
1818

1919
public function __phpunit_getInvocationMocker()
2020
{
21-
if ($this->invocationMocker === NULL) {
22-
$this->invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
21+
if ($this->__phpunit_invocationMocker === NULL) {
22+
$this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
2323
}
2424

25-
return $this->invocationMocker;
25+
return $this->__phpunit_invocationMocker;
2626
}
2727

2828
public static function __phpunit_getStaticInvocationMocker()
2929
{
30-
if (self::$staticInvocationMocker === NULL) {
31-
self::$staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
30+
if (self::$__phpunit_staticInvocationMocker === NULL) {
31+
self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
3232
}
3333

34-
return self::$staticInvocationMocker;
34+
return self::$__phpunit_staticInvocationMocker;
3535
}
3636

3737
public function __phpunit_hasMatchers()
@@ -48,13 +48,13 @@
4848

4949
public function __phpunit_cleanup()
5050
{
51-
self::$staticInvocationMocker = NULL;
52-
$this->invocationMocker = NULL;
53-
$this->id = NULL;
51+
self::$__phpunit_staticInvocationMocker = NULL;
52+
$this->__phpunit_invocationMocker = NULL;
53+
$this->__phpunit_id = NULL;
5454
}
5555

5656
public function __phpunit_setId()
5757
{
58-
$this->id = sprintf('%s#%s', get_class($this), self::$nextId++);
58+
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
5959
}
6060
}{epilogue}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
public function __clone()
22
{
3-
$this->invocationMocker = clone $this->__phpunit_getInvocationMocker();
3+
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
44
$this->__phpunit_setId();
55
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public function __clone()
22
{
3-
$this->invocationMocker = clone $this->__phpunit_getInvocationMocker();
3+
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
44
$this->__phpunit_setId();
55
parent::__clone();
66
}

‎Tests/MockObject/class.phpt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ print $mock['code'];
2828
--EXPECTF--
2929
class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
3030
{
31-
private static $staticInvocationMocker;
32-
private $invocationMocker;
33-
private $id;
34-
private static $nextId = 0;
31+
private static $__phpunit_staticInvocationMocker;
32+
private $__phpunit_invocationMocker;
33+
private $__phpunit_id;
34+
private static $__phpunit_nextId = 0;
3535

3636
public function __clone()
3737
{
38-
$this->invocationMocker = clone $this->__phpunit_getInvocationMocker();
38+
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
3939
$this->__phpunit_setId();
4040
}
4141

@@ -95,20 +95,20 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
9595

9696
public function __phpunit_getInvocationMocker()
9797
{
98-
if ($this->invocationMocker === NULL) {
99-
$this->invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
98+
if ($this->__phpunit_invocationMocker === NULL) {
99+
$this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
100100
}
101101

102-
return $this->invocationMocker;
102+
return $this->__phpunit_invocationMocker;
103103
}
104104

105105
public static function __phpunit_getStaticInvocationMocker()
106106
{
107-
if (self::$staticInvocationMocker === NULL) {
108-
self::$staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
107+
if (self::$__phpunit_staticInvocationMocker === NULL) {
108+
self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
109109
}
110110

111-
return self::$staticInvocationMocker;
111+
return self::$__phpunit_staticInvocationMocker;
112112
}
113113

114114
public function __phpunit_hasMatchers()
@@ -125,13 +125,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
125125

126126
public function __phpunit_cleanup()
127127
{
128-
self::$staticInvocationMocker = NULL;
129-
$this->invocationMocker = NULL;
130-
$this->id = NULL;
128+
self::$__phpunit_staticInvocationMocker = NULL;
129+
$this->__phpunit_invocationMocker = NULL;
130+
$this->__phpunit_id = NULL;
131131
}
132132

133133
public function __phpunit_setId()
134134
{
135-
$this->id = sprintf('%s#%s', get_class($this), self::$nextId++);
135+
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
136136
}
137137
}

‎Tests/MockObject/class_call_parent_clone.phpt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ print $mock['code'];
2424
--EXPECTF--
2525
class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
27-
private static $staticInvocationMocker;
28-
private $invocationMocker;
29-
private $id;
30-
private static $nextId = 0;
27+
private static $__phpunit_staticInvocationMocker;
28+
private $__phpunit_invocationMocker;
29+
private $__phpunit_id;
30+
private static $__phpunit_nextId = 0;
3131

3232
public function __clone()
3333
{
34-
$this->invocationMocker = clone $this->__phpunit_getInvocationMocker();
34+
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
3535
$this->__phpunit_setId();
3636
parent::__clone();
3737
}
@@ -48,20 +48,20 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
4848

4949
public function __phpunit_getInvocationMocker()
5050
{
51-
if ($this->invocationMocker === NULL) {
52-
$this->invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
51+
if ($this->__phpunit_invocationMocker === NULL) {
52+
$this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
5353
}
5454

55-
return $this->invocationMocker;
55+
return $this->__phpunit_invocationMocker;
5656
}
5757

5858
public static function __phpunit_getStaticInvocationMocker()
5959
{
60-
if (self::$staticInvocationMocker === NULL) {
61-
self::$staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
60+
if (self::$__phpunit_staticInvocationMocker === NULL) {
61+
self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
6262
}
6363

64-
return self::$staticInvocationMocker;
64+
return self::$__phpunit_staticInvocationMocker;
6565
}
6666

6767
public function __phpunit_hasMatchers()
@@ -78,14 +78,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7878

7979
public function __phpunit_cleanup()
8080
{
81-
self::$staticInvocationMocker = NULL;
82-
$this->invocationMocker = NULL;
83-
$this->id = NULL;
81+
self::$__phpunit_staticInvocationMocker = NULL;
82+
$this->__phpunit_invocationMocker = NULL;
83+
$this->__phpunit_id = NULL;
8484
}
8585

8686
public function __phpunit_setId()
8787
{
88-
$this->id = sprintf('%s#%s', get_class($this), self::$nextId++);
88+
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8989
}
9090
}
9191

‎Tests/MockObject/class_call_parent_constructor.phpt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ print $mock['code'];
2424
--EXPECTF--
2525
class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
27-
private static $staticInvocationMocker;
28-
private $invocationMocker;
29-
private $id;
30-
private static $nextId = 0;
27+
private static $__phpunit_staticInvocationMocker;
28+
private $__phpunit_invocationMocker;
29+
private $__phpunit_id;
30+
private static $__phpunit_nextId = 0;
3131

3232
public function __clone()
3333
{
34-
$this->invocationMocker = clone $this->__phpunit_getInvocationMocker();
34+
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
3535
$this->__phpunit_setId();
3636
}
3737

@@ -47,20 +47,20 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
4747

4848
public function __phpunit_getInvocationMocker()
4949
{
50-
if ($this->invocationMocker === NULL) {
51-
$this->invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
50+
if ($this->__phpunit_invocationMocker === NULL) {
51+
$this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
5252
}
5353

54-
return $this->invocationMocker;
54+
return $this->__phpunit_invocationMocker;
5555
}
5656

5757
public static function __phpunit_getStaticInvocationMocker()
5858
{
59-
if (self::$staticInvocationMocker === NULL) {
60-
self::$staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
59+
if (self::$__phpunit_staticInvocationMocker === NULL) {
60+
self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
6161
}
6262

63-
return self::$staticInvocationMocker;
63+
return self::$__phpunit_staticInvocationMocker;
6464
}
6565

6666
public function __phpunit_hasMatchers()
@@ -77,14 +77,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7777

7878
public function __phpunit_cleanup()
7979
{
80-
self::$staticInvocationMocker = NULL;
81-
$this->invocationMocker = NULL;
82-
$this->id = NULL;
80+
self::$__phpunit_staticInvocationMocker = NULL;
81+
$this->__phpunit_invocationMocker = NULL;
82+
$this->__phpunit_id = NULL;
8383
}
8484

8585
public function __phpunit_setId()
8686
{
87-
$this->id = sprintf('%s#%s', get_class($this), self::$nextId++);
87+
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8888
}
8989
}
9090

‎Tests/MockObject/class_dont_call_parent_clone.phpt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ print $mock['code'];
2424
--EXPECTF--
2525
class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
2626
{
27-
private static $staticInvocationMocker;
28-
private $invocationMocker;
29-
private $id;
30-
private static $nextId = 0;
27+
private static $__phpunit_staticInvocationMocker;
28+
private $__phpunit_invocationMocker;
29+
private $__phpunit_id;
30+
private static $__phpunit_nextId = 0;
3131

3232
public function __clone()
3333
{
34-
$this->invocationMocker = clone $this->__phpunit_getInvocationMocker();
34+
$this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
3535
$this->__phpunit_setId();
3636
}
3737

@@ -47,20 +47,20 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
4747

4848
public function __phpunit_getInvocationMocker()
4949
{
50-
if ($this->invocationMocker === NULL) {
51-
$this->invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
50+
if ($this->__phpunit_invocationMocker === NULL) {
51+
$this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
5252
}
5353

54-
return $this->invocationMocker;
54+
return $this->__phpunit_invocationMocker;
5555
}
5656

5757
public static function __phpunit_getStaticInvocationMocker()
5858
{
59-
if (self::$staticInvocationMocker === NULL) {
60-
self::$staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
59+
if (self::$__phpunit_staticInvocationMocker === NULL) {
60+
self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
6161
}
6262

63-
return self::$staticInvocationMocker;
63+
return self::$__phpunit_staticInvocationMocker;
6464
}
6565

6666
public function __phpunit_hasMatchers()
@@ -77,14 +77,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
7777

7878
public function __phpunit_cleanup()
7979
{
80-
self::$staticInvocationMocker = NULL;
81-
$this->invocationMocker = NULL;
82-
$this->id = NULL;
80+
self::$__phpunit_staticInvocationMocker = NULL;
81+
$this->__phpunit_invocationMocker = NULL;
82+
$this->__phpunit_id = NULL;
8383
}
8484

8585
public function __phpunit_setId()
8686
{
87-
$this->id = sprintf('%s#%s', get_class($this), self::$nextId++);
87+
$this->__phpunit_id = sprintf('%s#%s', get_class($this), self::$__phpunit_nextId++);
8888
}
8989
}
9090

0 commit comments

Comments
 (0)