From b82ee925dcb3c27cf6b16cf6de267e5cb4a58729 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Fri, 18 Aug 2023 13:43:46 +0200
Subject: [PATCH] Also mark internal units of code as deprecated for #5241,
 #5242, #5243, #5244

---
 .psalm/baseline.xml                           | 20 +++++++++++++++++++
 .../Exception/UnknownTraitException.php       |  2 ++
 .../MockObject/Generator/Generator.php        |  8 ++++++++
 .../MockObject/Generator/MockTrait.php        |  2 ++
 4 files changed, 32 insertions(+)

diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
index 2140b55e5ed..2f18083bc20 100644
--- a/.psalm/baseline.xml
+++ b/.psalm/baseline.xml
@@ -234,6 +234,18 @@
       <code>$methods</code>
       <code>$type</code>
     </ArgumentTypeCoercion>
+    <DeprecatedClass>
+      <code><![CDATA[new MockTrait(
+                $classTemplate->render(),
+                $className['className'],
+            )]]></code>
+      <code><![CDATA[new MockTrait($classTemplate->render(), $className['className'])]]></code>
+      <code>new UnknownTraitException($traitName)</code>
+      <code>new UnknownTraitException($traitName)</code>
+    </DeprecatedClass>
+    <DeprecatedMethod>
+      <code>mockObjectForAbstractClass</code>
+    </DeprecatedMethod>
     <MissingThrowsDocblock>
       <code>getMethod</code>
     </MissingThrowsDocblock>
@@ -263,6 +275,10 @@
     </PossiblyFalseOperand>
   </file>
   <file src="src/Framework/MockObject/MockBuilder.php">
+    <DeprecatedMethod>
+      <code>mockObjectForAbstractClass</code>
+      <code>mockObjectForTrait</code>
+    </DeprecatedMethod>
     <InvalidReturnStatement>
       <code>$object</code>
       <code>$object</code>
@@ -314,6 +330,10 @@
       <code>disableArgumentCloning</code>
       <code>disallowMockingUnknownTypes</code>
       <code>enableProxyingToOriginalMethods</code>
+      <code>generateClassFromWsdl</code>
+      <code>mockObjectForAbstractClass</code>
+      <code>mockObjectForTrait</code>
+      <code>objectForTrait</code>
     </DeprecatedMethod>
     <MissingThrowsDocblock>
       <code>getMethod</code>
diff --git a/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php b/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php
index 51f0c86c7d3..67cecfa9009 100644
--- a/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php
+++ b/src/Framework/MockObject/Generator/Exception/UnknownTraitException.php
@@ -13,6 +13,8 @@
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ *
+ * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243
  */
 final class UnknownTraitException extends \PHPUnit\Framework\Exception implements Exception
 {
diff --git a/src/Framework/MockObject/Generator/Generator.php b/src/Framework/MockObject/Generator/Generator.php
index 0216106ee78..dca00da1107 100644
--- a/src/Framework/MockObject/Generator/Generator.php
+++ b/src/Framework/MockObject/Generator/Generator.php
@@ -227,6 +227,8 @@ public function testDoubleForInterfaceIntersection(array $interfaces, bool $mock
      * @throws RuntimeException
      * @throws UnknownClassException
      * @throws UnknownTypeException
+     *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5241
      */
     public function mockObjectForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject
     {
@@ -286,6 +288,8 @@ interface_exists($originalClassName, $callAutoload)) {
      * @throws UnknownClassException
      * @throws UnknownTraitException
      * @throws UnknownTypeException
+     *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243
      */
     public function mockObjectForTrait(string $traitName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject
     {
@@ -323,6 +327,8 @@ public function mockObjectForTrait(string $traitName, array $arguments = [], str
      * @throws ReflectionException
      * @throws RuntimeException
      * @throws UnknownTraitException
+     *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5244
      */
     public function objectForTrait(string $traitName, string $traitClassName = '', bool $callAutoload = true, bool $callOriginalConstructor = false, array $arguments = []): object
     {
@@ -406,6 +412,8 @@ public function generate(string $type, bool $mockObject, array $methods = null,
     /**
      * @throws RuntimeException
      * @throws SoapExtensionNotAvailableException
+     *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5242
      */
     public function generateClassFromWsdl(string $wsdlFile, string $className, array $methods = [], array $options = []): string
     {
diff --git a/src/Framework/MockObject/Generator/MockTrait.php b/src/Framework/MockObject/Generator/MockTrait.php
index 72b007b2366..20e9301b602 100644
--- a/src/Framework/MockObject/Generator/MockTrait.php
+++ b/src/Framework/MockObject/Generator/MockTrait.php
@@ -13,6 +13,8 @@
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ *
+ * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243
  */
 final class MockTrait implements MockType
 {