a new take on toList and more tests for passing a different separator

cakephp · Nov 25, 2009 · 53bfc8c · 53bfc8c
1 parent 398113f
commit 53bfc8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
@@ -331,18 +331,8 @@ function excerpt($text, $phrase, $radius = 100, $ending = '...') {
  * @return string
  * @access public
  */
-	function toList($list, $and = 'and') {
-		$return = '';
-		$count = count($list) - 1;
-	    $counter = 0;
-		foreach ($list as $i => $item) {
-			$return .= $item;
-			if ($count > 0 && $counter < $count) {
-				$return .= ($counter < $count - 1 ? ', ' : " {$and} ");
-			}
-		    $counter++;
-		}
-		return $return;
+	function toList($list, $and = 'and', $separator = ', ') {
+        return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop(array_slice($list, -1));
 	}
 }
 ?>
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -363,8 +363,14 @@ function testListGeneration() {
 		$result = $this->Text->toList(array('Dusty', 'Lucky', 'Ned'), 'y');
 		$this->assertEqual($result, 'Dusty, Lucky y Ned');
 
-		$result = $this->Text->toList(array( 1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'y');
-		$this->assertEqual($result, 'Dusty, Lucky y Ned');
+        $result = $this->Text->toList(array( 1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'y');
+        $this->assertEqual($result, 'Dusty, Lucky y Ned');
+
+        $result = $this->Text->toList(array( 1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'and', ' + ');
+        $this->assertEqual($result, 'Dusty + Lucky and Ned');
+
+        $result = $this->Text->toList(array( 'name1' => 'Dusty', 'name2' => 'Lucky'));
+        $this->assertEqual($result, 'Dusty and Lucky');
 	}
 }
 ?>