Consolidate, rename, and add new variance tests

Author: morrisonlevi

Zend/tests/type_declarations/variance/across_namespaces_001.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Variance checks work across same-file namespaces (brace style)
+--FILE--
+<?php
+
+namespace Foo {
+  class A {
+    function foo(B $x): A {
+      return new self();
+    }
+  }
+}
+
+namespace Bar {
+  class B extends \Foo\A {
+    function foo(\stdClass $x): B {
+      return new self();
+    }
+  }
+}
+
+namespace {
+  echo get_class((new \Bar\B())->foo(new \stdClass()));
+}
+?>
+--EXPECTF--
+Warning: Declaration of Bar\B::foo(stdClass $x): Bar\B should be compatible with Foo\A::foo(Foo\B $x): Foo\A in %s on line %d
+Bar\B

Zend/tests/type_declarations/variance/across_namespaces_002.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Variance checks work across same-file namespaces
+--FILE--
+<?php
+
+namespace Foo;
+
+class A {
+  function foo(B $x): A {
+    return new self();
+  }
+}
+
+namespace Bar;
+
+class B extends \Foo\A {
+  function foo(\stdClass $x): B {
+    return new self();
+  }
+}
+
+echo get_class((new \Bar\B())->foo(new \stdClass()));
+?>
+--EXPECTF--
+Warning: Declaration of Bar\B::foo(stdClass $x): Bar\B should be compatible with Foo\A::foo(Foo\B $x): Foo\A in %s on line %d
+Bar\B

Zend/tests/type_declarations/variance/conditional_001.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Delayed variance checks work with conditional statements
+--FILE--
+<?php
+
+interface A {
+  static function m(Y $z): A;
+}
+
+if (true) {
+  class B implements A {
+    static function m(X $z): B {
+      return new self();
+    }
+  }
+  class X {}
+  class Y extends X {}
+}
+
+echo get_class(B::m(new X()));
+?>
+--EXPECTF--
+B

Zend/tests/type_declarations/variance/conditional_002.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Delayed variance checks work with conditional statements
+--FILE--
+<?php
+
+interface A {
+  static function m(Y $z): A;
+}
+
+if (true) {
+  class B implements A {
+    static function m(X $z): B {
+      return new self();
+    }
+  }
+  class X {}
+  //class Y extends X {}
+}
+
+echo get_class(B::m(new X()));
+?>
+--EXPECTF--
+Fatal error: Declaration of B::m(X $z): B must be compatible with A::m(Y $z): A in %s on line %d