Merge branch refs/heads/1.12.x into 2.1.x

tests/PHPStan/Generics/data/variance-2.json

@@ -61,17 +61,17 @@
     },
     {
         "message": "Template type T is declared as covariant, but occurs in contravariant position in parameter t of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
-        "line": 153,
+        "line": 154,
         "ignorable": true
     },
     {
         "message": "Template type T is declared as covariant, but occurs in contravariant position in parameter w of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
-        "line": 153,
+        "line": 154,
         "ignorable": true
     },
     {
         "message": "Template type T is declared as covariant, but occurs in invariant position in parameter v of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
-        "line": 153,
+        "line": 154,
         "ignorable": true
     }
-]
+]

tests/PHPStan/Generics/data/variance-4.json

@@ -1,7 +1,7 @@
 [
     {
         "message": "Property PHPStan\\Generics\\Variance\\ConstructorAndStatic::$data is never read, only written.",
-        "line": 134,
+        "line": 135,
         "ignorable": true
     }
 ]

tests/PHPStan/Generics/data/variance-5.json

@@ -1,7 +1,7 @@
 [
     {
         "message": "Parameter #1 $it of function PHPStan\\Generics\\Variance\\acceptInvariantIterOfDateTimeInterface expects PHPStan\\Generics\\Variance\\InvariantIter<DateTimeInterface>, PHPStan\\Generics\\Variance\\InvariantIter<DateTime> given.",
-        "line": 164,
+        "line": 165,
         "ignorable": true
     }
 ]

tests/PHPStan/Generics/data/variance.php

@@ -127,6 +127,7 @@ function set($v): void;
 /**
  * @template-covariant T
  * @template U
+ * @phpstan-consistent-constructor
  */
 class ConstructorAndStatic {
 
@@ -151,7 +152,7 @@ public function __construct($t, $u, $v, $w) {
 	 * @return Static<T, U>
 	 */
 	public static function create($t, $u, $v, $w) {
-		return new self($t, $u, $v, $w);
+		return new static($t, $u, $v, $w);
 	}
 }