Fix coding standards errors.

Also remove count() calls in TreeBehavior.
cakephp · Jun 1, 2012 · 55c4ad3 · 55c4ad3
1 parent 085ad0b
commit 55c4ad3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -377,10 +377,12 @@ public function generateTreeList(Model $Model, $conditions = null, $keyPath = nu
 		$stack = array();
 
 		foreach ($results as $i => $result) {
-			while ($stack && ($stack[count($stack) - 1] < $result[$Model->alias][$right])) {
+			$count = count($stack);
+			while ($stack && ($stack[$count - 1] < $result[$Model->alias][$right])) {
 				array_pop($stack);
+				$count--;
 			}
-			$results[$i]['tree_prefix'] = str_repeat($spacer, count($stack));
+			$results[$i]['tree_prefix'] = str_repeat($spacer, $count);
 			$stack[] = $result[$Model->alias][$right];
 		}
 		if (empty($results)) {

diff --git a/lib/Cake/Test/Case/View/XmlViewTest.php b/lib/Cake/Test/Case/View/XmlViewTest.php
@@ -119,7 +119,7 @@ public function testRenderWithView() {
 		$output = $View->render('index');
 
 		$expected = array(
-			'users'=> array('user'=> array('user1', 'user2'))
+			'users' => array('user' => array('user1', 'user2'))
 		);
 		$expected = Xml::build($expected)->asXML();
 		$this->assertSame($expected, $output);