display errors with indenting

Author: aaronpk

json-result.php

@@ -19,7 +19,7 @@
     </h1>
 
     <?php if($error): ?>
-      <div class="alert alert-danger" role="alert"><?php echo htmlspecialchars($error); ?></div>
+      <div class="alert alert-danger" role="alert" style="white-space: pre-wrap;"><?php echo htmlspecialchars($error); ?></div>
     <?php else: ?>
       <div class="alert alert-success" role="alert">Valid Microformats JSON!</div>
     <?php endif ?>

json-validator.php

@@ -1,90 +1,94 @@
 <?php
 
-function is_valid_mf2_list($input) {
+function is_valid_mf2_list($input, $level=0) {
+	$indent = str_repeat("      ",$level);
+
 	// Input to this function must be an array
 	if(!is_object($input))
-		return [false, 'Input was not an object'];
+		return [false, $indent.'Input was not an object'];
 
 	if(!isset($input->items))
-		return [false, 'Input is missing a top-level "items" property'];
+		return [false, $indent.'Input is missing a top-level "items" property'];
 
 	if(!is_array($input->items))
-		return [false, 'The "items" property must be an array'];
+		return [false, $indent.'The "items" property must be an array'];
 
 	// Every item must be valid
 	foreach($input->items as $i=>$item) {
-		list($valid, $error) = is_valid_mf2_object($item);
+		list($valid, $error) = is_valid_mf2_object($item, $level+1);
 		if(!$valid) {
-			return [false, 'Item '.$i.' was invalid: '.$error];
+			return [false, $indent.'Item '.$i.' was invalid:'."\n".$error];
 		}
 	}
 
 	return [true, null];
 }
 
-function is_valid_mf2_object($input) {
+function is_valid_mf2_object($input, $level=0) {
+	$indent = str_repeat("      ",$level);
+
 	// Input to this function must be an array
 	if(!is_object($input))
-		return [false, 'Input was not an object'];
+		return [false, $indent.'Input was not an object'];
 
 	// Keys type and properties are required at a minimum and must be arrays
 	if(!isset($input->type))
-		return [false, 'Item is missing the "type" property'];
+		return [false, $indent.'Item is missing the "type" property'];
 
 	if(!is_array($input->type))
-		return [false, 'The "type" property is not an array'];
+		return [false, $indent.'The "type" property is not an array'];
 
 	if(!isset($input->properties))
-		return [false, 'Item is missing the "properties" property'];
+		return [false, $indent.'Item is missing the "properties" property'];
 
 	if(!is_object($input->properties))
-		return [false, 'The "properties" property is not an object'];
+		return [false, $indent.'The "properties" property is not an object'];
 
 	// Every value of type must be a string beginning with h-
 	foreach($input->type as $type) {
 		if(!is_string($type) || substr($type, 0, 2) != 'h-')
-			return [false, 'Every type must be an h-* value, got: "'.$type.'"'];
+			return [false, $indent.'Every type must be an h-* value, got: "'.$type.'"'];
 	}
 
 	foreach($input->properties as $key=>$property) {
 		// Every property must be an array
 		if(!is_array($property))
-			return [false, 'One of the values of "'.$key.'" is not an array'];
+			return [false, $indent.'One of the values of "'.$key.'" is not an array'];
 
 		// If a value of a property is not a string, it must be a valid mf2 object
 		foreach($property as $k=>$val) {
 			if(is_object($val)) {
 				// Try to detect e- parsed objects
 				if(property_exists($val, 'value') && !property_exists($val, 'html')) 
-					return [false, 'One of the values of '.$key.' is missing the "html" property'];
+					return [false, $indent.'One of the values of '.$key.' is missing the "html" property'];
 
 				if(property_exists($val, 'html') && !property_exists($val, 'value'))
-					return [false, 'One of the values of '.$key.' is missing the "value" property'];
+					return [false, $indent.'One of the values of '.$key.' is missing the "value" property'];
 
 				// Otherwise this must be a nested object
-				list($valid, $error) = is_valid_mf2_object($val);
+				list($valid, $error) = is_valid_mf2_object($val, $level+1);
 				if(!$valid)
-					return [false, 'One of the values of "'.$key.'" is not a valid mf2 object: '.$error];
+					return [false, $indent.'One of the values of "'.$key.'" is not a valid mf2 object:'."\n".$error];
 
 			} else if(!is_string($val)) {
 				if(is_numeric($val))
-					return [false, 'One of the values of "'.$key.'" is a number instead of a string'];
+					return [false, $indent.'One of the values of "'.$key.'" is a number instead of a string'];
 
-				list($valid, $error) = is_valid_mf2_object($val);
+				list($valid, $error) = is_valid_mf2_object($val, $level+1);
 				if($error)
-					return [false, 'One of the values of "'.$key.'" is not a valid mf2 object'];
+					return [false, $indent.'One of the values of "'.$key.'" is not a valid mf2 object'."\n"];
 			}
 		}
 	}
 
 	if(isset($input->children)) {
 		if(!is_array($input->children))
-			return [false, 'The "children" property must be an array'];
+			return [false, $indent.'The "children" property must be an array'];
 
 		foreach($input->children as $child) {
-			list($valid, $error) = is_valid_mf2_object($child);
+			list($valid, $error) = is_valid_mf2_object($child, $level+1);
 			if(!$valid) {
-				return [false, 'One of the child objects was not valid: '.$error];
+				return [false, $indent.'One of the child objects was not valid:'."\n".$error."\n"];
 			}
 		}
 	}