Validation

qstudio · Aug 14, 2020 · 458ec83 · 458ec83
1 parent 5156e45
commit 458ec83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/library/parse/php_functions.php b/library/parse/php_functions.php
@@ -301,7 +301,7 @@ public static function format( $match = null, $process = 'internal' ){
 		){
 
 			// h::log( self::$return );
-			h::log( 'Return from "'.self::$function.'" is in an array format, trying to convert array values to string' );
+			h::log( 'Return from "'.$open.' '.self::$function.' '.$close.'" is in an array format, trying to convert array values to string' );
 
 			self::$return = implode ( " ", array_values( self::$return ) );
 			self::$return = trim( self::$return );

diff --git a/library/render/fields.php b/library/render/fields.php
@@ -167,9 +167,11 @@ public static function define( $args = null ){
 
 			}
 
+		/*
+		// REMOVED - as clashes with default value assignment in markup::prepare();
 		} else {
 
-			// h::log( 'e:>Error in $args ( empty or not an array ) by "'.\q\core\method::backtrace([ 'level' => 5, 'return' => 'class_function' ]).'"' );
+			h::log( 'e:>Error in $args ( empty or not an array ) by "'.\q\core\method::backtrace([ 'level' => 5, 'return' => 'class_function' ]).'"' );
 			// h::log( $args );
 
 			// return false;
@@ -196,6 +198,7 @@ public static function define( $args = null ){
 				return false;
 
 			}
+		*/
 
 		}
 

diff --git a/library/render/markup.php b/library/render/markup.php
@@ -41,7 +41,7 @@ public static function prepare(){
 		}
 
         // test ##
-        // helper::log( self::$fields );
+        // h::log( self::$fields );
 		// h::log( self::$markup );
 
 		// pre-format markup to extract comments ##
@@ -79,6 +79,8 @@ public static function prepare(){
         // loop over each field, replacing variables with values ##
         foreach( self::$fields as $key => $value ) {
 
+			// h::log( '$value: '.$value );
+
 			// cast booleans to integer ##
 			if ( \is_bool( $value ) ) {
 
@@ -93,7 +95,7 @@ public static function prepare(){
 				&& ! \is_int( $value ) 
 			) {
 
-				h::log( 'e:>The value of "'.$key.'" is not a string or integer - so cannot be rendered, we will check for a default value...' );
+				h::log( 'd:>The value of "'.self::$args['context'].'->'.self::$args['task'].'->'.$key.'" is not a string or integer... checking for a default value' );
 
 				if( 
 					isset( self::$args['config']['default'] ) 
@@ -134,7 +136,7 @@ public static function prepare(){
 
 					}
 
-					h::log( 'd:>Default value set: '.$default_value );
+					h::log( 'd:>Default value for "'.self::$args['context'].'->'.self::$args['task'].'->'.$key.'" set to "'.$default_value.'"' );
 
 					// set value and continue ##
 					$value = $default_value;