Rename test double API traits

sebastianbergmann · Jun 28, 2019 · 7b4c302 · 7b4c302
1 parent 28b0458
commit 7b4c302
Show file tree

Hide file tree

Showing 55 changed files with 105 additions and 105 deletions.
diff --git a/src/Framework/MockObject/TestDoubleApi.php → src/Framework/MockObject/Api/Api.php b/src/Framework/MockObject/TestDoubleApi.php → src/Framework/MockObject/Api/Api.php
@@ -15,7 +15,7 @@
 /**
  * @internal This trait is not covered by the backward compatibility promise for PHPUnit
  */
-trait TestDoubleApi
+trait Api
 {
     /**
      * @var ConfigurableMethod[]

diff --git a/...mework/MockObject/TestDoubleApiMethod.php → src/Framework/MockObject/Api/Method.php b/...mework/MockObject/TestDoubleApiMethod.php → src/Framework/MockObject/Api/Method.php
@@ -14,7 +14,7 @@
 /**
  * @internal This trait is not covered by the backward compatibility promise for PHPUnit
  */
-trait TestDoubleApiMethod
+trait Method
 {
     public function method()
     {

diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -831,7 +831,7 @@ private function generateMock($type, ?array $explicitMethods, string $mockClassN
         $method = '';
 
         if (!$mockMethods->hasMethod('method') && (!isset($class) || !$class->hasMethod('method'))) {
-            $method = \PHP_EOL . '    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;';
+            $method = \PHP_EOL . '    use \PHPUnit\Framework\MockObject\Method;';
         }
 
         $classTemplate->setVar(

diff --git a/src/Framework/MockObject/Generator/mocked_class.tpl b/src/Framework/MockObject/Generator/mocked_class.tpl
@@ -2,6 +2,6 @@ declare(strict_types=1);
 
 {prologue}{class_declaration}
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;{method}
+    use \PHPUnit\Framework\MockObject\Api;{method}
 
 {clone}{mocked_methods}}{epilogue}
diff --git a/tests/_files/mock-object/AnotherClassUsingConfigurableMethods.php b/tests/_files/mock-object/AnotherClassUsingConfigurableMethods.php
@@ -9,11 +9,11 @@
  */
 namespace PHPUnit\TestFixture\MockObject;
 
-use PHPUnit\Framework\MockObject\TestDoubleApi;
+use PHPUnit\Framework\MockObject\Api;
 
 class AnotherClassUsingConfigurableMethods
 {
-    use TestDoubleApi;
+    use Api;
 
     public static function getConfigurableMethods(): array
     {

diff --git a/tests/_files/mock-object/ClassUsingConfigurableMethods.php b/tests/_files/mock-object/ClassUsingConfigurableMethods.php
@@ -9,11 +9,11 @@
  */
 namespace PHPUnit\TestFixture\MockObject;
 
-use PHPUnit\Framework\MockObject\TestDoubleApi;
+use PHPUnit\Framework\MockObject\Api;
 
 class ClassUsingConfigurableMethods
 {
-    use TestDoubleApi;
+    use Api;
 
     public static function getConfigurableMethods(): array
     {

diff --git a/tests/_files/mock-object/MockClassGenerated.tpl.dist b/tests/_files/mock-object/MockClassGenerated.tpl.dist
@@ -1,10 +1,10 @@
 namespace PHPUnit\TestFixture\MockObject;
 
-use PHPUnit\Framework\MockObject\TestDoubleApi;
+use PHPUnit\Framework\MockObject\Api;
 
 class MockClassGenerated
 {
-    use TestDoubleApi;
+    use Api;
 
     public static function getConfigurableMethods(): array
     {

diff --git a/tests/_files/mock-object/MockClassWithConfigurableMethods.php b/tests/_files/mock-object/MockClassWithConfigurableMethods.php
@@ -9,11 +9,11 @@
  */
 namespace PHPUnit\TestFixture\MockObject;
 
-use PHPUnit\Framework\MockObject\TestDoubleApi;
+use PHPUnit\Framework\MockObject\Api;
 
 class MockClassWithConfigurableMethods
 {
-    use TestDoubleApi;
+    use Api;
 
     public static function getConfigurableMethods(): array
     {

diff --git a/tests/_files/mock-object/ReinitializeConfigurableMethods.php b/tests/_files/mock-object/ReinitializeConfigurableMethods.php
@@ -9,9 +9,9 @@
  */
 namespace PHPUnit\TestFixture\MockObject;
 
-use PHPUnit\Framework\MockObject\TestDoubleApi;
+use PHPUnit\Framework\MockObject\Api;
 
 class ReinitializeConfigurableMethods
 {
-    use TestDoubleApi;
+    use Api;
 }
diff --git a/tests/end-to-end/mock-objects/generator/232.phpt b/tests/end-to-end/mock-objects/generator/232.phpt
@@ -56,8 +56,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/3154_namespaced_constant_resolving.phpt b/tests/end-to-end/mock-objects/generator/3154_namespaced_constant_resolving.phpt
@@ -41,8 +41,8 @@ declare(strict_types=1);
 
 class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/397.phpt b/tests/end-to-end/mock-objects/generator/397.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockC extends C implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/abstract_class.phpt b/tests/end-to-end/mock-objects/generator/abstract_class.phpt
@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class.phpt b/tests/end-to-end/mock-objects/generator/class.phpt
@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_call_parent_clone.phpt b/tests/end-to-end/mock-objects/generator/class_call_parent_clone.phpt
@@ -26,8 +26,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/class_call_parent_constructor.phpt
@@ -26,8 +26,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_dont_call_parent_clone.phpt b/tests/end-to-end/mock-objects/generator/class_dont_call_parent_clone.phpt
@@ -26,8 +26,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_dont_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/class_dont_call_parent_constructor.phpt
@@ -26,8 +26,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/...d-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt b/...d-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt
@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/...end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt b/...end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt
@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_nonexistent_method.phpt b/tests/end-to-end/mock-objects/generator/class_nonexistent_method.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_partial.phpt b/tests/end-to-end/mock-objects/generator/class_partial.phpt
@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_with_deprecated_method.phpt b/tests/end-to-end/mock-objects/generator/class_with_deprecated_method.phpt
@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 class MockFoo extends ClassWithDeprecatedMethod implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_with_final_method.phpt b/tests/end-to-end/mock-objects/generator/class_with_final_method.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockFoo extends ClassWithFinalMethod implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_with_method_named_method.phpt b/tests/end-to-end/mock-objects/generator/class_with_method_named_method.phpt
@@ -27,7 +27,7 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
+    use \PHPUnit\Framework\MockObject\Api;
 
     public function __clone()
     {

diff --git a/...mock-objects/generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt b/...mock-objects/generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockFoo extends ClassWithMethodWithNullableTypehintedVariadicArguments implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/...d-to-end/mock-objects/generator/class_with_method_with_typehinted_variadic_arguments.phpt b/...d-to-end/mock-objects/generator/class_with_method_with_typehinted_variadic_arguments.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockFoo extends ClassWithMethodWithTypehintedVariadicArguments implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/class_with_method_with_variadic_arguments.phpt b/tests/end-to-end/mock-objects/generator/class_with_method_with_variadic_arguments.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockFoo extends ClassWithMethodWithVariadicArguments implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/constant_as_parameter_default_value.phpt b/tests/end-to-end/mock-objects/generator/constant_as_parameter_default_value.phpt
@@ -27,8 +27,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/interface.phpt b/tests/end-to-end/mock-objects/generator/interface.phpt
@@ -25,8 +25,8 @@ declare(strict_types=1);
 
 class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/invocation_object_clone_object.phpt b/tests/end-to-end/mock-objects/generator/invocation_object_clone_object.phpt
@@ -32,8 +32,8 @@ declare(strict_types=1);
 
 class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class.phpt
@@ -33,8 +33,8 @@ declare(strict_types=1);
 
 class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_call_parent_clone.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_call_parent_clone.phpt
@@ -28,8 +28,8 @@ declare(strict_types=1);
 
 class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_call_parent_constructor.phpt
@@ -28,8 +28,8 @@ declare(strict_types=1);
 
 class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_dont_call_parent_clone.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_dont_call_parent_clone.phpt
@@ -28,8 +28,8 @@ declare(strict_types=1);
 
 class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {

diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_dont_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_dont_call_parent_constructor.phpt
@@ -28,8 +28,8 @@ declare(strict_types=1);
 
 class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject
 {
-    use \PHPUnit\Framework\MockObject\TestDoubleApi;
-    use \PHPUnit\Framework\MockObject\TestDoubleApiMethod;
+    use \PHPUnit\Framework\MockObject\Api;
+    use \PHPUnit\Framework\MockObject\Method;
 
     public function __clone()
     {