Applying optimizations to use of count() from 'jrbasso'

Author: markstory

cake/libs/configure.php

@@ -373,7 +373,7 @@ function delete($var = null) {
 		$_this =& Configure::getInstance();
 		$name = $_this->__configVarNames($var);
 
-		if (count($name) > 1) {
+		if (isset($name[1])) {
 			unset($_this->{$name[0]}[$name[1]]);
 		} else {
 			unset($_this->{$name[0]});

cake/libs/controller/components/acl.php

@@ -349,7 +349,7 @@ function allow($aro, $aco, $actions = "*", $value = 1) {
 		}
 		list($save['aro_id'], $save['aco_id']) = array($perms['aro'], $perms['aco']);
 
-		if ($perms['link'] != null && count($perms['link']) > 0) {
+		if ($perms['link'] != null && !empty($perms['link'])) {
 			$save['id'] = $perms['link'][0][$this->Aro->Permission->alias]['id'];
 		} else {
 			unset($save['id']);

cake/libs/controller/controller.php

@@ -737,7 +737,7 @@ function validate() {
 	function validateErrors() {
 		$objects = func_get_args();
 
-		if (!count($objects)) {
+		if (empty($objects)) {
 			return false;
 		}
 
@@ -747,7 +747,7 @@ function validateErrors() {
 			$errors = array_merge($errors, $this->{$object->alias}->invalidFields());
 		}
 
-		return $this->validationErrors = (count($errors) ? $errors : false);
+		return $this->validationErrors = (!empty($errors) ? $errors : false);
 	}
 /**
  * Instantiates the correct view class, hands it its data, and uses it to render the view output.

cake/libs/debugger.php

@@ -403,7 +403,7 @@ function exportVar($var, $recursion = 0) {
 					}
 				}
 				$n = null;
-				if (count($vars) > 0) {
+				if (!empty($vars)) {
 					$n = "\n";
 				}
 				return $out . implode(",", $vars) . "{$n})";

cake/libs/folder.php

@@ -744,7 +744,7 @@ function realpath($path) {
 				continue;
 			}
 			if ($part === '..') {
-				if (count($newparts) > 0) {
+				if (!empty($newparts)) {
 					array_pop($newparts);
 					continue;
 				} else {

cake/libs/model/connection_manager.php

@@ -135,7 +135,7 @@ function sourceList() {
 	function getSourceName(&$source) {
 		$_this =& ConnectionManager::getInstance();
 		$names = array_keys($_this->_dataSources);
-		for ($i = 0; $i < count($names); $i++) {
+		for ($i = 0, $count = count($names); $i < $count; $i++) {
 			if ($_this->_dataSources[$names[$i]] === $source) {
 				return $names[$i];
 			}

cake/libs/model/datasources/dbo_source.php

@@ -2039,7 +2039,7 @@ function order($keys, $direction = 'ASC') {
 			$keys = array_filter($keys);
 		}
 
-		if (empty($keys) || (is_array($keys) && count($keys) && isset($keys[0]) && empty($keys[0]))) {
+		if (empty($keys) || (is_array($keys) && isset($keys[0]) && empty($keys[0]))) {
 			return '';
 		}
 

cake/libs/model/model.php

@@ -1079,7 +1079,7 @@ function field($name, $conditions = null, $order = null) {
 					return $data[$name[0]][$name[1]];
 				}
 			}
-			if (isset($data[0]) && count($data[0]) > 0) {
+			if (!empty($data[0])) {
 				$name = key($data[0]);
 				return $data[0][$name];
 			}

cake/libs/multibyte.php

@@ -161,7 +161,7 @@ function stripTags() {
 		$params = params(func_get_args());
 		$str = $params[0];
 
-		for ($i = 1; $i < count($params); $i++) {
+		for ($i = 1, $count = count($params); $i < $count; $i++) {
 			$str = preg_replace('/<' . $params[$i] . '\b[^>]*>/i', '', $str);
 			$str = preg_replace('/<\/' . $params[$i] . '[^>]*>/i', '', $str);
 		}

cake/libs/sanitize.php

@@ -1077,7 +1077,7 @@ function __flatten($results, $key = null) {
 			if (!is_null($key)) {
 				$id = $key;
 			}
-			if (is_array($r) && count($r)) {
+			if (is_array($r) && !empty($r)) {
 				$stack = array_merge($stack, Set::__flatten($r, $id));
 			} else {
 				$stack[] = array('id' => $id, 'value' => $r);

cake/libs/set.php

@@ -410,7 +410,7 @@ function style($data, $inline = true) {
  * @return string
  */
 	function getCrumbs($separator = '»', $startText = false) {
-		if (count($this->_crumbs)) {
+		if (!empty($this->_crumbs)) {
 			$out = array();
 			if ($startText) {
 				$out[] = $this->link($startText, '/');

cake/libs/view/helpers/html.php

@@ -566,7 +566,7 @@ function &document() {
  * @access public
  */
 	function hasChildren() {
-		if (is_array($this->children) && count($this->children) > 0) {
+		if (is_array($this->children) && !empty($this->children)) {
 			return true;
 		}
 		return false;
@@ -593,22 +593,22 @@ function toString($options = array(), $depth = 0) {
 			}
 
 			$d .= '<' . $this->name();
-			if (count($this->namespaces) > 0) {
+			if (!empty($this->namespaces) > 0) {
 				foreach ($this->namespaces as $key => $val) {
 					$val = str_replace('"', '\"', $val);
 					$d .= ' xmlns:' . $key . '="' . $val . '"';
 				}
 			}
 
 			$parent =& $this->parent();
-			if ($parent->name === '#document' && count($parent->namespaces) > 0) {
+			if ($parent->name === '#document' && !empty($parent->namespaces)) {
 				foreach ($parent->namespaces as $key => $val) {
 					$val = str_replace('"', '\"', $val);
 					$d .= ' xmlns:' . $key . '="' . $val . '"';
 				}
 			}
 
-			if (is_array($this->attributes) && count($this->attributes) > 0) {
+			if (is_array($this->attributes) && !empty($this->attributes)) {
 				foreach ($this->attributes as $key => $val) {
 					if (is_bool($val) && $val === false) {
 						$val = 0;