Merge branch '9.4' into master

Author: sebastianbergmann

.psalm/baseline.xml

@@ -456,8 +456,7 @@
     </MissingParamType>
   </file>
   <file src="src/Framework/MockObject/Generator.php">
-    <ArgumentTypeCoercion occurrences="4">
-      <code>$className</code>
+    <ArgumentTypeCoercion occurrences="3">
       <code>$className</code>
       <code>$className</code>
       <code>$interfaceName</code>
@@ -469,9 +468,6 @@
     <InvalidReturnType occurrences="1">
       <code>MockObject&amp;RealInstanceType</code>
     </InvalidReturnType>
-    <InvalidStringClass occurrences="1">
-      <code>new $className</code>
-    </InvalidStringClass>
     <MissingParamType occurrences="1">
       <code>$type</code>
     </MissingParamType>
@@ -1323,20 +1319,6 @@
       <code>getName</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Util/Metadata/Group.php">
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$enabled</code>
-    </InvalidPropertyAssignmentValue>
-    <InvalidReturnStatement occurrences="1">
-      <code>$this-&gt;groupName</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>bool</code>
-    </InvalidReturnType>
-  </file>
-  <file src="src/Util/Metadata/MetadataCollection.php">
-    <InvalidArgument occurrences="1"/>
-  </file>
   <file src="src/Util/PHP/AbstractPhpProcess.php">
     <ArgumentTypeCoercion occurrences="2">
       <code>$this-&gt;getException($failures[0])</code>

src/Framework/MockObject/MockClass.php

@@ -23,7 +23,7 @@ final class MockClass implements MockType
     private $classCode;
 
     /**
-     * @var string
+     * @var class-string
      */
     private $mockName;
 
@@ -32,13 +32,19 @@ final class MockClass implements MockType
      */
     private $configurableMethods;
 
+    /**
+     * @psalm-param class-string $mockName
+     */
     public function __construct(string $classCode, string $mockName, array $configurableMethods)
     {
         $this->classCode           = $classCode;
         $this->mockName            = $mockName;
         $this->configurableMethods = $configurableMethods;
     }
 
+    /**
+     * @psalm-return class-string
+     */
     public function generate(): string
     {
         if (!class_exists($this->mockName, false)) {

src/Framework/MockObject/MockTrait.php

@@ -22,16 +22,22 @@ final class MockTrait implements MockType
     private $classCode;
 
     /**
-     * @var string
+     * @var class-string
      */
     private $mockName;
 
+    /**
+     * @psalm-param class-string $mockName
+     */
     public function __construct(string $classCode, string $mockName)
     {
         $this->classCode = $classCode;
         $this->mockName  = $mockName;
     }
 
+    /**
+     * @psalm-return class-string
+     */
     public function generate(): string
     {
         if (!class_exists($this->mockName, false)) {

src/Framework/MockObject/MockType.php

@@ -14,5 +14,8 @@
  */
 interface MockType
 {
+    /**
+     * @psalm-return class-string
+     */
     public function generate(): string;
 }