Make internal mock object attributes private.

sebastianbergmann · sebastianbergmann · commit e18cee7e85cd · 2012-09-01T21:58:04.000+01:00
diff --git a/PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist b/PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist
@@ -1,9 +1,9 @@
 {prologue}{class_declaration}
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
 {clone}{mocked_methods}
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
diff --git a/Tests/MockObject/class.phpt b/Tests/MockObject/class.phpt
@@ -28,10 +28,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_call_parent_clone.phpt b/Tests/MockObject/class_call_parent_clone.phpt
@@ -24,10 +24,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_call_parent_constructor.phpt b/Tests/MockObject/class_call_parent_constructor.phpt
@@ -24,10 +24,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_dont_call_parent_clone.phpt b/Tests/MockObject/class_dont_call_parent_clone.phpt
@@ -24,10 +24,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_dont_call_parent_constructor.phpt b/Tests/MockObject/class_dont_call_parent_constructor.phpt
@@ -24,10 +24,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt b/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
@@ -29,10 +29,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt b/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
@@ -29,10 +29,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/class_partial.phpt b/Tests/MockObject/class_partial.phpt
@@ -29,10 +29,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/interface.phpt b/Tests/MockObject/interface.phpt
@@ -23,10 +23,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/invocation_object_clone_object.phpt b/Tests/MockObject/invocation_object_clone_object.phpt
@@ -30,10 +30,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/invocation_static_clone_object.phpt b/Tests/MockObject/invocation_static_clone_object.phpt
@@ -30,10 +30,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class.phpt b/Tests/MockObject/namespaced_class.phpt
@@ -31,10 +31,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class_call_parent_clone.phpt b/Tests/MockObject/namespaced_class_call_parent_clone.phpt
@@ -26,10 +26,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class_call_parent_constructor.phpt b/Tests/MockObject/namespaced_class_call_parent_constructor.phpt
@@ -26,10 +26,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt b/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
@@ -26,10 +26,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt b/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
@@ -26,10 +26,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt b/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
@@ -31,10 +31,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
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
@@ -31,10 +31,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_class_partial.phpt b/Tests/MockObject/namespaced_class_partial.phpt
@@ -31,10 +31,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/namespaced_interface.phpt b/Tests/MockObject/namespaced_interface.phpt
@@ -25,10 +25,10 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/nonexistent_class.phpt b/Tests/MockObject/nonexistent_class.phpt
@@ -22,10 +22,10 @@ class Foo
 
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/nonexistent_class_with_namespace.phpt b/Tests/MockObject/nonexistent_class_with_namespace.phpt
@@ -28,10 +28,10 @@ namespace {
 
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {
diff --git a/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt b/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
@@ -28,10 +28,10 @@ namespace {
 
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    protected static $staticInvocationMocker;
-    protected $invocationMocker;
-    protected $id;
-    protected static $nextId = 0;
+    private static $staticInvocationMocker;
+    private $invocationMocker;
+    private $id;
+    private static $nextId = 0;
 
     public function __clone()
     {

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@ print $mock['code'];`
`28`	`28`	`--EXPECTF--`
`29`	`29`	`class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`30`	`30`	`{`
`31`		`- protected static $staticInvocationMocker;`
`32`		`- protected $invocationMocker;`
`33`		`- protected $id;`
`34`		`- protected static $nextId = 0;`
	`31`	`+ private static $staticInvocationMocker;`
	`32`	`+ private $invocationMocker;`
	`33`	`+ private $id;`
	`34`	`+ private static $nextId = 0;`
`35`	`35`
`36`	`36`	`public function __clone()`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ print $mock['code'];`
`24`	`24`	`--EXPECTF--`
`25`	`25`	`class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`26`	`26`	`{`
`27`		`- protected static $staticInvocationMocker;`
`28`		`- protected $invocationMocker;`
`29`		`- protected $id;`
`30`		`- protected static $nextId = 0;`
	`27`	`+ private static $staticInvocationMocker;`
	`28`	`+ private $invocationMocker;`
	`29`	`+ private $id;`
	`30`	`+ private static $nextId = 0;`
`31`	`31`
`32`	`32`	`public function __clone()`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ print $mock['code'];`
`29`	`29`	`--EXPECTF--`
`30`	`30`	`class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject`
`31`	`31`	`{`
`32`		`- protected static $staticInvocationMocker;`
`33`		`- protected $invocationMocker;`
`34`		`- protected $id;`
`35`		`- protected static $nextId = 0;`
	`32`	`+ private static $staticInvocationMocker;`
	`33`	`+ private $invocationMocker;`
	`34`	`+ private $id;`
	`35`	`+ private static $nextId = 0;`
`36`	`36`
`37`	`37`	`public function __clone()`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ print $mock['code'];`
`23`	`23`	`--EXPECTF--`
`24`	`24`	`class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo`
`25`	`25`	`{`
`26`		`- protected static $staticInvocationMocker;`
`27`		`- protected $invocationMocker;`
`28`		`- protected $id;`
`29`		`- protected static $nextId = 0;`
	`26`	`+ private static $staticInvocationMocker;`
	`27`	`+ private $invocationMocker;`
	`28`	`+ private $id;`
	`29`	`+ private static $nextId = 0;`
`30`	`30`
`31`	`31`	`public function __clone()`
`32`	`32`	`{`