Merge pull request wp-cli#4635 from kirtangajjar/upstream/patch-1

gitlost · web-flow · commit b32dfdabbbfa · 2018-01-25T09:17:05.000Z
Make sure '0' edge case is properly handled by is_json()
diff --git a/php/utils.php b/php/utils.php
@@ -1416,7 +1416,7 @@ function esc_sql_ident( $idents ) {
  * @return bool Whether the provided string is a valid JSON representation.
  */
 function is_json( $argument, $ignore_scalars = true ) {
-	if ( empty( $argument ) || ! is_string( $argument ) ) {
+	if ( ! is_string( $argument ) || '' === $argument ) {
 		return false;
 	}
 
diff --git a/tests/test-utils.php b/tests/test-utils.php
@@ -711,6 +711,10 @@ public function dataIsJson() {
 			array( '{"key1":"value1","key2":"value2"}', false, true ),
 			array( '["value1","value2"]', true, true ),
 			array( '["value1","value2"]', false, true ),
+			array( '0', true, false ),
+			array( '0', false, true ),
+			array( '', true, false ),
+			array( '', false, false ),
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1416,7 +1416,7 @@ function esc_sql_ident( $idents ) {`
`1416`	`1416`	`* @return bool Whether the provided string is a valid JSON representation.`
`1417`	`1417`	`*/`
`1418`	`1418`	`function is_json( $argument, $ignore_scalars = true ) {`
`1419`		`- if ( empty( $argument ) \|\| ! is_string( $argument ) ) {`
	`1419`	`+ if ( ! is_string( $argument ) \|\| '' === $argument ) {`
`1420`	`1420`	`return false;`
`1421`	`1421`	`}`
`1422`	`1422`