Merge pull request #178 from dereuromark/bugfix

Fix trimDeep()

Author: dereuromark

composer.json

@@ -42,8 +42,9 @@
 		"issues": "https://github.com/dereuromark/cakephp-tools/issues"
 	},
 	"scripts": {
-		"setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit.phar",
 		"test": "php phpunit.phar",
+		"test-setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit.phar",
+		"test-coverage": "php phpunit.phar --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml",
 		"cs-check": "vendor/bin/phpcs -p --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/cakephp-tools/vendor/,/tmp/,/logs/,/tests/test_files/ --extensions=php ./",
 		"cs-fix": "phpcbf -v --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/cakephp-tools/vendor/,/tmp/,/logs/,/tests/test_files --extensions=php ./"
 	}

src/Utility/Utility.php

@@ -129,7 +129,7 @@ public static function pregMatch($pattern, $subject, $flags = null, $offset = nu
 	 */
 	public static function strSplit($str, $length = 1) {
 		if ($length < 1) {
-			return false;
+			return [];
 		}
 		$result = [];
 		$c = mb_strlen($str);
@@ -406,18 +406,25 @@ public static function typeCast($value, $type) {
 	/**
 	 * Trim recursively
 	 *
-	 * @param mixed $value
+	 * @param string|array|null $value
+	 * @param bool $transformNullToString
 	 * @return array|string
 	 */
-	public static function trimDeep($value) {
-		$value = is_array($value) ? array_map('self::trimDeep', $value) : trim($value);
-		return $value;
+	public static function trimDeep($value, $transformNullToString = false) {
+		if (is_array($value)) {
+			foreach ($value as $k => $v) {
+				$value[$k] = static::trimDeep($v, $transformNullToString);
+			}
+			return $value;
+		}
+
+		return ($value === null && !$transformNullToString) ? $value : trim($value);
 	}
 
 	/**
 	 * Applies h() recursively
 	 *
-	 * @param mixed $value
+	 * @param string|array $value
 	 * @return array|string
 	 */
 	public static function specialcharsDeep($value) {

tests/TestCase/Utility/UtilityTest.php

@@ -291,18 +291,38 @@ public function testDeep() {
 		$is = [
 			'f some',
 			'e 49r ' => 'rf r ',
-			'er' => [['ee' => ['rr ' => ' tt ']]]
+			'er' => [['ee' => ['rr ' => ' tt ', 'empty' => null]]]
 		];
 		$expected = [
 			'f some',
 			'e 49r ' => 'rf r',
-			'er' => [['ee' => ['rr ' => 'tt']]]
+			'er' => [['ee' => ['rr ' => 'tt', 'empty' => null]]]
 		];
 
 		$res = Utility::trimDeep($is);
 		$this->assertSame($expected, $res);
 	}
 
+	/**
+	 * @covers ::trimDeep
+	 * @return void
+	 */
+	public function testDeepTransformNullToString() {
+		$is = [
+			'f some',
+			'e 49r ' => 'rf r ',
+			'er' => [['ee' => ['rr ' => ' tt ', 'empty' => null]]]
+		];
+		$expected = [
+			'f some',
+			'e 49r ' => 'rf r',
+			'er' => [['ee' => ['rr ' => 'tt', 'empty' => '']]]
+		];
+
+		$res = Utility::trimDeep($is, true);
+		$this->assertSame($expected, $res);
+	}
+
 	/**
 	 * //TODO
 	 *