Fix matches_type_structure where a shape should contain a genericized object

fixes #10

Author: fredemmott

src/PrivateImpl/TypeStructureImpl.php

@@ -114,6 +114,11 @@ final public static function assertMatchesTypeStructure<T>(
       case TypeStructureKind::OF_INTERFACE:
         $class = TypeAssert::isNotNull($ts['classname']);
 
+        TypeAssert::isInstanceOf(
+          TypeAssert::isNotNull($ts['classname']),
+          $value,
+        );
+
         if (is_a($class, Traversable::class, /* strings = */ true)) {
           $generics = TypeAssert::isNotNull($ts['generic_types']);
           if (count($generics) === 2) {
@@ -130,10 +135,6 @@ final public static function assertMatchesTypeStructure<T>(
           }
         }
 
-        TypeAssert::isInstanceOf(
-          TypeAssert::isNotNull($ts['classname']),
-          $value,
-        );
         return;
       case TypeStructureKind::OF_TRAIT:
         throw new UnsupportedTypeException('OF_TRAIT');

tests/TypeStructureTest.php

@@ -96,6 +96,18 @@ public function getExampleValidTypes(
         type_structure(C::class, 'TStringStringMap'),
         Map { 'foo' => 'bar', 'herp' => 'derp' },
       ),
+      'Vector<Vector<string>>' => tuple(
+        type_structure(C::class, 'TStringVectorVector'),
+        Vector { Vector { 'foo' } },
+      ),
+      'Vector<Vector<string>> with no outer elems' => tuple(
+        type_structure(C::class, 'TStringVectorVector'),
+        Vector { },
+      ),
+      'Vector<Vector<string>> with no inner elems' => tuple(
+        type_structure(C::class, 'TStringVectorVector'),
+        Vector { Vector { } },
+      ),
       'shape with missing ?string field' => tuple(
         type_structure(C::class, 'TFlatShape'),
         shape('someString' => 'foo'),
@@ -130,6 +142,14 @@ public function getExampleValidTypes(
           ),
         ),
       ),
+      'shape with empty container' => tuple(
+        type_structure(C::class, 'TShapeWithContainer'),
+        array('container' => Vector {} ),
+      ),
+      'shape with non-empty container' => tuple(
+        type_structure(C::class, 'TShapeWithContainer'),
+        array('container' => Vector { 'foo' } ),
+      ),
       'enum' => tuple(
         type_structure(C::class, 'TEnum'),
         ExampleEnum::DERP,
@@ -220,10 +240,22 @@ public function getExampleInvalidTypes(
         type_structure(C::class, 'TStringStringMap'),
         Map { 'foo' => 'bar', 'herp' => 123 },
       ),
+      'shape with missing field' => tuple(
+        type_structure(C::class, 'TFlatShape'),
+        shape(),
+      ),
       'shape with incorrect field' => tuple(
         type_structure(C::class, 'TFlatShape'),
         shape('someString' => 123),
       ),
+      'Vector<Vector<string>> with non-container child' => tuple(
+        type_structure(C::class, 'TStringVectorVector'),
+        Vector { 'foo' },
+      ),
+      'Vector<Vector<string>> with incorrect container child' => tuple(
+        type_structure(C::class, 'TStringVectorVector'),
+        Vector { ImmVector { 'foo' } },
+      ),
       'nested shape with missing field' => tuple(
         type_structure(C::class, 'TNestedShape'),
         shape(
@@ -242,6 +274,14 @@ public function getExampleInvalidTypes(
           ),
         ),
       ),
+      'shape with missing container field' => tuple(
+        type_structure(C::class, 'TShapeWithContainer'),
+        array()
+      ),
+      'shape with container of wrong kind' => tuple(
+        type_structure(C::class, 'TShapeWithContainer'),
+        array('container' => Vector { 123 }),
+      ),
       'enum' => tuple(
         type_structure(C::class, 'TEnum'),
         ExampleEnum::DERP.'HERP DERP DERP',

tests/fixtures/TypeConstants.php

@@ -25,6 +25,7 @@ class TypeConstants {
   const type TStdClass = \stdClass;
   const type TStringVector = Vector<string>;
   const type TStringStringMap = Map<string, string>;
+  const type TStringVectorVector = Vector<Vector<string>>;
 
   const type TFlatShape = shape(
     'someString' => string,
@@ -36,5 +37,9 @@ class TypeConstants {
     'someOtherShape' => self::TFlatShape,
   );
 
+  const type TShapeWithContainer = shape(
+    'container' => Vector<string>,
+  );
+
   const type TEnum = ExampleEnum;
 }