Fix merge conflict resolution

sebastianbergmann · Jul 19, 2024 · 1c640d4 · 1c640d4
1 parent 29ba97c
commit 1c640d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Framework/MockObject/Generator/Generator.php b/src/Framework/MockObject/Generator/Generator.php
@@ -195,6 +195,8 @@ public function testDoubleForInterfaceIntersection(array $interfaces, bool $mock
     }
 
     /**
+     * @param ?list<non-empty-string> $methods
+     *
      * @throws ClassIsEnumerationException
      * @throws ClassIsFinalException
      * @throws MethodNamedMethodException

diff --git a/src/Framework/MockObject/Generator/MockBuilder.php b/src/Framework/MockObject/Generator/MockBuilder.php
@@ -48,7 +48,11 @@ final class MockBuilder
     /**
      * @psalm-var ?class-string
      */
-    private ?string $mockClassName      = null;
+    private ?string $mockClassName = null;
+
+    /**
+     * @var array<mixed>
+     */
     private array $constructorArgs      = [];
     private bool $originalConstructor   = true;
     private bool $originalClone         = true;