Page MenuHomePhabricator
Files F15412632

D7902.id17885.diff
No OneTemporary
Actions

D7902.id17885.diff
View Options

Index: src/parser/PhutilTypeSpec.php
===================================================================
--- src/parser/PhutilTypeSpec.php
+++ src/parser/PhutilTypeSpec.php
@@ -132,6 +132,16 @@
case 'wild':
return;
default:
+ if (class_exists($this->type, false)) {
+ if ($value instanceof $this->type) {
+ return;
+ }
+ } else if (interface_exists($this->type, false)) {
+ if ($value instanceof $this->type) {
+ return;
+ }
+ }
+
throw new PhutilTypeCheckException($this, $value, $name);
}
}
@@ -163,6 +173,20 @@
}
}
+ public static function getCommonParentClass($class_a, $class_b) {
+ $ancestors_a = array();
+ do {
+ $ancestors_a[] = $class_a;
+ } while ($class_a = get_parent_class($class_a));
+
+ $ancestors_b = array();
+ do {
+ $ancestors_b[] = $class_b;
+ } while ($class_b = get_parent_class($class_b));
+
+ return head(array_intersect($ancestors_a, $ancestors_b));
+ }
+
public static function getTypeOf($value) {
if (is_int($value)) {
return 'int';
@@ -202,7 +226,12 @@
} else if ($type === $vtype) {
continue;
} else {
- return 'wild';
+ $parent = self::getCommonParentClass($type, $vtype);
+ if ($parent) {
+ $type = $parent;
+ } else {
+ return 'wild';
+ }
}
}
Index: src/parser/__tests__/PhutilTypeSpecTestCase.php
===================================================================
--- src/parser/__tests__/PhutilTypeSpecTestCase.php
+++ src/parser/__tests__/PhutilTypeSpecTestCase.php
@@ -87,6 +87,37 @@
}
}
+ public function testGetCommonParentClass() {
+ $map = array(
+ 'stdClass' => array(
+ array('stdClass', 'stdClass'),
+ ),
+ false => array(
+ array('Exception', 'stdClass'),
+ ),
+ 'Exception' => array(
+ array('Exception', 'RuntimeException'),
+ array('LogicException', 'RuntimeException'),
+ array('BadMethodCallException', 'OutOfBoundsException'),
+ ),
+ );
+
+ foreach ($map as $expect => $tests) {
+ if (is_int($expect)) {
+ $expect = (bool) $expect;
+ }
+
+ foreach ($tests as $input) {
+ list($class_a, $class_b) = $input;
+
+ $this->assertEqual(
+ $expect,
+ PhutilTypeSpec::getCommonParentClass($class_a, $class_b),
+ print_r($input, true));
+ }
+ }
+ }
+
public function testGetTypeOf() {
$map = array(
'int' => 1,
@@ -99,6 +130,12 @@
'list<int>' => array(1, 2, 3),
'map<string, int>' => array("x" => 3),
'map<int, list<string>>' => array(1 => array("x", "y")),
+ 'stdClass' => new stdClass(),
+ 'list<Exception>' => array(
+ new Exception(),
+ new LogicException(),
+ new RuntimeException()),
+ 'map<string, stdClass>' => array("x" => new stdClass()),
);
foreach ($map as $expect => $input) {
@@ -120,6 +157,8 @@
'map<wild, wild>' => 16,
'list<string>' => array('y' => 'z'),
'int|null' => 'ducks',
+ 'stdClass' => new Exception(),
+ 'list<RuntimeException>' => array(new Exception()),
);
foreach ($map as $type => $value) {

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 2:05 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7649128
Default Alt Text
D7902.id17885.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility