Ticket #30238: 30238.2-tests.diff

src/wp-includes/functions.php

@@ -4740 +4740 @@
 }
 
 /**
- * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN ).
+ * Filter/validate a variable as a boolean.
+ *
+ * Alternative to `filter_var( $var, FILTER_VALIDATE_BOOLEAN )`.
  *
  * @since 4.0.0
  *
@@ -4752 +4754 @@
                 return $var;
         }
 
-        if ( 'false' === $var ) {
+        if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
                 return false;
         }
 

tests/phpunit/tests/functions.php

@@ -571 +571 @@
                 $json = wp_json_encode( $data, 0, 1 );
                 $this->assertFalse( $json );
         }
+
+        /**
+         * @ticket 30238
+         */
+        function test_wp_validate_boolean() {
+                // Cases where wp_validate_boolean() equals (bool) conversion:
+                $this->assertTrue( wp_validate_boolean( true ) );
+                $this->assertTrue( wp_validate_boolean( 1 ) );
+                $this->assertTrue( wp_validate_boolean( 'true' ) );
+                $this->assertTrue( wp_validate_boolean( 'TRUE' ) );
+                $this->assertTrue( wp_validate_boolean( 'foobar' ) );
+                $this->assertFalse( wp_validate_boolean( false ) );
+                $this->assertFalse( wp_validate_boolean( 0 ) );
+                $this->assertFalse( wp_validate_boolean( 0.0 ) );
+                $this->assertFalse( wp_validate_boolean( '' ) );
+                $this->assertFalse( wp_validate_boolean( '0' ) );
+                $this->assertFalse( wp_validate_boolean( array() ) );
+                $this->assertFalse( wp_validate_boolean( null ) );
+
+                // Cases where wp_validate_boolean() differs from (bool) conversion:
+                $this->assertFalse( wp_validate_boolean( 'false' ) );
+                $this->assertFalse( wp_validate_boolean( 'FALSE' ) );
+                $this->assertFalse( wp_validate_boolean( 'FalsE' ) );
+        }
 }