Extract __phpunit_setReturnValueGeneration() from template into trait

src/Framework/MockObject/Generator/mocked_class.tpl.dist

@@ -4,21 +4,16 @@ declare(strict_types=1);
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
 {clone}{mocked_methods}
     public function expects(\PHPUnit\Framework\MockObject\Matcher\Invocation $matcher): \PHPUnit\Framework\MockObject\Builder\InvocationMocker
     {
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 {method}
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

src/Framework/MockObject/ReturnValueGeneration.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework\MockObject;
+
+/**
+ * @internal This trait is not covered by the backward compatibility promise for PHPUnit
+ */
+trait ReturnValueGeneration
+{
+    /**
+     * @var @bool
+     */
+    private $__phpunit_returnValueGeneration = true;
+
+    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
+    {
+        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
+    }
+}

tests/end-to-end/mock-objects/generator/232.phpt

@@ -58,9 +58,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -102,11 +102,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/3154_namespaced_constant_resolving.phpt

@@ -43,9 +43,9 @@ class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -87,11 +87,6 @@ class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/397.phpt

@@ -29,9 +29,9 @@ class MockC extends C implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -73,11 +73,6 @@ class MockC extends C implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/abstract_class.phpt

@@ -33,9 +33,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -121,11 +121,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class.phpt

@@ -33,9 +33,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -99,11 +99,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_call_parent_clone.phpt

@@ -28,9 +28,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -51,11 +51,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_call_parent_constructor.phpt

@@ -28,9 +28,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -50,11 +50,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_dont_call_parent_clone.phpt

@@ -28,9 +28,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -50,11 +50,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_dont_call_parent_constructor.phpt

@@ -28,9 +28,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -50,11 +50,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_implementing_interface_call_parent_constructor.phpt

@@ -33,9 +33,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -55,11 +55,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_implementing_interface_dont_call_parent_constructor.phpt

@@ -33,9 +33,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -55,11 +55,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_nonexistent_method.phpt

@@ -29,9 +29,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -73,11 +73,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_partial.phpt

@@ -33,9 +33,9 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -77,11 +77,6 @@ class MockFoo extends Foo implements PHPUnit\Framework\MockObject\MockObject
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_with_deprecated_method.phpt

@@ -33,9 +33,9 @@ class MockFoo extends ClassWithDeprecatedMethod implements PHPUnit\Framework\Moc
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -79,11 +79,6 @@ class MockFoo extends ClassWithDeprecatedMethod implements PHPUnit\Framework\Moc
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {

tests/end-to-end/mock-objects/generator/class_with_final_method.phpt

@@ -29,9 +29,9 @@ class MockFoo extends ClassWithFinalMethod implements PHPUnit\Framework\MockObje
 {
     use \PHPUnit\Framework\MockObject\ConfigurableMethods;
     use \PHPUnit\Framework\MockObject\OriginalObject;
+    use \PHPUnit\Framework\MockObject\ReturnValueGeneration;
 
     private $__phpunit_invocationMocker;
-    private $__phpunit_returnValueGeneration = true;
 
     public function __clone()
     {
@@ -51,11 +51,6 @@ class MockFoo extends ClassWithFinalMethod implements PHPUnit\Framework\MockObje
         return call_user_func_array([$expects, 'method'], func_get_args());
     }
 
-    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration): void
-    {
-        $this->__phpunit_returnValueGeneration = $returnValueGeneration;
-    }
-
     public function __phpunit_getInvocationMocker(): \PHPUnit\Framework\MockObject\InvocationMocker
     {
         if ($this->__phpunit_invocationMocker === null) {