Strict checks where applicable.

cakephp · Oct 8, 2013 · eb852a0 · eb852a0
1 parent 02acf63
commit eb852a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -682,7 +682,7 @@ protected function _recoverByParentId(Model $Model, $counter = 1, $parentId = nu
 		$children = $Model->find('all', $params);
 		$hasChildren = (bool)$children;
 
-		if (!is_null($parentId)) {
+		if ($parentId !== null) {
 			if ($hasChildren) {
 				$Model->updateAll(
 					array($this->settings[$Model->alias]['left'] => $counter),
@@ -713,7 +713,7 @@ protected function _recoverByParentId(Model $Model, $counter = 1, $parentId = nu
 			$children = $Model->find('all', $params);
 		}
 
-		if (!is_null($parentId) && $hasChildren) {
+		if ($parentId !== null && $hasChildren) {
 			$Model->updateAll(
 				array($this->settings[$Model->alias]['right'] => $counter),
 				array($Model->escapeField() => $parentId)

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -1849,7 +1849,7 @@ protected function _saveMulti($joined, $id, $db) {
 				}
 
 				foreach ((array)$data as $row) {
-					if ((is_string($row) && (strlen($row) == 36 || strlen($row) == 16)) || is_numeric($row)) {
+					if ((is_string($row) && (strlen($row) === 36 || strlen($row) === 16)) || is_numeric($row)) {
 						$newJoins[] = $row;
 						$values = array($id, $row);
 						if ($isUUID && $primaryAdded) {

diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -570,7 +570,7 @@ public function header($header = null, $value = null) {
 			if (is_numeric($header)) {
 				list($header, $value) = array($value, null);
 			}
-			if (is_null($value)) {
+			if ($value === null) {
 				list($header, $value) = explode(':', $header, 2);
 			}
 			$this->_headers[$header] = is_array($value) ? array_map('trim', $value) : trim($value);

diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -1038,7 +1038,7 @@ public static function queryString($q, $extra = array(), $escape = false) {
 		}
 		$addition = http_build_query($q, null, $join);
 
-		if ($out && $addition && substr($out, strlen($join) * -1, strlen($join)) != $join) {
+		if ($out && $addition && substr($out, strlen($join) * -1, strlen($join)) !== $join) {
 			$out .= $join;
 		}