From 1d2a88d0e314645c4884d9d052ea4844f2ff6a5a Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Thu, 24 Mar 2022 07:56:26 +0100 Subject: [PATCH] Rename MockedCloneMethod and UnmockedCloneMethod traits to MockedCloneMethodWithoutReturnType and UnmockedCloneMethodWithoutReturnType, respectively --- ...CloneMethod.php => MockedCloneMethodWithoutReturnType.php} | 2 +- ...oneMethod.php => UnmockedCloneMethodWithoutReturnType.php} | 2 +- src/Framework/MockObject/Generator.php | 4 ++-- tests/end-to-end/mock-objects/generator/232.phpt | 2 +- .../generator/3154_namespaced_constant_resolving.phpt | 2 +- tests/end-to-end/mock-objects/generator/3967.phpt | 2 +- tests/end-to-end/mock-objects/generator/397.phpt | 2 +- tests/end-to-end/mock-objects/generator/4139.phpt | 2 +- tests/end-to-end/mock-objects/generator/abstract_class.phpt | 2 +- tests/end-to-end/mock-objects/generator/class.phpt | 2 +- .../mock-objects/generator/class_call_parent_clone.phpt | 2 +- .../mock-objects/generator/class_call_parent_constructor.phpt | 2 +- .../mock-objects/generator/class_dont_call_parent_clone.phpt | 2 +- .../generator/class_dont_call_parent_constructor.phpt | 2 +- .../class_implementing_interface_call_parent_constructor.phpt | 2 +- ...s_implementing_interface_dont_call_parent_constructor.phpt | 2 +- .../mock-objects/generator/class_nonexistent_method.phpt | 2 +- tests/end-to-end/mock-objects/generator/class_partial.phpt | 2 +- .../mock-objects/generator/class_with_deprecated_method.phpt | 2 +- .../mock-objects/generator/class_with_final_method.phpt | 2 +- .../generator/class_with_method_named_method.phpt | 2 +- ...th_method_with_nullable_typehinted_variadic_arguments.phpt | 2 +- .../class_with_method_with_typehinted_variadic_arguments.phpt | 2 +- .../generator/class_with_method_with_variadic_arguments.phpt | 2 +- .../generator/constant_as_parameter_default_value.phpt | 2 +- tests/end-to-end/mock-objects/generator/interface.phpt | 2 +- .../generator/invocation_object_clone_object.phpt | 2 +- tests/end-to-end/mock-objects/generator/namespaced_class.phpt | 2 +- .../generator/namespaced_class_call_parent_clone.phpt | 2 +- .../generator/namespaced_class_call_parent_constructor.phpt | 2 +- .../generator/namespaced_class_dont_call_parent_clone.phpt | 2 +- .../namespaced_class_dont_call_parent_constructor.phpt | 2 +- ..._class_implementing_interface_call_parent_constructor.phpt | 2 +- ...s_implementing_interface_dont_call_parent_constructor.phpt | 2 +- .../mock-objects/generator/namespaced_class_partial.phpt | 2 +- .../mock-objects/generator/namespaced_interface.phpt | 2 +- .../end-to-end/mock-objects/generator/nonexistent_class.phpt | 2 +- .../generator/nonexistent_class_with_namespace.phpt | 2 +- ...existent_class_with_namespace_starting_with_separator.phpt | 2 +- tests/end-to-end/mock-objects/generator/nullable_types.phpt | 2 +- tests/end-to-end/mock-objects/generator/proxy.phpt | 2 +- .../generator/return_type_declarations_closure.phpt | 2 +- .../generator/return_type_declarations_final.phpt | 2 +- .../generator/return_type_declarations_generator.phpt | 2 +- .../generator/return_type_declarations_nullable.phpt | 2 +- .../generator/return_type_declarations_object_method.phpt | 2 +- .../generator/return_type_declarations_parent.phpt | 2 +- .../mock-objects/generator/return_type_declarations_self.phpt | 2 +- .../generator/return_type_declarations_static_method.phpt | 2 +- .../mock-objects/generator/return_type_declarations_void.phpt | 2 +- .../mock-objects/generator/scalar_type_declarations.phpt | 2 +- 51 files changed, 52 insertions(+), 52 deletions(-) rename src/Framework/MockObject/Api/{MockedCloneMethod.php => MockedCloneMethodWithoutReturnType.php} (92%) rename src/Framework/MockObject/Api/{UnmockedCloneMethod.php => UnmockedCloneMethodWithoutReturnType.php} (92%) diff --git a/src/Framework/MockObject/Api/MockedCloneMethod.php b/src/Framework/MockObject/Api/MockedCloneMethodWithoutReturnType.php similarity index 92% rename from src/Framework/MockObject/Api/MockedCloneMethod.php rename to src/Framework/MockObject/Api/MockedCloneMethodWithoutReturnType.php index 91e35f937f1..598d5006c6b 100644 --- a/src/Framework/MockObject/Api/MockedCloneMethod.php +++ b/src/Framework/MockObject/Api/MockedCloneMethodWithoutReturnType.php @@ -12,7 +12,7 @@ /** * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ -trait MockedCloneMethod +trait MockedCloneMethodWithoutReturnType { public function __clone() { diff --git a/src/Framework/MockObject/Api/UnmockedCloneMethod.php b/src/Framework/MockObject/Api/UnmockedCloneMethodWithoutReturnType.php similarity index 92% rename from src/Framework/MockObject/Api/UnmockedCloneMethod.php rename to src/Framework/MockObject/Api/UnmockedCloneMethodWithoutReturnType.php index 3f493d203d1..c9980c62f04 100644 --- a/src/Framework/MockObject/Api/UnmockedCloneMethod.php +++ b/src/Framework/MockObject/Api/UnmockedCloneMethodWithoutReturnType.php @@ -12,7 +12,7 @@ /** * @internal This trait is not covered by the backward compatibility promise for PHPUnit */ -trait UnmockedCloneMethod +trait UnmockedCloneMethodWithoutReturnType { public function __clone() { diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php index 9ece81eadf5..285b010fe25 100644 --- a/src/Framework/MockObject/Generator.php +++ b/src/Framework/MockObject/Generator.php @@ -954,11 +954,11 @@ private function generateMock($type, ?array $explicitMethods, string $mockClassN $cloneTrait = ''; if ($mockedCloneMethod) { - $cloneTrait = PHP_EOL . ' use \PHPUnit\Framework\MockObject\MockedCloneMethod;'; + $cloneTrait = PHP_EOL . ' use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType;'; } if ($unmockedCloneMethod) { - $cloneTrait = PHP_EOL . ' use \PHPUnit\Framework\MockObject\UnmockedCloneMethod;'; + $cloneTrait = PHP_EOL . ' use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType;'; } $classTemplate->setVar( diff --git a/tests/end-to-end/mock-objects/generator/232.phpt b/tests/end-to-end/mock-objects/generator/232.phpt index 0757ab66370..824498a7ef9 100644 --- a/tests/end-to-end/mock-objects/generator/232.phpt +++ b/tests/end-to-end/mock-objects/generator/232.phpt @@ -58,7 +58,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function speak() { 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 index 0919f7f7d23..f7417012288 100644 --- 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 @@ -43,7 +43,7 @@ class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function a(int $i = %d, int $j = 17, string $v = '%s', string $z = '#'): string { diff --git a/tests/end-to-end/mock-objects/generator/3967.phpt b/tests/end-to-end/mock-objects/generator/3967.phpt index ad69c70ab18..21b11a26f0a 100644 --- a/tests/end-to-end/mock-objects/generator/3967.phpt +++ b/tests/end-to-end/mock-objects/generator/3967.phpt @@ -36,7 +36,7 @@ class MockBaz extends Exception implements Baz, PHPUnit\Framework\MockObject\Moc { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\UnmockedCloneMethod; + use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType; public function foo(): string { diff --git a/tests/end-to-end/mock-objects/generator/397.phpt b/tests/end-to-end/mock-objects/generator/397.phpt index a2ebc6a33f8..2dc588cb6ec 100644 --- a/tests/end-to-end/mock-objects/generator/397.phpt +++ b/tests/end-to-end/mock-objects/generator/397.phpt @@ -29,7 +29,7 @@ class MockC extends C implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function m(?C $other): C { diff --git a/tests/end-to-end/mock-objects/generator/4139.phpt b/tests/end-to-end/mock-objects/generator/4139.phpt index e9a55d71359..a882829cb92 100644 --- a/tests/end-to-end/mock-objects/generator/4139.phpt +++ b/tests/end-to-end/mock-objects/generator/4139.phpt @@ -20,7 +20,7 @@ class %s implements PHPUnit\Framework\MockObject\MockObject, InterfaceWithConstr { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function __construct() { diff --git a/tests/end-to-end/mock-objects/generator/abstract_class.phpt b/tests/end-to-end/mock-objects/generator/abstract_class.phpt index 8ae79899cba..8b214219628 100644 --- a/tests/end-to-end/mock-objects/generator/abstract_class.phpt +++ b/tests/end-to-end/mock-objects/generator/abstract_class.phpt @@ -33,7 +33,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function one() { diff --git a/tests/end-to-end/mock-objects/generator/class.phpt b/tests/end-to-end/mock-objects/generator/class.phpt index cd366c72876..0ef7aa40542 100644 --- a/tests/end-to-end/mock-objects/generator/class.phpt +++ b/tests/end-to-end/mock-objects/generator/class.phpt @@ -33,7 +33,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(Foo $foo) { 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 index f237aa9c919..1d5fc011312 100644 --- 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 @@ -28,5 +28,5 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\UnmockedCloneMethod; + use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType; } 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 index 4611e3787b8..5f05f71b4b0 100644 --- 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 @@ -28,5 +28,5 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } 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 index 432377a9112..3a93bae5882 100644 --- 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 @@ -28,5 +28,5 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } 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 index 4611e3787b8..5f05f71b4b0 100644 --- 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 @@ -28,5 +28,5 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } diff --git a/tests/end-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt index f2adfb43694..1b4b4e62576 100644 --- a/tests/end-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt +++ b/tests/end-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt @@ -33,5 +33,5 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } diff --git a/tests/end-to-end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt index f2adfb43694..1b4b4e62576 100644 --- a/tests/end-to-end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt +++ b/tests/end-to-end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt @@ -33,5 +33,5 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } 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 index 5b78a8f8635..60e65b8cbee 100644 --- a/tests/end-to-end/mock-objects/generator/class_nonexistent_method.phpt +++ b/tests/end-to-end/mock-objects/generator/class_nonexistent_method.phpt @@ -29,7 +29,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar() { diff --git a/tests/end-to-end/mock-objects/generator/class_partial.phpt b/tests/end-to-end/mock-objects/generator/class_partial.phpt index 14dbd02a4f4..0439f1e06ec 100644 --- a/tests/end-to-end/mock-objects/generator/class_partial.phpt +++ b/tests/end-to-end/mock-objects/generator/class_partial.phpt @@ -33,7 +33,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(Foo $foo) { 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 index 122d5b28099..fec9307c0fa 100644 --- 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 @@ -33,7 +33,7 @@ class MockFoo extends ClassWithDeprecatedMethod implements PHPUnit\Framework\Moc { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function deprecatedMethod() { 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 index 3505e75cc14..5536fe2347d 100644 --- 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 @@ -29,5 +29,5 @@ class MockFoo extends ClassWithFinalMethod implements PHPUnit\Framework\MockObje { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } 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 index 472daee0350..3e69cefa691 100644 --- 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 @@ -28,7 +28,7 @@ declare(strict_types=1); class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function method() { diff --git a/tests/end-to-end/mock-objects/generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt b/tests/end-to-end/mock-objects/generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt index cdde866eb2a..144ec36bf94 100644 --- a/tests/end-to-end/mock-objects/generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt +++ b/tests/end-to-end/mock-objects/generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt @@ -29,7 +29,7 @@ class MockFoo extends ClassWithMethodWithNullableTypehintedVariadicArguments imp { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function methodWithNullableTypehintedVariadicArguments($a, ?string ...$parameters) { diff --git a/tests/end-to-end/mock-objects/generator/class_with_method_with_typehinted_variadic_arguments.phpt b/tests/end-to-end/mock-objects/generator/class_with_method_with_typehinted_variadic_arguments.phpt index 61a359afe5e..749521dc272 100644 --- a/tests/end-to-end/mock-objects/generator/class_with_method_with_typehinted_variadic_arguments.phpt +++ b/tests/end-to-end/mock-objects/generator/class_with_method_with_typehinted_variadic_arguments.phpt @@ -29,7 +29,7 @@ class MockFoo extends ClassWithMethodWithTypehintedVariadicArguments implements { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function methodWithTypehintedVariadicArguments($a, string ...$parameters) { 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 index 9cb2ba39bc1..114a808b761 100644 --- 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 @@ -29,7 +29,7 @@ class MockFoo extends ClassWithMethodWithVariadicArguments implements PHPUnit\Fr { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function methodWithVariadicArguments($a, ...$parameters) { 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 index fe15050033e..4fe1d3ba8d9 100644 --- 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 @@ -29,7 +29,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(int $baz = %d) { diff --git a/tests/end-to-end/mock-objects/generator/interface.phpt b/tests/end-to-end/mock-objects/generator/interface.phpt index 311a31a8bdb..ba889718857 100644 --- a/tests/end-to-end/mock-objects/generator/interface.phpt +++ b/tests/end-to-end/mock-objects/generator/interface.phpt @@ -27,7 +27,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(Foo $foo) { 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 index fa82ee32f41..2384269f6f1 100644 --- 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 @@ -34,7 +34,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(Foo $foo) { diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class.phpt index 401b5ffe2cd..f6304359d67 100644 --- a/tests/end-to-end/mock-objects/generator/namespaced_class.phpt +++ b/tests/end-to-end/mock-objects/generator/namespaced_class.phpt @@ -35,7 +35,7 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(NS\Foo $foo) { 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 index 17babdcc2b5..9916fc5d80d 100644 --- 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 @@ -30,5 +30,5 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\UnmockedCloneMethod; + use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType; } 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 index 870e1554423..0135e56b378 100644 --- 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 @@ -30,5 +30,5 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } 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 index a5ca4152a6d..1f4956ef6e1 100644 --- 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 @@ -30,5 +30,5 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } 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 index 870e1554423..0135e56b378 100644 --- 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 @@ -30,5 +30,5 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_call_parent_constructor.phpt index 056226cb153..0bfae8f90e2 100644 --- a/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_call_parent_constructor.phpt +++ b/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_call_parent_constructor.phpt @@ -35,5 +35,5 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt index 056226cb153..0bfae8f90e2 100644 --- a/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt +++ b/tests/end-to-end/mock-objects/generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt @@ -35,5 +35,5 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } diff --git a/tests/end-to-end/mock-objects/generator/namespaced_class_partial.phpt b/tests/end-to-end/mock-objects/generator/namespaced_class_partial.phpt index d9f342335b5..d302015324d 100644 --- a/tests/end-to-end/mock-objects/generator/namespaced_class_partial.phpt +++ b/tests/end-to-end/mock-objects/generator/namespaced_class_partial.phpt @@ -35,7 +35,7 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(NS\Foo $foo) { diff --git a/tests/end-to-end/mock-objects/generator/namespaced_interface.phpt b/tests/end-to-end/mock-objects/generator/namespaced_interface.phpt index e52dab53ce9..e06ab7a41d8 100644 --- a/tests/end-to-end/mock-objects/generator/namespaced_interface.phpt +++ b/tests/end-to-end/mock-objects/generator/namespaced_interface.phpt @@ -29,7 +29,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, NS\Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(NS\Foo $foo) { diff --git a/tests/end-to-end/mock-objects/generator/nonexistent_class.phpt b/tests/end-to-end/mock-objects/generator/nonexistent_class.phpt index 1626f75bae0..4d4262a5563 100644 --- a/tests/end-to-end/mock-objects/generator/nonexistent_class.phpt +++ b/tests/end-to-end/mock-objects/generator/nonexistent_class.phpt @@ -26,5 +26,5 @@ class MockFoo extends NonExistentClass implements PHPUnit\Framework\MockObject\M { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } diff --git a/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace.phpt b/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace.phpt index 4d98a88fbff..0c593c4414c 100644 --- a/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace.phpt +++ b/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace.phpt @@ -32,7 +32,7 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } } diff --git a/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace_starting_with_separator.phpt b/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace_starting_with_separator.phpt index ccf5b09b6d9..ed1bf3b30ef 100644 --- a/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace_starting_with_separator.phpt +++ b/tests/end-to-end/mock-objects/generator/nonexistent_class_with_namespace_starting_with_separator.phpt @@ -32,7 +32,7 @@ class MockFoo extends NS\Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; } } diff --git a/tests/end-to-end/mock-objects/generator/nullable_types.phpt b/tests/end-to-end/mock-objects/generator/nullable_types.phpt index 0c16196f88f..599c4002337 100644 --- a/tests/end-to-end/mock-objects/generator/nullable_types.phpt +++ b/tests/end-to-end/mock-objects/generator/nullable_types.phpt @@ -29,7 +29,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(?int $x) { diff --git a/tests/end-to-end/mock-objects/generator/proxy.phpt b/tests/end-to-end/mock-objects/generator/proxy.phpt index 18666c376d1..a9697596e28 100644 --- a/tests/end-to-end/mock-objects/generator/proxy.phpt +++ b/tests/end-to-end/mock-objects/generator/proxy.phpt @@ -29,7 +29,7 @@ class ProxyFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(Foo $foo) { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_closure.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_closure.phpt index a27fcdc4a86..bf8ce6e30f9 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_closure.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_closure.phpt @@ -27,7 +27,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(): Closure { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_final.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_final.phpt index f9018c2fcea..f330a20773f 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_final.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_final.phpt @@ -34,7 +34,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(): FinalClass { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_generator.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_generator.phpt index a3626cc6678..ae82043c62f 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_generator.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_generator.phpt @@ -27,7 +27,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(): Generator { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_nullable.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_nullable.phpt index c28f790c4a2..c0818e91d03 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_nullable.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_nullable.phpt @@ -27,7 +27,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(string $baz): ?string { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_object_method.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_object_method.phpt index 808480b9412..8409eea6d37 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_object_method.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_object_method.phpt @@ -30,7 +30,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(string $baz): Bar { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_parent.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_parent.phpt index 4d3fdf1a004..bd0b30481b6 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_parent.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_parent.phpt @@ -34,7 +34,7 @@ class MockBar extends Bar implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function baz(): Foo { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_self.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_self.phpt index afea138c742..81d2953c366 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_self.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_self.phpt @@ -27,7 +27,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(string $baz): Foo { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_static_method.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_static_method.phpt index f4463070f5b..8510fa82cd5 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_static_method.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_static_method.phpt @@ -30,7 +30,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public static function bar(string $baz): Bar { diff --git a/tests/end-to-end/mock-objects/generator/return_type_declarations_void.phpt b/tests/end-to-end/mock-objects/generator/return_type_declarations_void.phpt index b5e93b3b6a1..82aee6b7770 100644 --- a/tests/end-to-end/mock-objects/generator/return_type_declarations_void.phpt +++ b/tests/end-to-end/mock-objects/generator/return_type_declarations_void.phpt @@ -27,7 +27,7 @@ class MockFoo implements PHPUnit\Framework\MockObject\MockObject, Foo { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(string $baz): void { diff --git a/tests/end-to-end/mock-objects/generator/scalar_type_declarations.phpt b/tests/end-to-end/mock-objects/generator/scalar_type_declarations.phpt index 8c4d33d1224..c66018b794b 100644 --- a/tests/end-to-end/mock-objects/generator/scalar_type_declarations.phpt +++ b/tests/end-to-end/mock-objects/generator/scalar_type_declarations.phpt @@ -29,7 +29,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject { use \PHPUnit\Framework\MockObject\Api; use \PHPUnit\Framework\MockObject\Method; - use \PHPUnit\Framework\MockObject\MockedCloneMethod; + use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType; public function bar(string $baz) {