Simplify #4938 for PHPUnit 10 where we do not need to care about PHP 7

sebastianbergmann · Mar 24, 2022 · a429413 · a429413
1 parent 694cf82
commit a429413
Show file tree

Hide file tree

Showing 108 changed files with 60 additions and 2,788 deletions.
diff --git a/...pi/MockedCloneMethodWithoutReturnType.php → ...work/MockObject/Api/MockedCloneMethod.php b/...pi/MockedCloneMethodWithoutReturnType.php → ...work/MockObject/Api/MockedCloneMethod.php
@@ -12,7 +12,7 @@
 /**
  * @internal This trait is not covered by the backward compatibility promise for PHPUnit
  */
-trait MockedCloneMethodWithoutReturnType
+trait MockedCloneMethod
 {
     public function __clone(): void
     {

diff --git a/src/Framework/MockObject/Api/MockedCloneMethodWithVoidReturnType.php b/src/Framework/MockObject/Api/MockedCloneMethodWithVoidReturnType.php
diff --git a/.../UnmockedCloneMethodWithoutReturnType.php → ...rk/MockObject/Api/UnmockedCloneMethod.php b/.../UnmockedCloneMethodWithoutReturnType.php → ...rk/MockObject/Api/UnmockedCloneMethod.php
@@ -12,7 +12,7 @@
 /**
  * @internal This trait is not covered by the backward compatibility promise for PHPUnit
  */
-trait UnmockedCloneMethodWithoutReturnType
+trait UnmockedCloneMethod
 {
     public function __clone(): void
     {

diff --git a/src/Framework/MockObject/Api/UnmockedCloneMethodWithVoidReturnType.php b/src/Framework/MockObject/Api/UnmockedCloneMethodWithVoidReturnType.php
diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -882,19 +882,11 @@ private function generateMock(string $type, ?array $explicitMethods, string $moc
         $cloneTrait = '';
 
         if ($mockedCloneMethod) {
-            if (PHP_MAJOR_VERSION >= 8) {
-                $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithVoidReturnType;';
-            } else {
-                $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithoutReturnType;';
-            }
+            $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\MockedCloneMethod;';
         }
 
         if ($unmockedCloneMethod) {
-            if (PHP_MAJOR_VERSION >= 8) {
-                $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithVoidReturnType;';
-            } else {
-                $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\UnmockedCloneMethodWithoutReturnType;';
-            }
+            $cloneTrait = PHP_EOL . '    use \PHPUnit\Framework\MockObject\UnmockedCloneMethod;';
         }
 
         $classTemplate->setVar(

diff --git a/tests/end-to-end/mock-objects/generator/232-php7.phpt b/tests/end-to-end/mock-objects/generator/232-php7.phpt
diff --git a/...-end/mock-objects/generator/232-php8.phpt → ...nd-to-end/mock-objects/generator/232.phpt b/...-end/mock-objects/generator/232-php8.phpt → ...nd-to-end/mock-objects/generator/232.phpt
@@ -63,7 +63,7 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\Api;
     use \PHPUnit\Framework\MockObject\Method;
-    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithVoidReturnType;
+    use \PHPUnit\Framework\MockObject\MockedCloneMethod;
 
     public function speak()
     {

diff --git a/tests/end-to-end/mock-objects/generator/3154_namespaced_constant_resolving-php7.phpt b/tests/end-to-end/mock-objects/generator/3154_namespaced_constant_resolving-php7.phpt
diff --git a/...4_namespaced_constant_resolving-php8.phpt → ...r/3154_namespaced_constant_resolving.phpt b/...4_namespaced_constant_resolving-php8.phpt → ...r/3154_namespaced_constant_resolving.phpt
@@ -48,7 +48,7 @@ class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework
 {
     use \PHPUnit\Framework\MockObject\Api;
     use \PHPUnit\Framework\MockObject\Method;
-    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithVoidReturnType;
+    use \PHPUnit\Framework\MockObject\MockedCloneMethod;
 
     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
@@ -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\UnmockedCloneMethodWithVoidReturnType;
+    use \PHPUnit\Framework\MockObject\UnmockedCloneMethod;
 
     public function foo(): string
     {

diff --git a/tests/end-to-end/mock-objects/generator/397-php7.phpt b/tests/end-to-end/mock-objects/generator/397-php7.phpt
diff --git a/...-end/mock-objects/generator/397-php8.phpt → ...nd-to-end/mock-objects/generator/397.phpt b/...-end/mock-objects/generator/397-php8.phpt → ...nd-to-end/mock-objects/generator/397.phpt
@@ -34,7 +34,7 @@ class MockC extends C implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\Api;
     use \PHPUnit\Framework\MockObject\Method;
-    use \PHPUnit\Framework\MockObject\MockedCloneMethodWithVoidReturnType;
+    use \PHPUnit\Framework\MockObject\MockedCloneMethod;
 
     public function m(?C $other): C
     {

diff --git a/tests/end-to-end/mock-objects/generator/4139-php7.phpt b/tests/end-to-end/mock-objects/generator/4139-php7.phpt