Merge branch 'master' of github.com:mevdschee/php-crud-api

mevdschee · mevdschee · commit 580a447be2e2 · 2019-09-15T22:05:42.000+02:00
diff --git a/api.php b/api.php
@@ -3882,7 +3882,7 @@ public static function fromReflection(GenericReflection $reflection, string $nam
         public static function fromJson(/* object */$json): ReflectedTable
         {
             $name = $json->name;
-            $type = $json->type;
+            $type = isset($json->type) ? $json->type : 'table';
             $columns = [];
             if (isset($json->columns) && is_array($json->columns)) {
                 foreach ($json->columns as $column) {
diff --git a/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php b/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php
@@ -68,7 +68,7 @@ public static function fromReflection(GenericReflection $reflection, string $nam
     public static function fromJson(/* object */$json): ReflectedTable
     {
         $name = $json->name;
-        $type = $json->type;
+        $type = isset($json->type) ? $json->type : 'table';
         $columns = [];
         if (isset($json->columns) && is_array($json->columns)) {
             foreach ($json->columns as $column) {

Original file line number	Diff line number	Diff line change
`@@ -3882,7 +3882,7 @@ public static function fromReflection(GenericReflection $reflection, string $nam`
`3882`	`3882`	`public static function fromJson(/* object */$json): ReflectedTable`
`3883`	`3883`	`{`
`3884`	`3884`	`$name = $json->name;`
`3885`		`- $type = $json->type;`
	`3885`	`+ $type = isset($json->type) ? $json->type : 'table';`
`3886`	`3886`	`$columns = [];`
`3887`	`3887`	`if (isset($json->columns) && is_array($json->columns)) {`
`3888`	`3888`	`foreach ($json->columns as $column) {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static function fromReflection(GenericReflection $reflection, string $nam`
`68`	`68`	`public static function fromJson(/* object */$json): ReflectedTable`
`69`	`69`	`{`
`70`	`70`	`$name = $json->name;`
`71`		`- $type = $json->type;`
	`71`	`+ $type = isset($json->type) ? $json->type : 'table';`
`72`	`72`	`$columns = [];`
`73`	`73`	`if (isset($json->columns) && is_array($json->columns)) {`
`74`	`74`	`foreach ($json->columns as $column) {`