Fix Utility::notEmpty() as Utility::notBlank()

src/Utility/Utility.php

@@ -15,8 +15,21 @@ use RuntimeException;
 class Utility {
 
 	/**
+	 * More sane !empty() check for actual (form) data input.
+	 * It allows only empty string `''`, bool `false` or `null` to be failing the check.
+	 *
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public static function notBlank($value) {
+		return $value === 0 || $value === 0.0 || $value === '0' || !empty($value);
+	}
+
+	/**
 	 * More sane !empty() method to not false positive `'0'` (0 as string) as empty.
 	 *
+	 * @deprecated Use notBlank() instead as it correctly handles also numeric input (int/float).
+	 *
 	 * @param mixed $value
 	 * @return bool
 	 */

tests/TestCase/Utility/UtilityTest.php

@@ -15,6 +15,35 @@ class UtilityTest extends TestCase {
 	/**
 	 * @return void
 	 */
+	public function testNotBlank() {
+		$res = Utility::notBlank('a');
+		$this->assertTrue($res);
+
+		$res = Utility::notBlank(2);
+		$this->assertTrue($res);
+
+		$res = Utility::notBlank(0);
+		$this->assertTrue($res);
+
+		$res = Utility::notBlank('0');
+		$this->assertTrue($res);
+
+		$res = Utility::notBlank(null);
+		$this->assertFalse($res);
+
+		$res = Utility::notBlank(false);
+		$this->assertFalse($res);
+
+		$res = Utility::notBlank('');
+		$this->assertFalse($res);
+
+		$res = Utility::notBlank([]);
+		$this->assertFalse($res);
+	}
+
+	/**
+	 * @return void
+	 */
 	public function testNotEmpty() {
 		$res = Utility::notEmpty('a');
 		$this->assertTrue($res);