From: Bernhard Kraft <kraft@webconsulting.at>
Date: Mon, 10 Mar 2014 17:28:34 +0000 (+0100)
Subject: [TASK] Simplify TYPO3_DB->cleanIntArray
X-Git-Tag: TYPO3_6-2-0rc1~66
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/a51dfbab6ec5c54edc73e6633eb2d6481b03981f?ds=sidebyside

[TASK] Simplify TYPO3_DB->cleanIntArray

Instead of iterating over the array and calling "intval" for each
element the "array_map" php function gets used.

Change-Id: I5ae699f9bc158eb0caebf1fc9ea8ebaa3cdd73ca
Resolves: #56738
Releases: 6.2, 6.1, 6.0
Reviewed-on: https://review.typo3.org/28234
Reviewed-by: Dmitry Dulepov
Tested-by: Dmitry Dulepov
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---

diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index bab8d54d52cd..cc8b97fb3cc5 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -876,10 +876,7 @@ class DatabaseConnection {
 	 * @see cleanIntList()
 	 */
 	public function cleanIntArray($arr) {
-		foreach ($arr as $k => $v) {
-			$arr[$k] = (int)$arr[$k];
-		}
-		return $arr;
+		return array_map('intval', $arr);
 	}
 
 	/**
diff --git a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
index 01c003d140bc..926589f1ccca 100644
--- a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -295,4 +295,81 @@ class DatabaseConnectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 		$strippedQuery = $subject->stripGroupBy($groupByClause);
 		$this->assertEquals($expectedResult, $strippedQuery);
 	}
+
+
+	/////////////////////////////////////////////////
+	// Tests concerning stripOrderByForOrderByKeyword
+	/////////////////////////////////////////////////
+
+	/**
+	 * Data Provider for stripGroupByForGroupByKeyword()
+	 *
+	 * @see stripOrderByForOrderByKeyword()
+	 * @return array
+	 */
+	public function cleanIntArrayDataProvider() {
+		return array(
+			'simple array' => array(
+				array(1, 2, 3),
+				array(1, 2, 3)
+			),
+			'string array' => array(
+				array('2', '4', '8'),
+				array(2, 4, 8)
+			),
+			'string array with letters #1' => array(
+				array('3', '6letters', '12'),
+				array(3, 6, 12)
+			),
+			'string array with letters #2' => array(
+				array('3', 'letters6', '12'),
+				array(3, 0, 12)
+			),
+			'string array with letters #3' => array(
+				array('3', '6letters4', '12'),
+				array(3, 6, 12)
+			),
+			'associative array' => array(
+				array('apples' => 3, 'bananas' => 4, 'kiwis' => 9),
+				array('apples' => 3, 'bananas' => 4, 'kiwis' => 9)
+			),
+			'associative string array' => array(
+				array('apples' => '1', 'bananas' => '5', 'kiwis' => '7'),
+				array('apples' => 1, 'bananas' => 5, 'kiwis' => 7)
+			),
+			'associative string array with letters #1' => array(
+				array('apples' => '1', 'bananas' => 'no5', 'kiwis' => '7'),
+				array('apples' => 1, 'bananas' => 0, 'kiwis' => 7)
+			),
+			'associative string array with letters #2' => array(
+				array('apples' => '1', 'bananas' => '5yes', 'kiwis' => '7'),
+				array('apples' => 1, 'bananas' => 5, 'kiwis' => 7)
+			),
+			'associative string array with letters #3' => array(
+				array('apples' => '1', 'bananas' => '5yes9', 'kiwis' => '7'),
+				array('apples' => 1, 'bananas' => 5, 'kiwis' => 7)
+			),
+			'multidimensional associative array' => array(
+				array('apples' => '1', 'bananas' => array(3, 4), 'kiwis' => '7'),
+				// intval(array(...)) is 1
+				// But by specification "cleanIntArray" should only get used on one-dimensional arrays
+				array('apples' => 1, 'bananas' => 1, 'kiwis' => 7)
+			),
+		);
+	}
+
+	/**
+	 * @test
+	 * @dataProvider cleanIntArrayDataProvider
+	 * @param array $exampleData The array to sanitize
+	 * @param array $expectedResult The expected result
+	 * @return void
+	 */
+	public function cleanIntArray($exampleData, $expectedResult) {
+		/** @var \TYPO3\CMS\Core\Database\DatabaseConnection $subject */
+		$subject = new \TYPO3\CMS\Core\Database\DatabaseConnection();
+		$sanitizedArray = $subject->cleanIntArray($exampleData);
+		$this->assertEquals($expectedResult, $sanitizedArray);
+	}
+
 }
\ No newline at end of file