Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php

app/View/Pages/home.ctp

@@ -32,7 +32,7 @@ endif;
 ?>
 <p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
 	<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/advanced-installation.html#apache-and-mod-rewrite-and-htaccess" style="color:#fff;">Help me configure it</a>
+	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
 	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
 </p>
 <p>

app/webroot/index.php

@@ -88,11 +88,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include('Cake' . DS . 'bootstrap.php')) {
+	if (!include ('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+	if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }

app/webroot/test.php

@@ -77,11 +77,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include('Cake' . DS . 'bootstrap.php')) {
+	if (!include ('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+	if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }

lib/Cake/Cache/Engine/MemcacheEngine.php

@@ -106,10 +106,10 @@ class MemcacheEngine extends CacheEngine {
  * @return array Array containing host, port
  */
 	protected function _parseServerString($server) {
-		if ($server[0] == 'u') {
+		if ($server[0] === 'u') {
 			return array($server, 0);
 		}
-		if (substr($server, 0, 1) == '[') {
+		if (substr($server, 0, 1) === '[') {
 			$position = strpos($server, ']:');
 			if ($position !== false) {
 				$position++;

lib/Cake/Configure/IniReader.php

@@ -160,7 +160,7 @@ class IniReader implements ConfigReaderInterface {
 		$result = array();
 		foreach ($data as $k => $value) {
 			$isSection = false;
-			if ($k[0] != '[') {
+			if ($k[0] !== '[') {
 				$result[] = "[$k]";
 				$isSection = true;
 			}

lib/Cake/Console/Command/AclShell.php

@@ -122,14 +122,14 @@ class AclShell extends AppShell {
 		$class = ucfirst($this->args[0]);
 		$parent = $this->parseIdentifier($this->args[1]);
 
-		if (!empty($parent) && $parent != '/' && $parent != 'root') {
+		if (!empty($parent) && $parent !== '/' && $parent !== 'root') {
 			$parent = $this->_getNodeId($class, $parent);
 		} else {
 			$parent = null;
 		}
 
 		$data = $this->parseIdentifier($this->args[2]);
-		if (is_string($data) && $data != '/') {
+		if (is_string($data) && $data !== '/') {
 			$data = array('alias' => $data);
 		} elseif (is_string($data)) {
 			$this->error(__d('cake_console', '/ can not be used as an alias!') . __d('cake_console', "	/ is the root, please supply a sub alias"));
@@ -604,7 +604,7 @@ class AclShell extends AppShell {
 		}
 		$vars = array();
 		$class = ucwords($type);
-		$vars['secondary_id'] = (strtolower($class) == 'aro') ? 'foreign_key' : 'object_id';
+		$vars['secondary_id'] = (strtolower($class) === 'aro') ? 'foreign_key' : 'object_id';
 		$vars['data_name'] = $type;
 		$vars['table_name'] = $type . 's';
 		$vars['class'] = $class;

lib/Cake/Console/Command/Task/ControllerTask.php

@@ -66,7 +66,7 @@ class ControllerTask extends BakeTask {
 			if (!isset($this->connection)) {
 				$this->connection = 'default';
 			}
-			if (strtolower($this->args[0]) == 'all') {
+			if (strtolower($this->args[0]) === 'all') {
 				return $this->all();
 			}
 
@@ -162,13 +162,13 @@ class ControllerTask extends BakeTask {
 		}
 		$doItInteractive = $this->in(implode("\n", $question), array('y', 'n'), 'y');
 
-		if (strtolower($doItInteractive) == 'y') {
+		if (strtolower($doItInteractive) === 'y') {
 			$this->interactive = true;
 			$useDynamicScaffold = $this->in(
 				__d('cake_console', "Would you like to use dynamic scaffolding?"), array('y', 'n'), 'n'
 			);
 
-			if (strtolower($useDynamicScaffold) == 'y') {
+			if (strtolower($useDynamicScaffold) === 'y') {
 				$wannaBakeCrud = 'n';
 				$actions = 'scaffold';
 			} else {
@@ -185,12 +185,12 @@ class ControllerTask extends BakeTask {
 			list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
 		}
 
-		if (strtolower($wannaBakeCrud) == 'y') {
+		if (strtolower($wannaBakeCrud) === 'y') {
-			$actions = $this->bakeActions($controllerName, null, strtolower($wannaUseSession) == 'y');
+			$actions = $this->bakeActions($controllerName, null, strtolower($wannaUseSession) === 'y');
 		}
-		if (strtolower($wannaBakeAdminCrud) == 'y') {
+		if (strtolower($wannaBakeAdminCrud) === 'y') {
 			$admin = $this->Project->getPrefix();
-			$actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) == 'y');
+			$actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) === 'y');
 		}
 
 		$baked = false;
@@ -198,7 +198,7 @@ class ControllerTask extends BakeTask {
 			$this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components);
 			$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y');
 
-			if (strtolower($looksGood) == 'y') {
+			if (strtolower($looksGood) === 'y') {
 				$baked = $this->bake($controllerName, $actions, $helpers, $components);
 				if ($baked && $this->_checkUnitTest()) {
 					$this->bakeTest($controllerName);
@@ -229,7 +229,7 @@ class ControllerTask extends BakeTask {
 		$this->hr();
 		$this->out(__d('cake_console', "Controller Name:\n\t%s", $controllerName));
 
-		if (strtolower($useDynamicScaffold) == 'y') {
+		if (strtolower($useDynamicScaffold) === 'y') {
 			$this->out("public \$scaffold;");
 		}
 
@@ -386,7 +386,7 @@ class ControllerTask extends BakeTask {
 	protected function _doPropertyChoices($prompt, $example) {
 		$proceed = $this->in($prompt, array('y','n'), 'n');
 		$property = array();
-		if (strtolower($proceed) == 'y') {
+		if (strtolower($proceed) === 'y') {
 			$propertyList = $this->in($example);
 			$propertyListTrimmed = str_replace(' ', '', $propertyList);
 			$property = explode(',', $propertyListTrimmed);

lib/Cake/Console/Command/Task/DbConfigTask.php

@@ -110,7 +110,7 @@ class DbConfigTask extends AppShell {
 			$datasource = $this->in(__d('cake_console', 'Datasource:'), array('Mysql', 'Postgres', 'Sqlite', 'Sqlserver'), 'Mysql');
 
 			$persistent = $this->in(__d('cake_console', 'Persistent Connection?'), array('y', 'n'), 'n');
-			if (strtolower($persistent) == 'n') {
+			if (strtolower($persistent) === 'n') {
 				$persistent = 'false';
 			} else {
 				$persistent = 'true';
@@ -126,7 +126,7 @@ class DbConfigTask extends AppShell {
 				$port = $this->in(__d('cake_console', 'Port?'), null, 'n');
 			}
 
-			if (strtolower($port) == 'n') {
+			if (strtolower($port) === 'n') {
 				$port = null;
 			}
 
@@ -142,7 +142,7 @@ class DbConfigTask extends AppShell {
 
 				if (!$password) {
 					$blank = $this->in(__d('cake_console', 'The password you supplied was empty. Use an empty password?'), array('y', 'n'), 'n');
-					if ($blank == 'y') {
+					if ($blank === 'y') {
 						$blankPassword = true;
 					}
 				}
@@ -157,7 +157,7 @@ class DbConfigTask extends AppShell {
 			while (!$prefix) {
 				$prefix = $this->in(__d('cake_console', 'Table Prefix?'), null, 'n');
 			}
-			if (strtolower($prefix) == 'n') {
+			if (strtolower($prefix) === 'n') {
 				$prefix = null;
 			}
 
@@ -165,17 +165,17 @@ class DbConfigTask extends AppShell {
 			while (!$encoding) {
 				$encoding = $this->in(__d('cake_console', 'Table encoding?'), null, 'n');
 			}
-			if (strtolower($encoding) == 'n') {
+			if (strtolower($encoding) === 'n') {
 				$encoding = null;
 			}
 
 			$schema = '';
-			if ($datasource == 'postgres') {
+			if ($datasource === 'postgres') {
 				while (!$schema) {
 					$schema = $this->in(__d('cake_console', 'Table schema?'), null, 'n');
 				}
 			}
-			if (strtolower($schema) == 'n') {
+			if (strtolower($schema) === 'n') {
 				$schema = null;
 			}
 
@@ -188,7 +188,7 @@ class DbConfigTask extends AppShell {
 			$dbConfigs[] = $config;
 			$doneYet = $this->in(__d('cake_console', 'Do you wish to add another database configuration?'), null, 'n');
 
-			if (strtolower($doneYet == 'n')) {
+			if (strtolower($doneYet === 'n')) {
 				$done = true;
 			}
 		}
@@ -239,7 +239,7 @@ class DbConfigTask extends AppShell {
 		$this->hr();
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
 
-		if (strtolower($looksGood) == 'y') {
+		if (strtolower($looksGood) === 'y') {
 			return $config;
 		}
 		return false;

lib/Cake/Console/Command/Task/ExtractTask.php

@@ -388,14 +388,14 @@ class ExtractTask extends AppShell {
 			}
 
 			list($type, $string, $line) = $countToken;
-			if (($type == T_STRING) && ($string == $functionName) && ($firstParenthesis == '(')) {
+			if (($type == T_STRING) && ($string == $functionName) && ($firstParenthesis === '(')) {
 				$position = $count;
 				$depth = 0;
 
 				while (!$depth) {
-					if ($this->_tokens[$position] == '(') {
+					if ($this->_tokens[$position] === '(') {
 						$depth++;
-					} elseif ($this->_tokens[$position] == ')') {
+					} elseif ($this->_tokens[$position] === ')') {
 						$depth--;
 					}
 					$position++;
@@ -537,7 +537,7 @@ class ExtractTask extends AppShell {
 				}
 
 				$this->_store($domain, $header, $sentence);
-				if ($domain != 'default' && $this->_merge) {
+				if ($domain !== 'default' && $this->_merge) {
 					$this->_store('default', $header, $sentence);
 				}
 			}
@@ -640,11 +640,11 @@ class ExtractTask extends AppShell {
 	protected function _getStrings(&$position, $target) {
 		$strings = array();
 		$count = count($strings);
-		while ($count < $target && ($this->_tokens[$position] == ',' || $this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING)) {
+		while ($count < $target && ($this->_tokens[$position] === ',' || $this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING)) {
 			$count = count($strings);
-			if ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING && $this->_tokens[$position + 1] == '.') {
+			if ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING && $this->_tokens[$position + 1] === '.') {
 				$string = '';
-				while ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING || $this->_tokens[$position] == '.') {
+				while ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING || $this->_tokens[$position] === '.') {
 					if ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING) {
 						$string .= $this->_formatString($this->_tokens[$position][1]);
 					}
@@ -668,7 +668,7 @@ class ExtractTask extends AppShell {
 	protected function _formatString($string) {
 		$quote = substr($string, 0, 1);
 		$string = substr($string, 1, -1);
-		if ($quote == '"') {
+		if ($quote === '"') {
 			$string = stripcslashes($string);
 		} else {
 			$string = strtr($string, array("\\'" => "'", "\\\\" => "\\"));
@@ -697,11 +697,11 @@ class ExtractTask extends AppShell {
 				$this->out($this->_tokens[$count][1], false);
 			} else {
 				$this->out($this->_tokens[$count], false);
-				if ($this->_tokens[$count] == '(') {
+				if ($this->_tokens[$count] === '(') {
 					$parenthesis++;
 				}
 
-				if ($this->_tokens[$count] == ')') {
+				if ($this->_tokens[$count] === ')') {
 					$parenthesis--;
 				}
 			}

lib/Cake/Console/Command/Task/FixtureTask.php

@@ -107,7 +107,7 @@ class FixtureTask extends BakeTask {
 			if (!isset($this->connection)) {
 				$this->connection = 'default';
 			}
-			if (strtolower($this->args[0]) == 'all') {
+			if (strtolower($this->args[0]) === 'all') {
 				return $this->all();
 			}
 			$model = $this->_modelName($this->args[0]);
@@ -159,17 +159,17 @@ class FixtureTask extends BakeTask {
 	public function importOptions($modelName) {
 		$options = array();
 		$doSchema = $this->in(__d('cake_console', 'Would you like to import schema for this fixture?'), array('y', 'n'), 'n');
-		if ($doSchema == 'y') {
+		if ($doSchema === 'y') {
 			$options['schema'] = $modelName;
 		}
 		$doRecords = $this->in(__d('cake_console', 'Would you like to use record importing for this fixture?'), array('y', 'n'), 'n');
-		if ($doRecords == 'y') {
+		if ($doRecords === 'y') {
 			$options['records'] = true;
 		}
-		if ($doRecords == 'n') {
+		if ($doRecords === 'n') {
 			$prompt = __d('cake_console', "Would you like to build this fixture with data from %s's table?", $modelName);
 			$fromTable = $this->in($prompt, array('y', 'n'), 'n');
-			if (strtolower($fromTable) == 'y') {
+			if (strtolower($fromTable) === 'y') {
 				$options['fromTable'] = true;
 			}
 		}
@@ -203,7 +203,7 @@ class FixtureTask extends BakeTask {
 			if (isset($importOptions['records'])) {
 				$importBits[] = "'records' => true";
 			}
-			if ($this->connection != 'default') {
+			if ($this->connection !== 'default') {
 				$importBits[] .= "'connection' => '{$this->connection}'";
 			}
 			if (!empty($importBits)) {
@@ -307,7 +307,7 @@ class FixtureTask extends BakeTask {
 					case 'string':
 					case 'binary':
 						$isPrimaryUuid = (
-							isset($fieldInfo['key']) && strtolower($fieldInfo['key']) == 'primary' &&
+							isset($fieldInfo['key']) && strtolower($fieldInfo['key']) === 'primary' &&
 							isset($fieldInfo['length']) && $fieldInfo['length'] == 36
 						);
 						if ($isPrimaryUuid) {

lib/Cake/Console/Command/Task/ModelTask.php

@@ -98,7 +98,7 @@ class ModelTask extends BakeTask {
 			if (!isset($this->connection)) {
 				$this->connection = 'default';
 			}
-			if (strtolower($this->args[0]) == 'all') {
+			if (strtolower($this->args[0]) === 'all') {
 				return $this->all();
 			}
 			$model = $this->_modelName($this->args[0]);
@@ -150,7 +150,7 @@ class ModelTask extends BakeTask {
 		$object = new Model(array('name' => $className, 'table' => $table, 'ds' => $this->connection));
 		$fields = $object->schema(true);
 		foreach ($fields as $name => $field) {
-			if (isset($field['key']) && $field['key'] == 'primary') {
+			if (isset($field['key']) && $field['key'] === 'primary') {
 				$object->primaryKey = $name;
 				break;
 			}
@@ -209,7 +209,7 @@ class ModelTask extends BakeTask {
 		if (!in_array($useTable, $this->_tables)) {
 			$prompt = __d('cake_console', "The table %s doesn't exist or could not be automatically detected\ncontinue anyway?", $useTable);
 			$continue = $this->in($prompt, array('y', 'n'));
-			if (strtolower($continue) == 'n') {
+			if (strtolower($continue) === 'n') {
 				return false;
 			}
 		}
@@ -235,13 +235,13 @@ class ModelTask extends BakeTask {
 
 			$prompt = __d('cake_console', "Would you like to supply validation criteria \nfor the fields in your model?");
 			$wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
-			if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) == 'y') {
+			if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) === 'y') {
 				$validate = $this->doValidation($tempModel);
 			}
 
 			$prompt = __d('cake_console', "Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?");
 			$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
-			if (strtolower($wannaDoAssoc) == 'y') {
+			if (strtolower($wannaDoAssoc) === 'y') {
 				$associations = $this->doAssociations($tempModel);
 			}
 		}
@@ -258,7 +258,7 @@ class ModelTask extends BakeTask {
 		if ($fullTableName !== Inflector::tableize($currentModelName)) {
 			$this->out(__d('cake_console', 'DB Table:   %s', $fullTableName));
 		}
-		if ($primaryKey != 'id') {
+		if ($primaryKey !== 'id') {
 			$this->out(__d('cake_console', 'Primary Key: %s', $primaryKey));
 		}
 		if (!empty($validate)) {
@@ -275,7 +275,7 @@ class ModelTask extends BakeTask {
 		$this->hr();
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
 
-		if (strtolower($looksGood) == 'y') {
+		if (strtolower($looksGood) === 'y') {
 			$vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField');
 			$vars['useDbConfig'] = $this->connection;
 			if ($this->bake($currentModelName, $vars)) {
@@ -315,7 +315,7 @@ class ModelTask extends BakeTask {
 	public function findPrimaryKey($fields) {
 		$name = 'id';
 		foreach ($fields as $name => $field) {
-			if (isset($field['key']) && $field['key'] == 'primary') {
+			if (isset($field['key']) && $field['key'] === 'primary') {
 				break;
 			}
 		}
@@ -332,7 +332,7 @@ class ModelTask extends BakeTask {
 		$fieldNames = array_keys($fields);
 		$prompt = __d('cake_console', "A displayField could not be automatically detected\nwould you like to choose one?");
 		$continue = $this->in($prompt, array('y', 'n'));
-		if (strtolower($continue) == 'n') {
+		if (strtolower($continue) === 'n') {
 			return false;
 		}
 		$prompt = __d('cake_console', 'Choose a field from the options above:');
@@ -379,7 +379,7 @@ class ModelTask extends BakeTask {
 		sort($options);
 		$default = 1;
 		foreach ($options as $option) {
-			if ($option{0} != '_') {
+			if ($option{0} !== '_') {
 				$choices[$default] = strtolower($option);
 				$default++;
 			}
@@ -402,7 +402,7 @@ class ModelTask extends BakeTask {
 		$validate = $alreadyChosen = array();
 
 		$anotherValidator = 'y';
-		while ($anotherValidator == 'y') {
+		while ($anotherValidator === 'y') {
 			if ($this->interactive) {
 				$this->out();
 				$this->out(__d('cake_console', 'Field: <info>%s</info>', $fieldName));
@@ -428,25 +428,25 @@ class ModelTask extends BakeTask {
 			$methods = array_flip($this->_validations);
 			$guess = $defaultChoice;
 			if ($metaData['null'] != 1 && !in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
-				if ($fieldName == 'email') {
+				if ($fieldName === 'email') {
 					$guess = $methods['email'];
-				} elseif ($metaData['type'] == 'string' && $metaData['length'] == 36) {
+				} elseif ($metaData['type'] === 'string' && $metaData['length'] == 36) {
 					$guess = $methods['uuid'];
-				} elseif ($metaData['type'] == 'string') {
+				} elseif ($metaData['type'] === 'string') {
 					$guess = $methods['notempty'];
-				} elseif ($metaData['type'] == 'text') {
+				} elseif ($metaData['type'] === 'text') {
 					$guess = $methods['notempty'];
-				} elseif ($metaData['type'] == 'integer') {
+				} elseif ($metaData['type'] === 'integer') {
 					$guess = $methods['numeric'];
-				} elseif ($metaData['type'] == 'boolean') {
+				} elseif ($metaData['type'] === 'boolean') {
 					$guess = $methods['boolean'];
-				} elseif ($metaData['type'] == 'date') {
+				} elseif ($metaData['type'] === 'date') {
 					$guess = $methods['date'];
-				} elseif ($metaData['type'] == 'time') {
+				} elseif ($metaData['type'] === 'time') {
 					$guess = $methods['time'];
-				} elseif ($metaData['type'] == 'datetime') {
+				} elseif ($metaData['type'] === 'datetime') {
 					$guess = $methods['datetime'];
-				} elseif ($metaData['type'] == 'inet') {
+				} elseif ($metaData['type'] === 'inet') {
 					$guess = $methods['ip'];
 				}
 			}
@@ -549,14 +549,14 @@ class ModelTask extends BakeTask {
 		$fieldNames = array_keys($model->schema(true));
 		foreach ($fieldNames as $fieldName) {
 			$offset = strpos($fieldName, '_id');
-			if ($fieldName != $model->primaryKey && $fieldName != 'parent_id' && $offset !== false) {
+			if ($fieldName != $model->primaryKey && $fieldName !== 'parent_id' && $offset !== false) {
 				$tmpModelName = $this->_modelNameFromKey($fieldName);
 				$associations['belongsTo'][] = array(
 					'alias' => $tmpModelName,
 					'className' => $tmpModelName,
 					'foreignKey' => $fieldName,
 				);
-			} elseif ($fieldName == 'parent_id') {
+			} elseif ($fieldName === 'parent_id') {
 				$associations['belongsTo'][] = array(
 					'alias' => 'Parent' . $model->name,
 					'className' => $model->name,
@@ -593,7 +593,7 @@ class ModelTask extends BakeTask {
 						'className' => $tempOtherModel->name,
 						'foreignKey' => $fieldName
 					);
-				} elseif ($otherTable == $model->table && $fieldName == 'parent_id') {
+				} elseif ($otherTable == $model->table && $fieldName === 'parent_id') {
 					$assoc = array(
 						'alias' => 'Child' . $model->name,
 						'className' => $model->name,
@@ -659,7 +659,7 @@ class ModelTask extends BakeTask {
 
 					if ('n' == strtolower($response)) {
 						unset($associations[$type][$i]);
-					} elseif ($type == 'hasMany') {
+					} elseif ($type === 'hasMany') {
 						unset($associations['hasOne'][$i]);
 					}
 				}
@@ -755,7 +755,7 @@ class ModelTask extends BakeTask {
 			$tempOtherModel = new Model(array('table' => $otherTable, 'ds' => $this->connection));
 			$modelFieldsTemp = $tempOtherModel->schema(true);
 			foreach ($modelFieldsTemp as $fieldName => $field) {
-				if ($field['type'] == 'integer' || $field['type'] == 'string') {
+				if ($field['type'] === 'integer' || $field['type'] === 'string') {
 					$possible[$otherTable][] = $fieldName;
 				}
 			}
@@ -877,7 +877,7 @@ class ModelTask extends BakeTask {
 				$this->out(__d('cake_console', "Given your model named '%s',\nCake would expect a database table named '%s'", $modelName, $fullTableName));
 				$tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y', 'n'), 'y');
 			}
-			if (strtolower($tableIsGood) == 'n') {
+			if (strtolower($tableIsGood) === 'n') {
 				$useTable = $this->in(__d('cake_console', 'What is the name of the table?'));
 			}
 		}

lib/Cake/Console/Command/Task/PluginTask.php

@@ -107,7 +107,7 @@ class PluginTask extends AppShell {
 
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y');
 
-		if (strtolower($looksGood) == 'y') {
+		if (strtolower($looksGood) === 'y') {
 			$Folder = new Folder($this->path . $plugin);
 			$directories = array(
 				'Config' . DS . 'Schema',

lib/Cake/Console/Command/Task/TestTask.php

@@ -198,7 +198,7 @@ class TestTask extends BakeTask {
 		}
 		$keys[] = 'q';
 		$selection = $this->in(__d('cake_console', 'Enter the type of object to bake a test for or (q)uit'), $keys, 'q');
-		if ($selection == 'q') {
+		if ($selection === 'q') {
 			return $this->_stop();
 		}
 		$types = array_keys($this->classTypes);
@@ -281,7 +281,7 @@ class TestTask extends BakeTask {
 		ClassRegistry::flush();
 		App::import($type, $class);
 		$class = $this->getRealClassName($type, $class);
-		if (strtolower($type) == 'model') {
+		if (strtolower($type) === 'model') {
 			$instance = ClassRegistry::init($class);
 		} else {
 			$instance = new $class();
@@ -298,7 +298,7 @@ class TestTask extends BakeTask {
  * @return string Real classname
  */
 	public function getRealClassName($type, $class) {
-		if (strtolower($type) == 'model' || empty($this->classTypes[$type])) {
+		if (strtolower($type) === 'model' || empty($this->classTypes[$type])) {
 			return $class;
 		}
 
@@ -358,7 +358,7 @@ class TestTask extends BakeTask {
 		$thisMethods = array_diff($classMethods, $parentMethods);
 		$out = array();
 		foreach ($thisMethods as $method) {
-			if (substr($method, 0, 1) != '_' && $method != strtolower($className)) {
+			if (substr($method, 0, 1) !== '_' && $method != strtolower($className)) {
 				$out[] = $method;
 			}
 		}
@@ -397,7 +397,7 @@ class TestTask extends BakeTask {
 			if (!isset($this->_fixtures[$className])) {
 				$this->_processModel($subject->{$alias});
 			}
-			if ($type == 'hasAndBelongsToMany') {
+			if ($type === 'hasAndBelongsToMany') {
 				if (!empty($subject->hasAndBelongsToMany[$alias]['with'])) {
 					list(, $joinModel) = pluginSplit($subject->hasAndBelongsToMany[$alias]['with']);
 				} else {
@@ -454,7 +454,7 @@ class TestTask extends BakeTask {
 	public function getUserFixtures() {
 		$proceed = $this->in(__d('cake_console', 'Bake could not detect fixtures, would you like to add some?'), array('y', 'n'), 'n');
 		$fixtures = array();
-		if (strtolower($proceed) == 'y') {
+		if (strtolower($proceed) === 'y') {
 			$fixtureList = $this->in(__d('cake_console', "Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'"));
 			$fixtureListTrimmed = str_replace(' ', '', $fixtureList);
 			$fixtures = explode(',', $fixtureListTrimmed);
@@ -472,7 +472,7 @@ class TestTask extends BakeTask {
  */
 	public function hasMockClass($type) {
 		$type = strtolower($type);
-		return $type == 'controller';
+		return $type === 'controller';
 	}
 
 /**
@@ -486,17 +486,17 @@ class TestTask extends BakeTask {
 	public function generateConstructor($type, $fullClassName, $plugin) {
 		$type = strtolower($type);
 		$pre = $construct = $post = '';
-		if ($type == 'model') {
+		if ($type === 'model') {
 			$construct = "ClassRegistry::init('{$plugin}$fullClassName');\n";
 		}
-		if ($type == 'behavior') {
+		if ($type === 'behavior') {
 			$construct = "new $fullClassName();\n";
 		}
-		if ($type == 'helper') {
+		if ($type === 'helper') {
 			$pre = "\$View = new View();\n";
 			$construct = "new {$fullClassName}(\$View);\n";
 		}
-		if ($type == 'component') {
+		if ($type === 'component') {
 			$pre = "\$Collection = new ComponentCollection();\n";
 			$construct = "new {$fullClassName}(\$Collection);\n";
 		}
@@ -514,11 +514,11 @@ class TestTask extends BakeTask {
 	public function generateUses($type, $realType, $className) {
 		$uses = array();
 		$type = strtolower($type);
-		if ($type == 'component') {
+		if ($type === 'component') {
 			$uses[] = array('ComponentCollection', 'Controller');
 			$uses[] = array('Component', 'Controller');
 		}
-		if ($type == 'helper') {
+		if ($type === 'helper') {
 			$uses[] = array('View', 'View');
 			$uses[] = array('Helper', 'View');
 		}

lib/Cake/Console/Command/Task/ViewTask.php

@@ -100,7 +100,7 @@ class ViewTask extends BakeTask {
 		$this->controllerName = $this->_controllerName($this->args[0]);
 
 		$this->Project->interactive = false;
-		if (strtolower($this->args[0]) == 'all') {
+		if (strtolower($this->args[0]) === 'all') {
 			return $this->all();
 		}
 
@@ -211,7 +211,7 @@ class ViewTask extends BakeTask {
 		$prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", $this->controllerName);
 		$interactive = $this->in($prompt, array('y', 'n'), 'n');
 
-		if (strtolower($interactive) == 'n') {
+		if (strtolower($interactive) === 'n') {
 			$this->interactive = false;
 		}
 
@@ -220,13 +220,13 @@ class ViewTask extends BakeTask {
 
 		$wannaDoAdmin = $this->in(__d('cake_console', "Would you like to create the views for admin routing?"), array('y', 'n'), 'n');
 
-		if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') {
+		if (strtolower($wannaDoScaffold) === 'y' || strtolower($wannaDoAdmin) === 'y') {
 			$vars = $this->_loadController();
-			if (strtolower($wannaDoScaffold) == 'y') {
+			if (strtolower($wannaDoScaffold) === 'y') {
 				$actions = $this->scaffoldActions;
 				$this->bakeActions($actions, $vars);
 			}
-			if (strtolower($wannaDoAdmin) == 'y') {
+			if (strtolower($wannaDoAdmin) === 'y') {
 				$admin = $this->Project->getPrefix();
 				$regularActions = $this->scaffoldActions;
 				$adminActions = array();
@@ -332,7 +332,7 @@ class ViewTask extends BakeTask {
 		$this->out(__d('cake_console', 'Path:            %s', $this->getPath() . $this->controllerName . DS . Inflector::underscore($action) . ".ctp"));
 		$this->hr();
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
-		if (strtolower($looksGood) == 'y') {
+		if (strtolower($looksGood) === 'y') {
 			$this->bake($action, ' ');
 			$this->_stop();
 		} else {

lib/Cake/Console/Command/TestShell.php

@@ -326,7 +326,7 @@ class TestShell extends Shell {
 				break;
 			}
 
-			if ($choice == 'q') {
+			if ($choice === 'q') {
 				break;
 			}
 		}

lib/Cake/Console/Command/TestsuiteShell.php

@@ -67,11 +67,11 @@ class TestsuiteShell extends TestShell {
 
 		$category = $this->args[0];
 
-		if ($category == 'core') {
+		if ($category === 'core') {
 			$params['core'] = true;
-		} elseif ($category == 'app') {
+		} elseif ($category === 'app') {
 			$params['app'] = true;
-		} elseif ($category != 'core') {
+		} elseif ($category !== 'core') {
 			$params['plugin'] = $category;
 		}
 

lib/Cake/Console/ConsoleOptionParser.php

@@ -470,9 +470,9 @@ class ConsoleOptionParser {
 		$params = $args = array();
 		$this->_tokens = $argv;
 		while (($token = array_shift($this->_tokens)) !== null) {
-			if (substr($token, 0, 2) == '--') {
+			if (substr($token, 0, 2) === '--') {
 				$params = $this->_parseLongOption($token, $params);
-			} elseif (substr($token, 0, 1) == '-') {
+			} elseif (substr($token, 0, 1) === '-') {
 				$params = $this->_parseShortOption($token, $params);
 			} else {
 				$args = $this->_parseArg($token, $args);
@@ -521,9 +521,9 @@ class ConsoleOptionParser {
 			return $subparser->help(null, $format, $width);
 		}
 		$formatter = new HelpFormatter($this);
-		if ($format == 'text' || $format === true) {
+		if ($format === 'text' || $format === true) {
 			return $formatter->text($width);
-		} elseif ($format == 'xml') {
+		} elseif ($format === 'xml') {
 			return $formatter->xml();
 		}
 	}

lib/Cake/Console/ConsoleOutput.php

@@ -153,7 +153,7 @@ class ConsoleOutput {
 	public function __construct($stream = 'php://stdout') {
 		$this->_output = fopen($stream, 'w');
 
-		if (DS == '\\' && !(bool)env('ANSICON')) {
+		if (DS === '\\' && !(bool)env('ANSICON')) {
 			$this->_outputAs = self::PLAIN;
 		}
 	}

lib/Cake/Console/Shell.php

@@ -290,7 +290,7 @@ class Shell extends Object {
 			if (!$method->isPublic() || substr($name, 0, 1) === '_') {
 				return false;
 			}
-			if ($method->getDeclaringClass()->name == 'Shell') {
+			if ($method->getDeclaringClass()->name === 'Shell') {
 				return false;
 			}
 			return true;
@@ -403,7 +403,7 @@ class Shell extends Object {
  */
 	protected function _displayHelp($command) {
 		$format = 'text';
-		if (!empty($this->args[0]) && $this->args[0] == 'xml') {
+		if (!empty($this->args[0]) && $this->args[0] === 'xml') {
 			$format = 'xml';
 			$this->stdout->outputAs(ConsoleOutput::RAW);
 		} else {
@@ -654,10 +654,10 @@ class Shell extends Object {
 			$this->out(__d('cake_console', '<warning>File `%s` exists</warning>', $path));
 			$key = $this->in(__d('cake_console', 'Do you want to overwrite?'), array('y', 'n', 'q'), 'n');
 
-			if (strtolower($key) == 'q') {
+			if (strtolower($key) === 'q') {
 				$this->out(__d('cake_console', '<error>Quitting</error>.'), 2);
 				$this->_stop();
-			} elseif (strtolower($key) != 'y') {
+			} elseif (strtolower($key) !== 'y') {
 				$this->out(__d('cake_console', 'Skip `%s`', $path), 2);
 				return false;
 			}
@@ -695,7 +695,7 @@ class Shell extends Object {
 
 		$prompt = __d('cake_console', 'PHPUnit is not installed. Do you want to bake unit test files anyway?');
 		$unitTest = $this->in($prompt, array('y', 'n'), 'y');
-		$result = strtolower($unitTest) == 'y' || strtolower($unitTest) == 'yes';
+		$result = strtolower($unitTest) === 'y' || strtolower($unitTest) === 'yes';
 
 		if ($result) {
 			$this->out();

lib/Cake/Console/ShellDispatcher.php

@@ -201,7 +201,7 @@ class ShellDispatcher {
 		}
 		$methods = array_diff(get_class_methods($Shell), get_class_methods('Shell'));
 		$added = in_array($command, $methods);
-		$private = $command[0] == '_' && method_exists($Shell, $command);
+		$private = $command[0] === '_' && method_exists($Shell, $command);
 
 		if (!$private) {
 			if ($added) {
@@ -288,7 +288,7 @@ class ShellDispatcher {
 			}
 		}
 
-		if ($params['app'][0] == '/' || preg_match('/([a-z])(:)/i', $params['app'], $matches)) {
+		if ($params['app'][0] === '/' || preg_match('/([a-z])(:)/i', $params['app'], $matches)) {
 			$params['root'] = dirname($params['app']);
 		} elseif (strpos($params['app'], '/')) {
 			$params['root'] .= '/' . dirname($params['app']);

lib/Cake/Console/Templates/default/classes/model.ctp

@@ -38,7 +38,7 @@ foreach (array('hasOne', 'belongsTo', 'hasMany', 'hasAndBelongsToMany') as $asso
  */
 class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel {
 
-<?php if ($useDbConfig != 'default'): ?>
+<?php if ($useDbConfig !== 'default'): ?>
 /**
  * Use database config
  *

lib/Cake/Console/Templates/skel/Console/cake.php

@@ -29,7 +29,7 @@ if (function_exists('ini_set')) {
 	ini_set('include_path', $root . PATH_SEPARATOR . __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path'));
 }
 
-if (!include($dispatcher)) {
+if (!include ($dispatcher)) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
 unset($paths, $path, $dispatcher, $root, $ds);

lib/Cake/Console/Templates/skel/View/Pages/home.ctp

@@ -32,7 +32,7 @@ endif;
 ?>
 <p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
 	<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/advanced-installation.html#apache-and-mod-rewrite-and-htaccess" style="color:#fff;">Help me configure it</a>
+	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
 	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
 </p>
 <p>

lib/Cake/Console/Templates/skel/webroot/index.php

@@ -77,7 +77,7 @@ if (!defined('WWW_ROOT')) {
 }
 
 // for built-in server
-if (php_sapi_name() == 'cli-server') {
+if (php_sapi_name() === 'cli-server') {
 	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) {
 		return false;
 	}
@@ -88,11 +88,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include('Cake' . DS . 'bootstrap.php')) {
+	if (!include ('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+	if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }

lib/Cake/Console/Templates/skel/webroot/test.php

@@ -77,11 +77,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include('Cake' . DS . 'bootstrap.php')) {
+	if (!include ('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+	if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }

lib/Cake/Controller/Component/Auth/BaseAuthenticate.php

@@ -151,7 +151,7 @@ abstract class BaseAuthenticate {
  * @param CakeRequest $request Request object.
  * @return mixed Either false or an array of user information
  */
-	public function getUser($request) {
+	public function getUser(CakeRequest $request) {
 		return false;
 	}
 

lib/Cake/Controller/Component/Auth/BaseAuthorize.php

@@ -109,7 +109,7 @@ abstract class BaseAuthorize {
  * @param string $path
  * @return string the action path for the given request.
  */
-	public function action($request, $path = '/:plugin/:controller/:action') {
+	public function action(CakeRequest $request, $path = '/:plugin/:controller/:action') {
 		$plugin = empty($request['plugin']) ? null : Inflector::camelize($request['plugin']) . '/';
 		$path = str_replace(
 			array(':controller', ':action', ':plugin/'),

lib/Cake/Controller/Component/Auth/BasicAuthenticate.php

@@ -107,7 +107,7 @@ class BasicAuthenticate extends BaseAuthenticate {
  * @param CakeRequest $request Request object.
  * @return mixed Either false or an array of user information
  */
-	public function getUser($request) {
+	public function getUser(CakeRequest $request) {
 		$username = env('PHP_AUTH_USER');
 		$pass = env('PHP_AUTH_PW');
 

lib/Cake/Controller/Component/Auth/ControllerAuthorize.php

@@ -23,7 +23,7 @@ App::uses('BaseAuthorize', 'Controller/Component/Auth');
  * {{{
  *	public function isAuthorized($user) {
  *		if (!empty($this->request->params['admin'])) {
- *			return $user['role'] == 'admin';
+ *			return $user['role'] === 'admin';
  *		}
  *		return !empty($user);
  *	}

lib/Cake/Controller/Component/Auth/DigestAuthenticate.php

@@ -134,7 +134,7 @@ class DigestAuthenticate extends BaseAuthenticate {
  * @param CakeRequest $request Request object.
  * @return mixed Either false or an array of user information
  */
-	public function getUser($request) {
+	public function getUser(CakeRequest $request) {
 		$digest = $this->_getDigest();
 		if (empty($digest)) {
 			return false;
@@ -188,7 +188,7 @@ class DigestAuthenticate extends BaseAuthenticate {
 		$digest = env('PHP_AUTH_DIGEST');
 		if (empty($digest) && function_exists('apache_request_headers')) {
 			$headers = apache_request_headers();
-			if (!empty($headers['Authorization']) && substr($headers['Authorization'], 0, 7) == 'Digest ') {
+			if (!empty($headers['Authorization']) && substr($headers['Authorization'], 0, 7) === 'Digest ') {
 				$digest = substr($headers['Authorization'], 7);
 			}
 		}
@@ -205,7 +205,7 @@ class DigestAuthenticate extends BaseAuthenticate {
  * @return array An array of digest authentication headers
  */
 	public function parseAuthData($digest) {
-		if (substr($digest, 0, 7) == 'Digest ') {
+		if (substr($digest, 0, 7) === 'Digest ') {
 			$digest = substr($digest, 7);
 		}
 		$keys = $match = array();

lib/Cake/Controller/Component/AuthComponent.php

@@ -419,7 +419,7 @@ class AuthComponent extends Component {
  * @param CakeRequest $request The request to authenticate for. If empty, the current request will be used.
  * @return boolean True if $user is authorized, otherwise false
  */
-	public function isAuthorized($user = null, $request = null) {
+	public function isAuthorized($user = null, CakeRequest $request = null) {
 		if (empty($user) && !$this->user()) {
 			return false;
 		}
@@ -771,7 +771,7 @@ class AuthComponent extends Component {
  * @return boolean true if the user is logged in, false otherwise
  */
 	public function loggedIn() {
-		return $this->user() != array();
+		return (boolean)$this->user();
 	}
 
 /**

lib/Cake/Controller/Component/RequestHandlerComponent.php

@@ -130,7 +130,7 @@ class RequestHandlerComponent extends Component {
 		if (isset($this->request->params['ext'])) {
 			$this->ext = $this->request->params['ext'];
 		}
-		if (empty($this->ext) || $this->ext == 'html') {
+		if (empty($this->ext) || $this->ext === 'html') {
 			$this->_setExtension();
 		}
 		$this->params = $controller->params;
@@ -590,7 +590,7 @@ class RequestHandlerComponent extends Component {
 		}
 		$options = array_merge($defaults, $options);
 
-		if ($type == 'ajax') {
+		if ($type === 'ajax') {
 			$controller->layout = $this->ajaxLayout;
 			return $this->respondAs('html', $options);
 		}

lib/Cake/Controller/Component/SecurityComponent.php

@@ -49,6 +49,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a POST request is required
  *
  * @var array
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @see SecurityComponent::requirePost()
  */
 	public $requirePost = array();
@@ -57,6 +58,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a GET request is required
  *
  * @var array
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @see SecurityComponent::requireGet()
  */
 	public $requireGet = array();
@@ -65,6 +67,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a PUT request is required
  *
  * @var array
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @see SecurityComponent::requirePut()
  */
 	public $requirePut = array();
@@ -73,6 +76,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a DELETE request is required
  *
  * @var array
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @see SecurityComponent::requireDelete()
  */
 	public $requireDelete = array();
@@ -131,7 +135,9 @@ class SecurityComponent extends Component {
 	public $unlockedFields = array();
 
 /**
- * Actions to exclude from any security checks
+ * Actions to exclude from CSRF and POST validation checks.
+ * Other checks like requireAuth(), requireSecure(),
+ * requirePost(), requireGet() etc. will still be applied.
  *
  * @var array
  */
@@ -248,6 +254,7 @@ class SecurityComponent extends Component {
  * Sets the actions that require a POST request, or empty for all actions
  *
  * @return void
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost
  */
 	public function requirePost() {
@@ -258,6 +265,7 @@ class SecurityComponent extends Component {
 /**
  * Sets the actions that require a GET request, or empty for all actions
  *
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @return void
  */
 	public function requireGet() {
@@ -268,6 +276,7 @@ class SecurityComponent extends Component {
 /**
  * Sets the actions that require a PUT request, or empty for all actions
  *
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @return void
  */
 	public function requirePut() {
@@ -278,6 +287,7 @@ class SecurityComponent extends Component {
 /**
  * Sets the actions that require a DELETE request, or empty for all actions
  *
+ * @deprecated Use CakeRequest::onlyAllow() instead.
  * @return void
  */
 	public function requireDelete() {
@@ -297,7 +307,11 @@ class SecurityComponent extends Component {
 	}
 
 /**
- * Sets the actions that require an authenticated request, or empty for all actions
+ * Sets the actions that require whitelisted form submissions.
+ *
+ * Adding actions with this method will enforce the restrictions
+ * set in SecurityComponent::$allowedControllers and
+ * SecurityComponent::$allowedActions.
  *
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireAuth

lib/Cake/Controller/Controller.php

@@ -963,7 +963,7 @@ class Controller extends Object implements CakeEventListener {
 		}
 
 		$referer = $this->request->referer($local);
-		if ($referer == '/' && $default) {
+		if ($referer === '/' && $default) {
 			return Router::url($default, true);
 		}
 		return $referer;
@@ -1048,13 +1048,13 @@ class Controller extends Object implements CakeEventListener {
 				if ($fieldOp === 'LIKE') {
 					$key = $key . ' LIKE';
 					$value = '%' . $value . '%';
-				} elseif ($fieldOp && $fieldOp != '=') {
+				} elseif ($fieldOp && $fieldOp !== '=') {
 					$key = $key . ' ' . $fieldOp;
 				}
 				$cond[$key] = $value;
 			}
 		}
-		if ($bool && strtoupper($bool) != 'AND') {
+		if ($bool && strtoupper($bool) !== 'AND') {
 			$cond = array($bool => $cond);
 		}
 		return $cond;

lib/Cake/Controller/Scaffold.php

@@ -227,7 +227,7 @@ class Scaffold {
 		}
 
 		if ($this->controller->beforeScaffold($action)) {
-			if ($action == 'edit') {
+			if ($action === 'edit') {
 				if (isset($request->params['pass'][0])) {
 					$this->ScaffoldModel->id = $request['pass'][0];
 				}
@@ -237,7 +237,7 @@ class Scaffold {
 			}
 
 			if (!empty($request->data)) {
-				if ($action == 'create') {
+				if ($action === 'create') {
 					$this->ScaffoldModel->create();
 				}
 
@@ -443,7 +443,7 @@ class Scaffold {
 				$associations[$type][$assocKey]['controller'] =
 					Inflector::pluralize(Inflector::underscore($model));
 
-				if ($type == 'hasAndBelongsToMany') {
+				if ($type === 'hasAndBelongsToMany') {
 					$associations[$type][$assocKey]['with'] = $assocData['with'];
 				}
 			}

lib/Cake/Core/App.php

@@ -433,7 +433,7 @@ class App {
 			$type = 'plugins';
 		}
 
-		if ($type == 'plugins') {
+		if ($type === 'plugins') {
 			$extension = '/.*/';
 			$includeDirectories = true;
 		}
@@ -637,11 +637,11 @@ class App {
 			return self::_loadClass($name, $plugin, $type, $originalType, $parent);
 		}
 
-		if ($originalType == 'file' && !empty($file)) {
+		if ($originalType === 'file' && !empty($file)) {
 			return self::_loadFile($name, $plugin, $search, $file, $return);
 		}
 
-		if ($originalType == 'vendor') {
+		if ($originalType === 'vendor') {
 			return self::_loadVendor($name, $plugin, $file, $ext);
 		}
 
@@ -660,7 +660,7 @@ class App {
  * @return boolean true indicating the successful load and existence of the class
  */
 	protected static function _loadClass($name, $plugin, $type, $originalType, $parent) {
-		if ($type == 'Console/Command' && $name == 'Shell') {
+		if ($type === 'Console/Command' && $name === 'Shell') {
 			$type = 'Console';
 		} elseif (isset(self::$types[$originalType]['suffix'])) {
 			$suffix = self::$types[$originalType]['suffix'];

lib/Cake/Error/ErrorHandler.php

@@ -149,7 +149,7 @@ class ErrorHandler {
 				$message .= "\nException Attributes: " . var_export($exception->getAttributes(), true);
 			}
 		}
-		if (php_sapi_name() != 'cli') {
+		if (php_sapi_name() !== 'cli') {
 			$request = Router::getRequest();
 			if ($request) {
 				$message .= "\nRequest URL: " . $request->here();

lib/Cake/Error/ExceptionRenderer.php

@@ -104,7 +104,7 @@ class ExceptionRenderer {
 
 		if ($exception instanceof CakeException && !$methodExists) {
 			$method = '_cakeError';
-			if (empty($template) || $template == 'internalError') {
+			if (empty($template) || $template === 'internalError') {
 				$template = 'error500';
 			}
 		} elseif ($exception instanceof PDOException) {
@@ -119,7 +119,7 @@ class ExceptionRenderer {
 		}
 
 		$isNotDebug = !Configure::read('debug');
-		if ($isNotDebug && $method == '_cakeError') {
+		if ($isNotDebug && $method === '_cakeError') {
 			$method = 'error400';
 		}
 		if ($isNotDebug && $code == 500) {

lib/Cake/I18n/I18n.php

@@ -174,7 +174,7 @@ class I18n {
 			Cache::write($_this->domain, $_this->_domains[$domain][$_this->_lang], '_cake_core_');
 		}
 
-		if ($_this->category == 'LC_TIME') {
+		if ($_this->category === 'LC_TIME') {
 			return $_this->_translateTime($singular, $domain);
 		}
 
@@ -410,7 +410,7 @@ class I18n {
 			$header = unpack("L1magic/L1version/L1count/L1o_msg/L1o_trn", $header);
 			extract($header);
 
-			if ((dechex($magic) == '950412de' || dechex($magic) == 'ffffffff950412de') && !$version) {
+			if ((dechex($magic) === '950412de' || dechex($magic) === 'ffffffff950412de') && !$version) {
 				for ($n = 0; $n < $count; $n++) {
 					$r = unpack("L1len/L1offs", substr($data, $o_msg + $n * 8, 8));
 					$msgid = substr($data, $r["offs"], $r["len"]);

lib/Cake/I18n/Multibyte.php

@@ -750,7 +750,7 @@ class Multibyte {
 
 		$length = 75 - strlen($start) - strlen($end);
 		$length = $length - ($length % 4);
-		if ($charset == 'UTF-8') {
+		if ($charset === 'UTF-8') {
 			$parts = array();
 			$maxchars = floor(($length * 3) / 4);
 			$stringLength = strlen($string);

lib/Cake/Log/CakeLog.php

@@ -428,7 +428,7 @@ class CakeLog {
 		foreach (self::$_Collection->enabled() as $streamName) {
 			$logger = self::$_Collection->{$streamName};
 			$types = $scopes = $config = array();
-			if ($logger instanceof BaseLog) {
+			if (method_exists($logger, 'config')) {
 				$config = $logger->config();
 			}
 			if (isset($config['types'])) {

lib/Cake/Log/Engine/BaseLog.php

@@ -57,8 +57,10 @@ abstract class BaseLog implements CakeLogInterface {
  */
 	public function config($config = array()) {
 		if (!empty($config)) {
-			if (isset($config['types']) && is_string($config['types'])) {
+			foreach (array('types', 'scopes') as $option) {
-				$config['types'] = array($config['types']);
+				if (isset($config[$option]) && is_string($config[$option])) {
+					$config[$option] = array($config[$option]);
+				}
 			}
 			$this->_config = $config;
 		}

lib/Cake/Log/Engine/ConsoleLog.php

@@ -50,7 +50,7 @@ class ConsoleLog extends BaseLog {
  */
 	public function __construct($config = array()) {
 		parent::__construct($config);
-		if (DS == '\\' && !(bool)env('ANSICON')) {
+		if (DS === '\\' && !(bool)env('ANSICON')) {
 			$outputAs = ConsoleOutput::PLAIN;
 		} else {
 			$outputAs = ConsoleOutput::COLOR;

lib/Cake/Model/Behavior/ContainableBehavior.php

@@ -200,7 +200,7 @@ class ContainableBehavior extends ModelBehavior {
 
 		if (!empty($mandatory[$Model->alias])) {
 			foreach ($mandatory[$Model->alias] as $field) {
-				if ($field == '--primaryKey--') {
+				if ($field === '--primaryKey--') {
 					$field = $Model->primaryKey;
 				} elseif (preg_match('/^.+\.\-\-[^-]+\-\-$/', $field)) {
 					list($modelName, $field) = explode('.', $field);
@@ -307,7 +307,7 @@ class ContainableBehavior extends ModelBehavior {
 				if (!$optionKey && is_string($key) && preg_match('/^[a-z(]/', $key) && (!isset($Model->{$key}) || !is_object($Model->{$key}))) {
 					$option = 'fields';
 					$val = array($key);
-					if ($key{0} == '(') {
+					if ($key{0} === '(') {
 						$val = preg_split('/\s*,\s*/', substr($key, 1, -1));
 					} elseif (preg_match('/ASC|DESC$/', $key)) {
 						$option = 'order';
@@ -374,9 +374,9 @@ class ContainableBehavior extends ModelBehavior {
 			foreach ($map as $parent => $children) {
 				foreach ($children as $type => $bindings) {
 					foreach ($bindings as $dependency) {
-						if ($type == 'hasAndBelongsToMany') {
+						if ($type === 'hasAndBelongsToMany') {
 							$fields[$parent][] = '--primaryKey--';
-						} elseif ($type == 'belongsTo') {
+						} elseif ($type === 'belongsTo') {
 							$fields[$parent][] = $dependency . '.--primaryKey--';
 						}
 					}

lib/Cake/Model/BehaviorCollection.php

@@ -108,7 +108,8 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 			$behavior = $config['className'];
 		}
 		$configDisabled = isset($config['enabled']) && $config['enabled'] === false;
-		unset($config['enabled'], $config['className']);
+		$priority = isset($config['priority']) ? $config['priority'] : $this->defaultPriority;
+		unset($config['enabled'], $config['className'], $config['priority']);
 
 		list($plugin, $name) = pluginSplit($behavior, true);
 		if (!isset($alias)) {
@@ -145,6 +146,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 		if (empty($config)) {
 			$config = array();
 		}
+		$this->_loaded[$alias]->settings['priority'] = $priority;
 		$this->_loaded[$alias]->setup(ClassRegistry::getObject($this->modelName), $config);
 
 		foreach ($this->_loaded[$alias]->mapMethods as $method => $methodAlias) {
@@ -160,7 +162,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 		foreach ($methods as $m) {
 			if (!isset($parentMethods[$m])) {
 				$methodAllowed = (
-					$m[0] != '_' && !array_key_exists($m, $this->_methods) &&
+					$m[0] !== '_' && !array_key_exists($m, $this->_methods) &&
 					!in_array($m, $callbacks)
 				);
 				if ($methodAllowed) {
@@ -169,11 +171,14 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 			}
 		}
 
-		if (!in_array($alias, $this->_enabled) && !$configDisabled) {
+		if ($configDisabled) {
+			$this->disable($alias);
+		} elseif (!$this->enabled($alias)) {
 			$this->enable($alias);
 		} else {
-			$this->disable($alias);
+			$this->setPriority($alias, $priority);
 		}
+
 		return true;
 	}
 

lib/Cake/Model/CakeSchema.php

@@ -227,7 +227,7 @@ class CakeSchema extends Object {
 			foreach ($models as $model) {
 				$importModel = $model;
 				$plugin = null;
-				if ($model == 'AppModel') {
+				if ($model === 'AppModel') {
 					continue;
 				}
 
@@ -412,7 +412,7 @@ class CakeSchema extends Object {
 		if (is_array($fields)) {
 			$cols = array();
 			foreach ($fields as $field => $value) {
-				if ($field != 'indexes' && $field != 'tableParameters') {
+				if ($field !== 'indexes' && $field !== 'tableParameters') {
 					if (is_string($value)) {
 						$type = $value;
 						$value = array('type' => $type);
@@ -420,14 +420,14 @@ class CakeSchema extends Object {
 					$col = "\t\t'{$field}' => array('type' => '" . $value['type'] . "', ";
 					unset($value['type']);
 					$col .= implode(', ', $this->_values($value));
-				} elseif ($field == 'indexes') {
+				} elseif ($field === 'indexes') {
 					$col = "\t\t'indexes' => array(\n\t\t\t";
 					$props = array();
 					foreach ((array)$value as $key => $index) {
 						$props[] = "'{$key}' => array(" . implode(', ', $this->_values($index)) . ")";
 					}
 					$col .= implode(",\n\t\t\t", $props) . "\n\t\t";
-				} elseif ($field == 'tableParameters') {
+				} elseif ($field === 'tableParameters') {
 					$col = "\t\t'tableParameters' => array(";
 					$props = array();
 					foreach ((array)$value as $key => $param) {
@@ -472,7 +472,7 @@ class CakeSchema extends Object {
 		}
 		$tables = array();
 		foreach ($new as $table => $fields) {
-			if ($table == 'missing') {
+			if ($table === 'missing') {
 				continue;
 			}
 			if (!array_key_exists($table, $old)) {

lib/Cake/Model/Datasource/Database/Mysql.php

@@ -586,8 +586,11 @@ class Mysql extends DboSource {
 				}
 				$name = $this->startQuote . $name . $this->endQuote;
 			}
-			// length attribute only used for MySQL datasource, for TEXT/BLOB index columns
+			if (isset($value['type']) && strtolower($value['type']) === 'fulltext') {
+				$out .= 'FULLTEXT ';
+			}
 			$out .= 'KEY ' . $name . ' (';
+
 			if (is_array($value['column'])) {
 				if (isset($value['length'])) {
 					$vals = array();

lib/Cake/Model/Datasource/Database/Postgres.php

@@ -94,6 +94,13 @@ class Postgres extends DboSource {
  */
 	protected $_sequenceMap = array();
 
+/**
+ * The set of valid SQL operations usable in a WHERE statement
+ *
+ * @var array
+ */
+	protected $_sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', '~', '~*', '!~', '!~*', 'similar to');
+
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -199,10 +206,10 @@ class Postgres extends DboSource {
 			foreach ($cols as $c) {
 				$type = $c->type;
 				if (!empty($c->oct_length) && $c->char_length === null) {
-					if ($c->type == 'character varying') {
+					if ($c->type === 'character varying') {
 						$length = null;
 						$type = 'text';
-					} elseif ($c->type == 'uuid') {
+					} elseif ($c->type === 'uuid') {
 						$length = 36;
 					} else {
 						$length = intval($c->oct_length);
@@ -217,7 +224,7 @@ class Postgres extends DboSource {
 				}
 				$fields[$c->name] = array(
 					'type' => $this->column($type),
-					'null' => ($c->null == 'NO' ? false : true),
+					'null' => ($c->null === 'NO' ? false : true),
 					'default' => preg_replace(
 						"/^'(.*)'$/",
 						"$1",
@@ -234,7 +241,7 @@ class Postgres extends DboSource {
 					}
 				}
 				if (
-					$fields[$c->name]['default'] == 'NULL' ||
+					$fields[$c->name]['default'] === 'NULL' ||
 					preg_match('/nextval\([\'"]?([\w.]+)/', $c->default, $seq)
 				) {
 					$fields[$c->name]['default'] = null;
@@ -247,7 +254,7 @@ class Postgres extends DboSource {
 						$this->_sequenceMap[$table][$c->name] = $sequenceName;
 					}
 				}
-				if ($fields[$c->name]['type'] == 'boolean' && !empty($fields[$c->name]['default'])) {
+				if ($fields[$c->name]['type'] === 'boolean' && !empty($fields[$c->name]['default'])) {
 					$fields[$c->name]['default'] = constant($fields[$c->name]['default']);
 				}
 			}
@@ -382,7 +389,7 @@ class Postgres extends DboSource {
 			$result = array();
 			for ($i = 0; $i < $count; $i++) {
 				if (!preg_match('/^.+\\(.*\\)/', $fields[$i]) && !preg_match('/\s+AS\s+/', $fields[$i])) {
-					if (substr($fields[$i], -1) == '*') {
+					if (substr($fields[$i], -1) === '*') {
 						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') {
 							$build = explode('.', $fields[$i]);
 							$AssociatedModel = $model->{$build[0]};
@@ -526,6 +533,12 @@ class Postgres extends DboSource {
 								$default = isset($col['default']) ? $col['default'] : null;
 								$nullable = isset($col['null']) ? $col['null'] : null;
 								unset($col['default'], $col['null']);
+								if ($field !== $col['name']) {
+									$newName = $this->name($col['name']);
+									$out .= "\tRENAME {$fieldName} TO {$newName};\n";
+									$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
+									$fieldName = $newName;
+								}
 								$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col));
 								if (isset($nullable)) {
 									$nullable = ($nullable) ? 'DROP NOT NULL' : 'SET NOT NULL';
@@ -576,7 +589,7 @@ class Postgres extends DboSource {
 		if (isset($indexes['drop'])) {
 			foreach ($indexes['drop'] as $name => $value) {
 				$out = 'DROP ';
-				if ($name == 'PRIMARY') {
+				if ($name === 'PRIMARY') {
 					continue;
 				} else {
 					$out .= 'INDEX ' . $name;
@@ -587,7 +600,7 @@ class Postgres extends DboSource {
 		if (isset($indexes['add'])) {
 			foreach ($indexes['add'] as $name => $value) {
 				$out = 'CREATE ';
-				if ($name == 'PRIMARY') {
+				if ($name === 'PRIMARY') {
 					continue;
 				} else {
 					if (!empty($value['unique'])) {
@@ -663,11 +676,11 @@ class Postgres extends DboSource {
 				return 'datetime';
 			case (strpos($col, 'time') === 0):
 				return 'time';
-			case ($col == 'bigint'):
+			case ($col === 'bigint'):
 				return 'biginteger';
-			case (strpos($col, 'int') !== false && $col != 'interval'):
+			case (strpos($col, 'int') !== false && $col !== 'interval'):
 				return 'integer';
-			case (strpos($col, 'char') !== false || $col == 'uuid'):
+			case (strpos($col, 'char') !== false || $col === 'uuid'):
 				return 'string';
 			case (strpos($col, 'text') !== false):
 				return 'text';
@@ -693,7 +706,7 @@ class Postgres extends DboSource {
 		if (strpos($col, '(') !== false) {
 			list($col, $limit) = explode('(', $col);
 		}
-		if ($col == 'uuid') {
+		if ($col === 'uuid') {
 			return 36;
 		}
 		if ($limit) {
@@ -852,7 +865,7 @@ class Postgres extends DboSource {
 				$out = str_replace('DEFAULT DEFAULT', 'DEFAULT NULL', $out);
 			} elseif (in_array($column['type'], array('integer', 'float'))) {
 				$out = str_replace('DEFAULT DEFAULT', 'DEFAULT 0', $out);
-			} elseif ($column['type'] == 'boolean') {
+			} elseif ($column['type'] === 'boolean') {
 				$out = str_replace('DEFAULT DEFAULT', 'DEFAULT FALSE', $out);
 			}
 		}
@@ -872,7 +885,7 @@ class Postgres extends DboSource {
 			return array();
 		}
 		foreach ($indexes as $name => $value) {
-			if ($name == 'PRIMARY') {
+			if ($name === 'PRIMARY') {
 				$out = 'PRIMARY KEY  (' . $this->name($value['column']) . ')';
 			} else {
 				$out = 'CREATE ';

lib/Cake/Model/Datasource/Database/Sqlite.php

@@ -357,7 +357,7 @@ class Sqlite extends DboSource {
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $type) = $meta;
 				$resultRow[$table][$column] = $row[$col];
-				if ($type == 'boolean' && !is_null($row[$col])) {
+				if ($type === 'boolean' && !is_null($row[$col])) {
 					$resultRow[$table][$column] = $this->boolean($resultRow[$table][$column]);
 				}
 			}
@@ -412,7 +412,7 @@ class Sqlite extends DboSource {
 			return null;
 		}
 
-		if (isset($column['key']) && $column['key'] == 'primary' && $type == 'integer') {
+		if (isset($column['key']) && $column['key'] === 'primary' && $type === 'integer') {
 			return $this->name($name) . ' ' . $this->columns['primary_key']['name'];
 		}
 		return parent::buildColumn($column);
@@ -456,7 +456,7 @@ class Sqlite extends DboSource {
 
 		foreach ($indexes as $name => $value) {
 
-			if ($name == 'PRIMARY') {
+			if ($name === 'PRIMARY') {
 				continue;
 			}
 			$out = 'CREATE ';

lib/Cake/Model/Datasource/Database/Sqlserver.php

@@ -227,7 +227,7 @@ class Sqlserver extends DboSource {
 				$this->value($fields[$field]['default'], $fields[$field]['type']);
 			}
 
-			if ($fields[$field]['key'] !== false && $fields[$field]['type'] == 'integer') {
+			if ($fields[$field]['key'] !== false && $fields[$field]['type'] === 'integer') {
 				$fields[$field]['length'] = 11;
 			} elseif ($fields[$field]['key'] === false) {
 				unset($fields[$field]['key']);
@@ -235,7 +235,7 @@ class Sqlserver extends DboSource {
 			if (in_array($fields[$field]['type'], array('date', 'time', 'datetime', 'timestamp'))) {
 				$fields[$field]['length'] = null;
 			}
-			if ($fields[$field]['type'] == 'float' && !empty($column->Size)) {
+			if ($fields[$field]['type'] === 'float' && !empty($column->Size)) {
 				$fields[$field]['length'] = $fields[$field]['length'] . ',' . $column->Size;
 			}
 		}
@@ -271,7 +271,7 @@ class Sqlserver extends DboSource {
 				}
 
 				if (!preg_match('/\s+AS\s+/i', $fields[$i])) {
-					if (substr($fields[$i], -1) == '*') {
+					if (substr($fields[$i], -1) === '*') {
 						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') {
 							$build = explode('.', $fields[$i]);
 							$AssociatedModel = $model->{$build[0]};
@@ -299,7 +299,7 @@ class Sqlserver extends DboSource {
 						$fieldName = $this->name($name);
 						$fieldAlias = $this->name($alias);
 					}
-					if ($model->getColumnType($fields[$i]) == 'datetime') {
+					if ($model->getColumnType($fields[$i]) === 'datetime') {
 						$fieldName = "CONVERT(VARCHAR(20), {$fieldName}, 20)";
 					}
 					$fields[$i] = "{$fieldName} AS {$fieldAlias}";
@@ -402,13 +402,13 @@ class Sqlserver extends DboSource {
 			$col = $real->Type;
 		}
 
-		if ($col == 'datetime2') {
+		if ($col === 'datetime2') {
 			return 'datetime';
 		}
 		if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
 			return $col;
 		}
-		if ($col == 'bit') {
+		if ($col === 'bit') {
 			return 'boolean';
 		}
 		if (strpos($col, 'bigint') !== false) {
@@ -426,7 +426,7 @@ class Sqlserver extends DboSource {
 		if (strpos($col, 'text') !== false) {
 			return 'text';
 		}
-		if (strpos($col, 'binary') !== false || $col == 'image') {
+		if (strpos($col, 'binary') !== false || $col === 'image') {
 			return 'binary';
 		}
 		if (in_array($col, array('float', 'real', 'decimal', 'numeric'))) {
@@ -481,7 +481,7 @@ class Sqlserver extends DboSource {
 			} else {
 				$map = array(0, $name);
 			}
-			$map[] = ($column['sqlsrv:decl_type'] == 'bit') ? 'boolean' : $column['native_type'];
+			$map[] = ($column['sqlsrv:decl_type'] === 'bit') ? 'boolean' : $column['native_type'];
 			$this->map[$index++] = $map;
 		}
 	}
@@ -683,7 +683,7 @@ class Sqlserver extends DboSource {
 		$join = array();
 
 		foreach ($indexes as $name => $value) {
-			if ($name == 'PRIMARY') {
+			if ($name === 'PRIMARY') {
 				$join[] = 'PRIMARY KEY (' . $this->name($value['column']) . ')';
 			} elseif (isset($value['unique']) && $value['unique']) {
 				$out = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE";
@@ -709,7 +709,7 @@ class Sqlserver extends DboSource {
 	protected function _getPrimaryKey($model) {
 		$schema = $this->describe($model);
 		foreach ($schema as $field => $props) {
-			if (isset($props['key']) && $props['key'] == 'primary') {
+			if (isset($props['key']) && $props['key'] === 'primary') {
 				return $field;
 			}
 		}

lib/Cake/Model/Datasource/DboSource.php

@@ -323,9 +323,9 @@ class DboSource extends DataSource {
 				$data, array_fill(0, count($data), $column)
 			);
 		} elseif (is_object($data) && isset($data->type, $data->value)) {
-			if ($data->type == 'identifier') {
+			if ($data->type === 'identifier') {
 				return $this->name($data->value);
-			} elseif ($data->type == 'expression') {
+			} elseif ($data->type === 'expression') {
 				return $data->value;
 			}
 		} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
@@ -899,7 +899,7 @@ class DboSource extends DataSource {
 		if (empty($log['log'])) {
 			return;
 		}
-		if (PHP_SAPI != 'cli') {
+		if (PHP_SAPI !== 'cli') {
 			$controller = null;
 			$View = new View($controller, false);
 			$View->set('logs', array($this->configKeyName => $log));
@@ -1878,7 +1878,7 @@ class DboSource extends DataSource {
 
 			if ($quoteValues) {
 				$update .= $this->value($value, $model->getColumnType($field));
-			} elseif ($model->getColumnType($field) == 'boolean' && (is_int($value) || is_bool($value))) {
+			} elseif ($model->getColumnType($field) === 'boolean' && (is_int($value) || is_bool($value))) {
 				$update .= $this->boolean($value, true);
 			} elseif (!$alias) {
 				$update .= str_replace($quotedAlias . '.', '', str_replace(
@@ -3170,8 +3170,6 @@ class DboSource extends DataSource {
 			} else {
 				if (!empty($value['unique'])) {
 					$out .= 'UNIQUE ';
-				} elseif (!empty($value['type']) && strtoupper($value['type']) === 'FULLTEXT') {
-					$out .= 'FULLTEXT ';
 				}
 				$name = $this->startQuote . $name . $this->endQuote;
 			}

lib/Cake/Model/Model.php

@@ -818,7 +818,7 @@ class Model extends Object implements CakeEventListener {
 				$className = empty($this->__backAssociation[$type][$name]['className']) ?
 					$name : $this->__backAssociation[$type][$name]['className'];
 				break;
-			} elseif ($type == 'hasAndBelongsToMany') {
+			} elseif ($type === 'hasAndBelongsToMany') {
 				foreach ($this->{$type} as $k => $relation) {
 					if (empty($relation['with'])) {
 						continue;
@@ -1061,7 +1061,7 @@ class Model extends Object implements CakeEventListener {
 					break;
 
 					case 'foreignKey':
-						$data = (($type == 'belongsTo') ? Inflector::underscore($assocKey) : Inflector::singularize($this->table)) . '_id';
+						$data = (($type === 'belongsTo') ? Inflector::underscore($assocKey) : Inflector::singularize($this->table)) . '_id';
 					break;
 
 					case 'associationForeignKey':
@@ -1262,7 +1262,7 @@ class Model extends Object implements CakeEventListener {
 		if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] == 12 && 'am' == $data['meridian']) {
 			$data['hour'] = '00';
 		}
-		if ($type == 'time') {
+		if ($type === 'time') {
 			foreach ($timeFields as $key => $val) {
 				if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
 					$data[$val] = '00';
@@ -1277,9 +1277,9 @@ class Model extends Object implements CakeEventListener {
 			}
 		}
 
-		if ($type == 'datetime' || $type == 'timestamp' || $type == 'date') {
+		if ($type === 'datetime' || $type === 'timestamp' || $type === 'date') {
 			foreach ($dateFields as $key => $val) {
-				if ($val == 'hour' || $val == 'min' || $val == 'sec') {
+				if ($val === 'hour' || $val === 'min' || $val === 'sec') {
 					if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
 						$data[$val] = '00';
 					} else {

lib/Cake/Model/Permission.php

@@ -100,7 +100,7 @@ class Permission extends AppModel {
 			return false;
 		}
 
-		if ($action != '*' && !in_array('_' . $action, $permKeys)) {
+		if ($action !== '*' && !in_array('_' . $action, $permKeys)) {
 			trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE);
 			return false;
 		}
@@ -126,7 +126,7 @@ class Permission extends AppModel {
 			} else {
 				$perms = Hash::extract($perms, '{n}.' . $this->alias);
 				foreach ($perms as $perm) {
-					if ($action == '*') {
+					if ($action === '*') {
 
 						foreach ($permKeys as $key) {
 							if (!empty($perm)) {

lib/Cake/Model/Validator/CakeValidationRule.php

@@ -194,7 +194,7 @@ class CakeValidationRule {
  */
 	public function skip() {
 		if (!empty($this->on)) {
-			if ($this->on == 'create' && $this->isUpdate() || $this->on == 'update' && !$this->isUpdate()) {
+			if ($this->on === 'create' && $this->isUpdate() || $this->on === 'update' && !$this->isUpdate()) {
 				return true;
 			}
 		}

lib/Cake/Network/CakeRequest.php

@@ -134,7 +134,7 @@ class CakeRequest implements ArrayAccess {
 		if (empty($url)) {
 			$url = $this->_url();
 		}
-		if ($url[0] == '/') {
+		if ($url[0] === '/') {
 			$url = substr($url, 1);
 		}
 		$this->url = $url;
@@ -255,7 +255,7 @@ class CakeRequest implements ArrayAccess {
 		if (strpos($uri, '?') !== false) {
 			list($uri) = explode('?', $uri, 2);
 		}
-		if (empty($uri) || $uri == '/' || $uri == '//' || $uri == '/index.php') {
+		if (empty($uri) || $uri === '/' || $uri === '//' || $uri === '/index.php') {
 			return '/';
 		}
 		return $uri;
@@ -412,7 +412,7 @@ class CakeRequest implements ArrayAccess {
 		if (!empty($ref) && !empty($base)) {
 			if ($local && strpos($ref, $base) === 0) {
 				$ref = substr($ref, strlen($base));
-				if ($ref[0] != '/') {
+				if ($ref[0] !== '/') {
 					$ref = '/' . $ref;
 				}
 				return $ref;
@@ -907,10 +907,10 @@ class CakeRequest implements ArrayAccess {
 		if (isset($this->params[$name])) {
 			return $this->params[$name];
 		}
-		if ($name == 'url') {
+		if ($name === 'url') {
 			return $this->query;
 		}
-		if ($name == 'data') {
+		if ($name === 'data') {
 			return $this->data;
 		}
 		return null;

lib/Cake/Network/CakeSocket.php

@@ -135,7 +135,7 @@ class CakeSocket {
 		}
 
 		$scheme = null;
-		if (isset($this->config['request']['uri']) && $this->config['request']['uri']['scheme'] == 'https') {
+		if (isset($this->config['request']['uri']) && $this->config['request']['uri']['scheme'] === 'https') {
 			$scheme = 'ssl://';
 		}
 

lib/Cake/Network/Email/CakeEmail.php

@@ -1512,7 +1512,7 @@ class CakeEmail {
  */
 	protected function _getTypes() {
 		$types = array($this->_emailFormat);
-		if ($this->_emailFormat == 'both') {
+		if ($this->_emailFormat === 'both') {
 			$types = array('html', 'text');
 		}
 		return $types;

lib/Cake/Network/Http/HttpSocket.php

@@ -545,7 +545,7 @@ class HttpSocket extends CakeSocket {
 			if (is_array($port)) {
 				$port = $port[0];
 			}
-			if ($url{0} == '/') {
+			if ($url{0} === '/') {
 				$url = $this->config['request']['uri']['host'] . ':' . $port . $url;
 			}
 			if (!preg_match('/^.+:\/\/|\*|^\//', $url)) {
@@ -867,7 +867,7 @@ class HttpSocket extends CakeSocket {
 
 		if (is_string($request)) {
 			$isValid = preg_match("/(.+) (.+) (.+)\r\n/U", $request, $match);
-			if (!$this->quirksMode && (!$isValid || ($match[2] == '*' && !in_array($match[3], $asteriskMethods)))) {
+			if (!$this->quirksMode && (!$isValid || ($match[2] === '*' && !in_array($match[3], $asteriskMethods)))) {
 				throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.'));
 			}
 			return $request;
@@ -918,7 +918,7 @@ class HttpSocket extends CakeSocket {
 
 		$returnHeader = '';
 		foreach ($header as $field => $contents) {
-			if (is_array($contents) && $mode == 'standard') {
+			if (is_array($contents) && $mode === 'standard') {
 				$contents = implode(',', $contents);
 			}
 			foreach ((array)$contents as $content) {

lib/Cake/Routing/Dispatcher.php

@@ -192,7 +192,9 @@ class Dispatcher implements CakeEventListener {
 
 		if ($render && $controller->autoRender) {
 			$response = $controller->render();
-		} elseif ($response->body() === null) {
+		} elseif (!($result instanceof CakeResponse) &&
+			$response->body() === null
+		) {
 			$response->body($result);
 		}
 		$controller->shutdownProcess();

lib/Cake/Routing/Router.php

@@ -191,7 +191,7 @@ class Router {
  */
 	protected static function _validateRouteClass($routeClass) {
 		if (
-			$routeClass != 'CakeRoute' &&
+			$routeClass !== 'CakeRoute' &&
 			(!class_exists($routeClass) || !is_subclass_of($routeClass, 'CakeRoute'))
 		) {
 			throw new RouterException(__d('cake_dev', 'Route classes must extend CakeRoute'));
@@ -332,7 +332,7 @@ class Router {
 			$routeClass = self::_validateRouteClass($routeClass);
 			unset($options['routeClass']);
 		}
-		if ($routeClass == 'RedirectRoute' && isset($defaults['redirect'])) {
+		if ($routeClass === 'RedirectRoute' && isset($defaults['redirect'])) {
 			$defaults = $defaults['redirect'];
 		}
 		self::$routes[] = new $routeClass($route, $defaults, $options);
@@ -715,7 +715,7 @@ class Router {
 			return;
 		}
 		foreach (self::$_initialState as $key => $val) {
-			if ($key != '_initialState') {
+			if ($key !== '_initialState') {
 				self::${$key} = $val;
 			}
 		}
@@ -1001,7 +1001,7 @@ class Router {
 
 		$out .= $addition;
 
-		if (isset($out[0]) && $out[0] != '?') {
+		if (isset($out[0]) && $out[0] !== '?') {
 			$out = '?' . $out;
 		}
 		return $out;

lib/Cake/Test/Case/BasicsTest.php

@@ -767,7 +767,7 @@ EXPECTED;
 '<div>this-is-a-test</div>'
 ###########################
 EXPECTED;
-		if (php_sapi_name() == 'cli') {
+		if (php_sapi_name() === 'cli') {
 			$expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 17);
 		} else {
 			$expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 19);
@@ -791,7 +791,7 @@ EXPECTED;
 '<div>this-is-a-test</div>'
 ###########################
 EXPECTED;
-		if (php_sapi_name() == 'cli') {
+		if (php_sapi_name() === 'cli') {
 			$expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 17);
 		} else {
 			$expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 19);

lib/Cake/Test/Case/Cache/CacheTest.php

@@ -228,7 +228,7 @@ class CacheTest extends CakeTestCase {
 			'duration' => 3600,
 			'probability' => 100,
 			'engine' => 'File',
-			'isWindows' => DIRECTORY_SEPARATOR == '\\',
+			'isWindows' => DIRECTORY_SEPARATOR === '\\',
 			'mask' => 0664,
 			'groups' => array()
 		);

lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php

@@ -412,7 +412,7 @@ class FileEngineTest extends CakeTestCase {
 	}
 
 /**
- * Tests that deleteing from a groups-enabled config is possible
+ * Tests that deleting from a groups-enabled config is possible
  *
  * @return void
  */

lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php

@@ -504,12 +504,12 @@ class DbAclTest extends CakeTestCase {
 				$perms = '';
 				foreach ($rights as $right) {
 					if ($this->Acl->check($aro, $aco, $right)) {
-						if ($right == '*') {
+						if ($right === '*') {
 							$perms .= '****';
 							break;
 						}
 						$perms .= $right[0];
-					} elseif ($right != '*') {
+					} elseif ($right !== '*') {
 						$perms .= ' ';
 					}
 				}

lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php

@@ -165,11 +165,12 @@ class ActionsAuthorizeTest extends CakeTestCase {
  */
 	public function testActionNoDoubleSlash() {
 		$this->auth->settings['actionPath'] = '/controllers/';
-		$request = array(
+		$request = new CakeRequest('/posts/index', false);
+		$request->addParams(array(
 			'plugin' => null,
 			'controller' => 'posts',
 			'action' => 'index'
-		);
+		));
 		$result = $this->auth->action($request);
 		$this->assertEquals('controllers/Posts/index', $result);
 	}

lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php

@@ -453,6 +453,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Controller->Auth->userModel = 'AuthUser';
 		$this->Controller->Auth->authorize = false;
 		$this->Controller->request->addParams(Router::parse('auth_test/add'));
+		$this->Controller->Auth->initialize($this->Controller);
 		$result = $this->Controller->Auth->startup($this->Controller);
 		$this->assertTrue($result);
 

lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php

@@ -107,7 +107,7 @@ class PaginatorControllerPost extends CakeTestModel {
  * @return void
  */
 	public function find($conditions = null, $fields = array(), $order = null, $recursive = null) {
-		if ($conditions == 'popular') {
+		if ($conditions === 'popular') {
 			$conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1');
 			$options = Hash::merge($fields, compact('conditions'));
 			return parent::find('all', $options);
@@ -278,7 +278,7 @@ class PaginatorCustomPost extends CakeTestModel {
  * @return array
  */
 	protected function _findTotals($state, $query, $results = array()) {
-		if ($state == 'before') {
+		if ($state === 'before') {
 			$query['fields'] = array('author_id');
 			$this->virtualFields['total_posts'] = "COUNT({$this->alias}.id)";
 			$query['fields'][] = 'total_posts';
@@ -296,7 +296,7 @@ class PaginatorCustomPost extends CakeTestModel {
  * @return array
  */
 	protected function _findTotalsOperation($state, $query, $results = array()) {
-		if ($state == 'before') {
+		if ($state === 'before') {
 			if (!empty($query['operation']) && $query['operation'] === 'count') {
 				unset($query['limit']);
 				$query['recursive'] = -1;

lib/Cake/Test/Case/Controller/ControllerTest.php

@@ -103,7 +103,7 @@ class ControllerPost extends CakeTestModel {
  * @return void
  */
 	public function find($type = 'first', $options = array()) {
-		if ($type == 'popular') {
+		if ($type === 'popular') {
 			$conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1');
 			$options = Hash::merge($options, compact('conditions'));
 			return parent::find('all', $options);

lib/Cake/Test/Case/Log/CakeLogTest.php

@@ -424,6 +424,18 @@ class CakeLogTest extends CakeTestCase {
 	public function testScopedLogging() {
 		$this->_resetLogConfig();
 		$this->_deleteLogs();
+
+		CakeLog::config('string-scope', array(
+			'engine' => 'FileLog',
+			'types' => array('info', 'notice', 'warning'),
+			'scopes' => 'string-scope',
+			'file' => 'string-scope.log'
+		));
+		CakeLog::write('info', 'info message', 'string-scope');
+		$this->assertTrue(file_exists(LOGS . 'string-scope.log'));
+
+		CakeLog::drop('string-scope');
+
 		CakeLog::config('shops', array(
 			'engine' => 'FileLog',
 			'types' => array('info', 'notice', 'warning'),

lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php

@@ -124,7 +124,7 @@ class ConsoleLogTest extends CakeTestCase {
 		TestCakeLog::config('test_console_log', array(
 			'engine' => 'TestConsoleLog',
 			));
-		if (DS == '\\' && !(bool)env('ANSICON')) {
+		if (DS === '\\' && !(bool)env('ANSICON')) {
 			$expected = ConsoleOutput::PLAIN;
 		} else {
 			$expected = ConsoleOutput::COLOR;

lib/Cake/Test/Case/Model/AclNodeTest.php

@@ -193,9 +193,9 @@ class DbAroUserTest extends CakeTestModel {
  * @return void
  */
 	public function bindNode($ref = null) {
-		if (Configure::read('DbAclbindMode') == 'string') {
+		if (Configure::read('DbAclbindMode') === 'string') {
 			return 'ROOT/admins/Gandalf';
-		} elseif (Configure::read('DbAclbindMode') == 'array') {
+		} elseif (Configure::read('DbAclbindMode') === 'array') {
 			return array('DbAroTest' => array('DbAroTest.model' => 'AuthUser', 'DbAroTest.foreign_key' => 2));
 		}
 	}

lib/Cake/Test/Case/Model/BehaviorCollectionTest.php

@@ -61,7 +61,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function beforeFind(Model $model, $query) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['beforeFind']) || $settings['beforeFind'] == 'off') {
+		if (!isset($settings['beforeFind']) || $settings['beforeFind'] === 'off') {
 			return parent::beforeFind($model, $query);
 		}
 		switch ($settings['beforeFind']) {
@@ -86,7 +86,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function afterFind(Model $model, $results, $primary) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterFind']) || $settings['afterFind'] == 'off') {
+		if (!isset($settings['afterFind']) || $settings['afterFind'] === 'off') {
 			return parent::afterFind($model, $results, $primary);
 		}
 		switch ($settings['afterFind']) {
@@ -109,7 +109,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function beforeSave(Model $model) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['beforeSave']) || $settings['beforeSave'] == 'off') {
+		if (!isset($settings['beforeSave']) || $settings['beforeSave'] === 'off') {
 			return parent::beforeSave($model);
 		}
 		switch ($settings['beforeSave']) {
@@ -132,7 +132,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function afterSave(Model $model, $created) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterSave']) || $settings['afterSave'] == 'off') {
+		if (!isset($settings['afterSave']) || $settings['afterSave'] === 'off') {
 			return parent::afterSave($model, $created);
 		}
 		$string = 'modified after';
@@ -162,7 +162,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function beforeValidate(Model $model) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['validate']) || $settings['validate'] == 'off') {
+		if (!isset($settings['validate']) || $settings['validate'] === 'off') {
 			return parent::beforeValidate($model);
 		}
 		switch ($settings['validate']) {
@@ -189,7 +189,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function afterValidate(Model $model) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterValidate']) || $settings['afterValidate'] == 'off') {
+		if (!isset($settings['afterValidate']) || $settings['afterValidate'] === 'off') {
 			return parent::afterValidate($model);
 		}
 		switch ($settings['afterValidate']) {
@@ -210,7 +210,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function beforeDelete(Model $model, $cascade = true) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['beforeDelete']) || $settings['beforeDelete'] == 'off') {
+		if (!isset($settings['beforeDelete']) || $settings['beforeDelete'] === 'off') {
 			return parent::beforeDelete($model, $cascade);
 		}
 		switch ($settings['beforeDelete']) {
@@ -235,7 +235,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function afterDelete(Model $model) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterDelete']) || $settings['afterDelete'] == 'off') {
+		if (!isset($settings['afterDelete']) || $settings['afterDelete'] === 'off') {
 			return parent::afterDelete($model);
 		}
 		switch ($settings['afterDelete']) {
@@ -253,7 +253,7 @@ class TestBehavior extends ModelBehavior {
  */
 	public function onError(Model $model, $error) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['onError']) || $settings['onError'] == 'off') {
+		if (!isset($settings['onError']) || $settings['onError'] === 'off') {
 			return parent::onError($model, $error);
 		}
 		echo "onError trigger success";
@@ -418,6 +418,39 @@ class Test7Behavior extends ModelBehavior{
 class TestAliasBehavior extends TestBehavior {
 }
 
+/**
+ * FirstBehavior
+ */
+class FirstBehavior extends ModelBehavior {
+
+	public function beforeFind(Model $model, $query = array()) {
+		$model->called[] = get_class($this);
+		return $query;
+	}
+
+}
+
+/**
+ * SecondBehavior
+ */
+class SecondBehavior extends FirstBehavior {
+}
+
+/**
+ * ThirdBehavior
+ */
+class ThirdBehavior extends FirstBehavior {
+}
+
+/**
+ * Orangutan Model
+ */
+class Orangutan extends Monkey {
+
+	public $called = array();
+
+}
+
 /**
  * BehaviorCollection class
  *
@@ -432,7 +465,8 @@ class BehaviorCollectionTest extends CakeTestCase {
  */
 	public $fixtures = array(
 		'core.apple', 'core.sample', 'core.article', 'core.user', 'core.comment',
-		'core.attachment', 'core.tag', 'core.articles_tag', 'core.translate'
+		'core.attachment', 'core.tag', 'core.articles_tag', 'core.translate',
+		'core.device'
 	);
 
 /**
@@ -489,14 +523,14 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$this->assertEquals('testbehavior', strtolower(get_class($Apple->Behaviors->Test)));
 		$expected = array('beforeFind' => 'on', 'afterFind' => 'off', 'key' => 'value');
 		$this->assertEquals($expected, $Apple->Behaviors->Test->settings['Apple']);
-		$this->assertEquals(array('Apple'), array_keys($Apple->Behaviors->Test->settings));
+		$this->assertEquals(array('priority', 'Apple'), array_keys($Apple->Behaviors->Test->settings));
 
 		$this->assertSame($Apple->Sample->Behaviors->loaded(), array());
 		$Apple->Sample->Behaviors->attach('Test', array('key2' => 'value2'));
 		$this->assertSame($Apple->Sample->Behaviors->loaded(), array('Test'));
 		$this->assertEquals(array('beforeFind' => 'on', 'afterFind' => 'off', 'key2' => 'value2'), $Apple->Sample->Behaviors->Test->settings['Sample']);
 
-		$this->assertEquals(array('Apple', 'Sample'), array_keys($Apple->Behaviors->Test->settings));
+		$this->assertEquals(array('priority', 'Apple', 'Sample'), array_keys($Apple->Behaviors->Test->settings));
 		$this->assertSame(
 			$Apple->Sample->Behaviors->Test->settings,
 			$Apple->Behaviors->Test->settings
@@ -1149,4 +1183,77 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test that behavior priority
+ */
+	public function testBehaviorOrderCallbacks() {
+		$model = ClassRegistry::init('Orangutan');
+		$model->Behaviors->init('Orangutan', array(
+			'Second' => array('priority' => 9),
+			'Third',
+			'First' => array('priority' => 8),
+		));
+
+		$this->assertEmpty($model->called);
+
+		$model->find('first');
+		$expected = array(
+			'FirstBehavior',
+			'SecondBehavior',
+			'ThirdBehavior',
+		);
+		$this->assertEquals($expected, $model->called);
+
+		$model->called = array();
+		$model->Behaviors->load('Third', array('priority' => 1));
+
+		$model->find('first');
+		$expected = array(
+			'ThirdBehavior',
+			'FirstBehavior',
+			'SecondBehavior'
+		);
+		$this->assertEquals($expected, $model->called);
+
+		$model->called = array();
+		$model->Behaviors->load('First');
+
+		$model->find('first');
+		$expected = array(
+			'ThirdBehavior',
+			'SecondBehavior',
+			'FirstBehavior'
+		);
+		$this->assertEquals($expected, $model->called);
+
+		$model->called = array();
+		$model->Behaviors->unload('Third');
+
+		$model->find('first');
+		$expected = array(
+			'SecondBehavior',
+			'FirstBehavior'
+		);
+		$this->assertEquals($expected, $model->called);
+
+		$model->called = array();
+		$model->Behaviors->disable('Second');
+
+		$model->find('first');
+		$expected = array(
+			'FirstBehavior'
+		);
+		$this->assertEquals($expected, $model->called);
+
+		$model->called = array();
+		$model->Behaviors->enable('Second');
+
+		$model->find('first');
+		$expected = array(
+			'SecondBehavior',
+			'FirstBehavior'
+		);
+		$this->assertEquals($expected, $model->called);
+	}
+
 }

lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php

@@ -1131,7 +1131,7 @@ class MysqlTest extends CakeTestCase {
 				$linkModel = $this->Model->Category2->{$assoc};
 				$external = isset($assocData['external']);
 
-				if ($this->Model->Category2->alias == $linkModel->alias && $type != 'hasAndBelongsToMany' && $type != 'hasMany') {
+				if ($this->Model->Category2->alias == $linkModel->alias && $type !== 'hasAndBelongsToMany' && $type !== 'hasMany') {
 					$result = $this->Dbo->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null);
 					$this->assertFalse(empty($result));
 				} else {
@@ -2984,6 +2984,7 @@ class MysqlTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildIndex($data);
 		$expected = array('FULLTEXT KEY `MyFtIndex` (`name`, `description`)');
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'MyTextIndex' => array('column' => 'text_field', 'length' => array('text_field' => 20))

lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php

@@ -486,6 +486,18 @@ class PostgresTest extends CakeTestCase {
 		$this->assertEquals($data, $result['BinaryTest']['data']);
 	}
 
+/**
+ * Tests passing PostgreSQL regular expression operators when building queries
+ *
+ * @return void
+ */
+	public function testRegexpOperatorConditionsParsing() {
+		$this->assertSame(' WHERE "name" ~ \'[a-z_]+\'', $this->Dbo->conditions(array('name ~' => '[a-z_]+')));
+		$this->assertSame(' WHERE "name" ~* \'[a-z_]+\'', $this->Dbo->conditions(array('name ~*' => '[a-z_]+')));
+		$this->assertSame(' WHERE "name" !~ \'[a-z_]+\'', $this->Dbo->conditions(array('name !~' => '[a-z_]+')));
+		$this->assertSame(' WHERE "name" !~* \'[a-z_]+\'', $this->Dbo->conditions(array('name !~*' => '[a-z_]+')));
+	}
+
 /**
  * Tests the syntax of generated schema indexes
  *
@@ -739,6 +751,25 @@ class PostgresTest extends CakeTestCase {
 		$this->Dbo->query($this->Dbo->dropSchema($schema1));
 	}
 
+/**
+ * Test the alterSchema  RENAME statements
+ *
+ * @return void
+ */
+	public function testAlterSchemaRenameTo() {
+		$query = $this->Dbo->alterSchema(array(
+			'posts' => array(
+				'change' => array(
+					'title' => array('name' => 'subject', 'type' => 'string', 'null' => false)
+				)
+			)
+		));
+		$this->assertContains('RENAME "title" TO "subject";', $query);
+		$this->assertContains('ALTER COLUMN "subject" TYPE', $query);
+		$this->assertNotContains(";\n\tALTER COLUMN \"subject\" TYPE", $query);
+		$this->assertNotContains('ALTER COLUMN "title" TYPE "subject"', $query);
+	}
+
 /**
  * Test it is possible to use virtual field with postgresql
  *
@@ -922,6 +953,7 @@ class PostgresTest extends CakeTestCase {
  * @return void
  */
 	public function testNestedTransaction() {
+		$this->Dbo->useNestedTransactions = true;
 		$this->skipIf($this->Dbo->nestedTransactionSupported() === false, 'The Postgres server do not support nested transaction');
 
 		$this->loadFixtures('Article');

lib/Cake/Test/Case/Model/models.php

@@ -2574,7 +2574,7 @@ class NumberTree extends CakeTestModel {
 			$this->create($data);
 
 			if ($hierarchal) {
-				if ($this->name == 'UnconventionalTree') {
+				if ($this->name === 'UnconventionalTree') {
 					$data[$this->name]['join'] = $parentId;
 				} else {
 					$data[$this->name]['parent_id'] = $parentId;

lib/Cake/Test/Case/Network/CakeRequestTest.php

@@ -29,7 +29,7 @@ class TestCakeRequest extends CakeRequest {
 		if (empty($url)) {
 			$url = $this->_url();
 		}
-		if ($url[0] == '/') {
+		if ($url[0] === '/') {
 			$url = substr($url, 1);
 		}
 		$this->url = $url;

lib/Cake/Test/Case/Network/CakeSocketTest.php

@@ -87,6 +87,7 @@ class CakeSocketTest extends CakeTestCase {
 		$this->assertFalse($this->Socket->connected);
 		$this->Socket->disconnect();
 		$this->assertFalse($this->Socket->connected);
+		try {
 			$this->Socket->connect();
 			$this->assertTrue($this->Socket->connected);
 			$this->Socket->connect();
@@ -97,6 +98,9 @@ class CakeSocketTest extends CakeTestCase {
 			$this->Socket = new CakeSocket($config);
 			$this->Socket->connect();
 			$this->assertTrue($this->Socket->connected);
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
 	}
 
 /**
@@ -129,6 +133,7 @@ class CakeSocketTest extends CakeTestCase {
  * @return void
  */
 	public function testSocketHost() {
+		try {
 			$this->Socket = new CakeSocket();
 			$this->Socket->connect();
 			$this->assertEquals('127.0.0.1', $this->Socket->address());
@@ -142,6 +147,9 @@ class CakeSocketTest extends CakeTestCase {
 			$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
 			$this->assertEquals(null, $this->Socket->lastError());
 			$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
 	}
 
 /**
@@ -150,8 +158,12 @@ class CakeSocketTest extends CakeTestCase {
  * @return void
  */
 	public function testSocketWriting() {
+		try {
 			$request = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n";
 			$this->assertTrue((bool)$this->Socket->write($request));
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
 	}
 
 /**
@@ -161,6 +173,7 @@ class CakeSocketTest extends CakeTestCase {
  */
 	public function testSocketReading() {
 		$this->Socket = new CakeSocket(array('timeout' => 5));
+		try {
 			$this->Socket->connect();
 			$this->assertEquals(null, $this->Socket->read(26));
 
@@ -169,6 +182,9 @@ class CakeSocketTest extends CakeTestCase {
 			$this->assertTrue($this->Socket->connect());
 			$this->assertEquals(null, $this->Socket->read(26));
 			$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
 	}
 
 /**
@@ -179,12 +195,16 @@ class CakeSocketTest extends CakeTestCase {
 	public function testTimeOutConnection() {
 		$config = array('host' => '127.0.0.1', 'timeout' => 0.5);
 		$this->Socket = new CakeSocket($config);
+		try {
 			$this->assertTrue($this->Socket->connect());
 
 			$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
 			$this->Socket = new CakeSocket($config);
 			$this->assertFalse($this->Socket->read(1024 * 1024));
 			$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
 	}
 
 /**
@@ -256,7 +276,11 @@ class CakeSocketTest extends CakeTestCase {
 		$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
 		$configSslTls = array('host' => 'smtp.gmail.com', 'port' => 465, 'timeout' => 5);
 		$this->Socket = new CakeSocket($configSslTls);
+		try {
 			$this->Socket->connect();
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
 	}
 
 /**

lib/Cake/Test/Case/Routing/DispatcherTest.php

@@ -208,6 +208,16 @@ class SomePagesController extends AppController {
 		return new CakeResponse(array('body' => 'new response'));
 	}
 
+/**
+ * Test file sending
+ *
+ * @return CakeResponse
+ */
+	public function sendfile() {
+		$this->response->file(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css');
+		return $this->response;
+	}
+
 }
 
 /**
@@ -376,7 +386,7 @@ class SomePostsController extends AppController {
  * @return void
  */
 	public function beforeFilter() {
-		if ($this->params['action'] == 'index') {
+		if ($this->params['action'] === 'index') {
 			$this->params['action'] = 'view';
 		} else {
 			$this->params['action'] = 'change';
@@ -866,6 +876,40 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertEquals('new response', $result);
 	}
 
+/**
+ * testDispatchActionSendsFile
+ *
+ * @return void
+ */
+	public function testDispatchActionSendsFile() {
+		Router::connect('/:controller/:action');
+		$Dispatcher = new Dispatcher();
+		$request = new CakeRequest('some_pages/sendfile');
+		$response = $this->getMock('CakeResponse', array(
+			'header',
+			'type',
+			'download',
+			'_sendHeader',
+			'_setContentType',
+			'_isActive',
+			'_clearBuffer',
+			'_flushBuffer'
+		));
+
+		$response->expects($this->never())
+			->method('body');
+
+		$response->expects($this->exactly(1))
+			->method('_isActive')
+			->will($this->returnValue(true));
+
+		ob_start();
+		$Dispatcher->dispatch($request, $response);
+		$result = ob_get_clean();
+
+		$this->assertEquals("/* this is the test asset css file */\n", $result);
+	}
+
 /**
  * testAdminDispatch method
  *
@@ -1666,7 +1710,7 @@ class DispatcherTest extends CakeTestCase {
  */
 	protected function _cachePath($here) {
 		$path = $here;
-		if ($here == '/') {
+		if ($here === '/') {
 			$path = 'home';
 		}
 		$path = strtolower(Inflector::slug($path));

lib/Cake/Test/Case/Routing/RouterTest.php

@@ -57,7 +57,7 @@ class RouterTest extends CakeTestCase {
  * @return void
  */
 	public function testFullBaseURL() {
-		$skip = PHP_SAPI == 'cli';
+		$skip = PHP_SAPI === 'cli';
 		if ($skip) {
 			$this->markTestSkipped('Cannot validate base urls in CLI');
 		}

lib/Cake/Test/Case/Utility/FileTest.php

@@ -303,7 +303,7 @@ class FileTest extends CakeTestCase {
  */
 	public function testPrepare() {
 		$string = "some\nvery\ncool\r\nteststring here\n\n\nfor\r\r\n\n\r\n\nhere";
-		if (DS == '\\') {
+		if (DS === '\\') {
 			$expected = "some\r\nvery\r\ncool\r\nteststring here\r\n\r\n\r\n";
 			$expected .= "for\r\n\r\n\r\n\r\n\r\nhere";
 		} else {

lib/Cake/Test/Case/Utility/SecurityTest.php

@@ -256,10 +256,27 @@ class SecurityTest extends CakeTestCase {
 		$result = Security::rijndael('', $key, 'encrypt');
 		$this->assertEquals('', Security::rijndael($result, $key, 'decrypt'));
 
-		$result = Security::rijndael($txt, $key = 'this is my key of over 32 chars, yes it is', 'encrypt');
+		$key = 'this is my key of over 32 chars, yes it is';
+		$result = Security::rijndael($txt, $key, 'encrypt');
 		$this->assertEquals($txt, Security::rijndael($result, $key, 'decrypt'));
 	}
 
+/**
+ * Test that rijndael() can still decrypt values with a fixed iv.
+ *
+ * @return
+ */
+	public function testRijndaelBackwardCompatibility() {
+		$this->skipIf(!function_exists('mcrypt_encrypt'));
+
+		$txt = 'The quick brown fox jumped over the lazy dog.';
+		$key = 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi';
+
+		// Encrypted before random iv
+		$value = base64_decode('1WPjnq96LMzLGwNgmudHF+cAIqVUN5DaUZEpf5tm1EzSgt5iYY9o3d66iRI/fKJLTlTVGsa8HzW0jDNitmVXoQ==');
+		$this->assertEquals($txt, Security::rijndael($value, $key, 'decrypt'));
+	}
+
 /**
  * testRijndaelInvalidOperation method
  *

lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php

@@ -20,7 +20,7 @@
 class TestAppCacheEngine extends CacheEngine {
 
 	public function write($key, $value, $duration) {
-		if ($key == 'fail') {
+		if ($key === 'fail') {
 			return false;
 		}
 	}

lib/Cake/TestSuite/CakeTestCase.php

@@ -380,7 +380,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 				$tags = (string)$tags;
 			}
 			$i++;
-			if (is_string($tags) && $tags{0} == '<') {
+			if (is_string($tags) && $tags{0} === '<') {
 				$tags = array(substr($tags, 1) => array());
 			} elseif (is_string($tags)) {
 				$tagsTrimmed = preg_replace('/\s+/m', '', $tags);
@@ -388,7 +388,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 				if (preg_match('/^\*?\//', $tags, $match) && $tagsTrimmed !== '//') {
 					$prefix = array(null, null);
 
-					if ($match[0] == '*/') {
+					if ($match[0] === '*/') {
 						$prefix = array('Anything, ', '.*?');
 					}
 					$regex[] = array(

lib/Cake/TestSuite/ControllerTestCase.php

@@ -186,7 +186,7 @@ abstract class ControllerTestCase extends CakeTestCase {
  * @throws BadMethodCallException when you call methods that don't exist.
  */
 	public function __call($name, $arguments) {
-		if ($name == 'testAction') {
+		if ($name === 'testAction') {
 			return call_user_func_array(array($this, '_testAction'), $arguments);
 		}
 		throw new BadMethodCallException("Method '{$name}' does not exist.");
@@ -226,7 +226,7 @@ abstract class ControllerTestCase extends CakeTestCase {
 
 		$_SERVER['REQUEST_METHOD'] = strtoupper($options['method']);
 		if (is_array($options['data'])) {
-			if (strtoupper($options['method']) == 'GET') {
+			if (strtoupper($options['method']) === 'GET') {
 				$_GET = $options['data'];
 				$_POST = array();
 			} else {
@@ -263,7 +263,7 @@ abstract class ControllerTestCase extends CakeTestCase {
 			$this->generate($plugin . Inflector::camelize($request->params['controller']));
 		}
 		$params = array();
-		if ($options['return'] == 'result') {
+		if ($options['return'] === 'result') {
 			$params['return'] = 1;
 			$params['bare'] = 1;
 			$params['requested'] = 1;

lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php

@@ -157,14 +157,14 @@ HTML;
 		<script type="text/javascript">
 		function coverage_show_hide(selector) {
 			var element = document.getElementById(selector);
-			element.style.display = (element.style.display == 'none') ? '' : 'none';
+			element.style.display = (element.style.display === 'none') ? '' : 'none';
 		}
 		function coverage_toggle_all() {
 			var divs = document.querySelectorAll('div.coverage-container');
 			var i = divs.length;
 			while (i--) {
 				if (divs[i] && divs[i].className.indexOf('primary') == -1) {
-					divs[i].style.display = (divs[i].style.display == 'none') ? '' : 'none';
+					divs[i].style.display = (divs[i].style.display === 'none') ? '' : 'none';
 				}
 			}
 		}
@@ -183,7 +183,7 @@ HTML;
 		$filename = basename($filename);
 		list($file, $ext) = explode('.', $filename);
 		$display = in_array($file, $this->_testNames) ? 'block' : 'none';
-		$primary = $display == 'block' ? 'primary' : '';
+		$primary = $display === 'block' ? 'primary' : '';
 		return <<<HTML
 	<div class="coverage-container $primary" style="display:$display;">
 	<h4>

lib/Cake/Utility/CakeNumber.php

@@ -134,7 +134,7 @@ class CakeNumber {
 			return $size * pow(1024, $i + 1);
 		}
 
-		if (substr($size, -1) == 'B' && ctype_digit(substr($size, 0, -1))) {
+		if (substr($size, -1) === 'B' && ctype_digit(substr($size, 0, -1))) {
 			$size = substr($size, 0, -1);
 			return (int)$size;
 		}
@@ -329,14 +329,14 @@ class CakeNumber {
 			}
 		}
 
-		$position = $options[$symbolKey . 'Position'] != 'after' ? 'before' : 'after';
+		$position = $options[$symbolKey . 'Position'] !== 'after' ? 'before' : 'after';
 		$options[$position] = $options[$symbolKey . 'Symbol'];
 
 		$abs = abs($value);
 		$result = self::format($abs, $options);
 
 		if ($value < 0) {
-			if ($options['negative'] == '()') {
+			if ($options['negative'] === '()') {
 				$result = '(' . $result . ')';
 			} else {
 				$result = $options['negative'] . $result;

lib/Cake/Utility/CakeTime.php

@@ -165,7 +165,7 @@ class CakeTime {
 				break;
 			case 'c':
 				$format = __dc('cake', 'd_t_fmt', 5);
-				if ($format != 'd_t_fmt') {
+				if ($format !== 'd_t_fmt') {
 					return self::convertSpecifiers($format, self::$_time);
 				}
 				break;
@@ -206,12 +206,12 @@ class CakeTime {
 				$format = __dc('cake', 'am_pm', 5);
 				if (is_array($format)) {
 					$meridiem = $format[$meridiem];
-					return ($specifier[1] == 'P') ? strtolower($meridiem) : strtoupper($meridiem);
+					return ($specifier[1] === 'P') ? strtolower($meridiem) : strtoupper($meridiem);
 				}
 				break;
 			case 'r':
 				$complete = __dc('cake', 't_fmt_ampm', 5);
-				if ($complete != 't_fmt_ampm') {
+				if ($complete !== 't_fmt_ampm') {
 					return str_replace('%p', self::_translateSpecifier(array('%p', 'p')), $complete);
 				}
 				break;
@@ -225,13 +225,13 @@ class CakeTime {
 				return ($weekDay = date('w', self::$_time)) ? $weekDay : 7;
 			case 'x':
 				$format = __dc('cake', 'd_fmt', 5);
-				if ($format != 'd_fmt') {
+				if ($format !== 'd_fmt') {
 					return self::convertSpecifiers($format, self::$_time);
 				}
 				break;
 			case 'X':
 				$format = __dc('cake', 't_fmt', 5);
-				if ($format != 't_fmt') {
+				if ($format !== 't_fmt') {
 					return self::convertSpecifiers($format, self::$_time);
 				}
 				break;

lib/Cake/Utility/Debugger.php

@@ -257,7 +257,7 @@ class Debugger {
 		);
 		echo $self->outputError($data);
 
-		if ($error == 'Fatal Error') {
+		if ($error === 'Fatal Error') {
 			exit();
 		}
 		return true;
@@ -326,9 +326,9 @@ class Debugger {
 			if (in_array($signature, $options['exclude'])) {
 				continue;
 			}
-			if ($options['format'] == 'points' && $trace['file'] != '[internal]') {
+			if ($options['format'] === 'points' && $trace['file'] !== '[internal]') {
 				$back[] = array('file' => $trace['file'], 'line' => $trace['line']);
-			} elseif ($options['format'] == 'array') {
+			} elseif ($options['format'] === 'array') {
 				$back[] = $trace;
 			} else {
 				if (isset($self->_templates[$options['format']]['traceLine'])) {
@@ -343,7 +343,7 @@ class Debugger {
 			}
 		}
 
-		if ($options['format'] == 'array' || $options['format'] == 'points') {
+		if ($options['format'] === 'array' || $options['format'] === 'points') {
 			return $back;
 		}
 		return implode("\n", $back);
@@ -847,7 +847,7 @@ class Debugger {
  * @return void
  */
 	public static function checkSecurityKeys() {
-		if (Configure::read('Security.salt') == 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi') {
+		if (Configure::read('Security.salt') === 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi') {
 			trigger_error(__d('cake_dev', 'Please change the value of \'Security.salt\' in app/Config/core.php to a salt value specific to your application'), E_USER_NOTICE);
 		}
 

lib/Cake/Utility/File.php

@@ -212,7 +212,7 @@ class File {
  */
 	public static function prepare($data, $forceWindows = false) {
 		$lineBreak = "\n";
-		if (DIRECTORY_SEPARATOR == '\\' || $forceWindows === true) {
+		if (DIRECTORY_SEPARATOR === '\\' || $forceWindows === true) {
 			$lineBreak = "\r\n";
 		}
 		return strtr($data, array("\r\n" => $lineBreak, "\n" => $lineBreak, "\r" => $lineBreak));

lib/Cake/Utility/Folder.php

@@ -267,7 +267,7 @@ class Folder {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isWindowsPath
  */
 	public static function isWindowsPath($path) {
-		return (preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) == '\\\\');
+		return (preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) === '\\\\');
 	}
 
 /**
@@ -278,7 +278,7 @@ class Folder {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isAbsolute
  */
 	public static function isAbsolute($path) {
-		return !empty($path) && ($path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) == '\\\\');
+		return !empty($path) && ($path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) === '\\\\');
 	}
 
 /**
@@ -460,7 +460,7 @@ class Folder {
 		foreach ($iterator as $itemPath => $fsIterator) {
 			if ($skipHidden) {
 				$subPathName = $fsIterator->getSubPathname();
-				if ($subPathName{0} == '.' || strpos($subPathName, DS . '.') !== false) {
+				if ($subPathName{0} === '.' || strpos($subPathName, DS . '.') !== false) {
 					continue;
 				}
 			}

lib/Cake/Utility/Hash.php

@@ -770,7 +770,7 @@ class Hash {
 
 		$dir = strtolower($dir);
 		$type = strtolower($type);
-		if ($type == 'natural' && version_compare(PHP_VERSION, '5.4.0', '<')) {
+		if ($type === 'natural' && version_compare(PHP_VERSION, '5.4.0', '<')) {
 			$type = 'regular';
 		}
 		if ($dir === 'asc') {

lib/Cake/Utility/Inflector.php

@@ -271,7 +271,7 @@ class Inflector {
 			return;
 		}
 		foreach (self::$_initialState as $key => $val) {
-			if ($key != '_initialState') {
+			if ($key !== '_initialState') {
 				self::${$key} = $val;
 			}
 		}

lib/Cake/Utility/Security.php

@@ -120,14 +120,14 @@ class Security {
 			$string = $salt . $string;
 		}
 
-		if (!$type || $type == 'sha1') {
+		if (!$type || $type === 'sha1') {
 			if (function_exists('sha1')) {
 				return sha1($string);
 			}
 			$type = 'sha256';
 		}
 
-		if ($type == 'sha256' && function_exists('mhash')) {
+		if ($type === 'sha256' && function_exists('mhash')) {
 			return bin2hex(mhash(MHASH_SHA256, $string));
 		}
 
@@ -198,8 +198,12 @@ class Security {
 /**
  * Encrypts/Decrypts a text using the given key using rijndael method.
  *
+ * Prior to 2.3.1, a fixed initialization vector was used. This was not
+ * secure. This method now uses a random iv, and will silently upgrade values when
+ * they are re-encrypted.
+ *
  * @param string $text Encrypted string to decrypt, normal string to encrypt
- * @param string $key Key to use
+ * @param string $key Key to use as the encryption key for encrypted data.
  * @param string $operation Operation to perform, encrypt or decrypt
  * @return string Encrypted/Descrypted string
  */
@@ -216,14 +220,23 @@ class Security {
 			trigger_error(__d('cake_dev', 'You must use a key larger than 32 bytes for Security::rijndael()'), E_USER_WARNING);
 			return '';
 		}
-		$algorithm = 'rijndael-256';
+		$algorithm = MCRYPT_RIJNDAEL_256;
-		$mode = 'cbc';
+		$mode = MCRYPT_MODE_CBC;
+		$ivSize = mcrypt_get_iv_size($algorithm, $mode);
+
 		$cryptKey = substr($key, 0, 32);
-		$iv = substr($key, strlen($key) - 32, 32);
 
 		if ($operation === 'encrypt') {
-			return mcrypt_encrypt($algorithm, $cryptKey, $text, $mode, $iv);
+			$iv = mcrypt_create_iv($ivSize, MCRYPT_RAND);
+			return $iv . '$$' . mcrypt_encrypt($algorithm, $cryptKey, $text, $mode, $iv);
 		}
+		// Backwards compatible decrypt with fixed iv
+		if (substr($text, $ivSize, 2) !== '$$') {
+			$iv = substr($key, strlen($key) - 32, 32);
+			return rtrim(mcrypt_decrypt($algorithm, $cryptKey, $text, $mode, $iv), "\0");
+		}
+		$iv = substr($text, 0, $ivSize);
+		$text = substr($text, $ivSize + 2);
 		return rtrim(mcrypt_decrypt($algorithm, $cryptKey, $text, $mode, $iv), "\0");
 	}
 

lib/Cake/Utility/String.php

@@ -477,7 +477,7 @@ class String {
 		);
 		if (isset($options['ending'])) {
 			$default['ellipsis'] = $options['ending'];
-		} elseif (!empty($options['html']) && Configure::read('App.encoding') == 'UTF-8') {
+		} elseif (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') {
 			$default['ellipsis'] = "\xe2\x80\xa6";
 		}
 		$options = array_merge($default, $options);

lib/Cake/Utility/Validation.php

@@ -182,7 +182,7 @@ class Validation {
 					return self::luhn($check, $deep);
 				}
 			}
-		} elseif ($type == 'all') {
+		} elseif ($type === 'all') {
 			foreach ($cards['all'] as $value) {
 				$regex = $value;
 
@@ -533,7 +533,7 @@ class Validation {
  */
 	public static function money($check, $symbolPosition = 'left') {
 		$money = '(?!0,?\d)(?:\d{1,3}(?:([, .])\d{3})?(?:\1\d{3})*|(?:\d+))((?!\1)[,.]\d{2})?';
-		if ($symbolPosition == 'right') {
+		if ($symbolPosition === 'right') {
 			$regex = '/^' . $money . '(?<!\x{00a2})\p{Sc}?$/u';
 		} else {
 			$regex = '/^(?!\x{00a2})\p{Sc}?' . $money . '$/u';

lib/Cake/Utility/Xml.php

@@ -102,12 +102,16 @@ class Xml {
 		} elseif (file_exists($input)) {
 			return self::_loadXml(file_get_contents($input), $options);
 		} elseif (strpos($input, 'http://') === 0 || strpos($input, 'https://') === 0) {
+			try {
 				$socket = new HttpSocket(array('request' => array('redirect' => 10)));
 				$response = $socket->get($input);
 				if (!$response->isOk()) {
 					throw new XmlException(__d('cake_dev', 'XML cannot be read.'));
 				}
 				return self::_loadXml($response->body, $options);
+			} catch (SocketException $e) {
+				throw new XmlException(__d('cake_dev', 'XML cannot be read.'));
+			}
 		} elseif (!is_string($input)) {
 			throw new XmlException(__d('cake_dev', 'Invalid input.'));
 		}

lib/Cake/View/Elements/exception_stack_trace.ctp

@@ -69,7 +69,7 @@ App::uses('Debugger', 'Utility');
 <script type="text/javascript">
 function traceToggle(event, id) {
 	var el = document.getElementById(id);
-	el.style.display = (el.style.display == 'block') ? 'none' : 'block';
+	el.style.display = (el.style.display === 'block') ? 'none' : 'block';
 	event.preventDefault();
 	return false;
 }

lib/Cake/View/Helper.php

@@ -355,7 +355,7 @@ class Helper extends Object {
 
 /**
  * Adds a timestamp to a file based resource based on the value of `Asset.timestamp` in
- * Configure. If Asset.timestamp is true and debug > 0, or Asset.timestamp == 'force'
+ * Configure. If Asset.timestamp is true and debug > 0, or Asset.timestamp === 'force'
  * a timestamp will be added.
  *
  * @param string $path The file path to timestamp, the path must be inside WWW_ROOT

lib/Cake/View/Helper/CacheHelper.php

@@ -127,7 +127,7 @@ class CacheHelper extends AppHelper {
 				}
 			}
 
-			if (!isset($index) && $this->request->params['action'] == 'index') {
+			if (!isset($index) && $this->request->params['action'] === 'index') {
 				$index = 'index';
 			}
 

lib/Cake/View/Helper/FormHelper.php

@@ -793,7 +793,7 @@ class FormHelper extends AppHelper {
 			} else {
 				$text = $fieldName;
 			}
-			if (substr($text, -3) == '_id') {
+			if (substr($text, -3) === '_id') {
 				$text = substr($text, 0, -3);
 			}
 			$text = __(Inflector::humanize(Inflector::underscore($text)));
@@ -993,7 +993,7 @@ class FormHelper extends AppHelper {
 		unset($options['type'], $options['before'], $options['between'], $options['after'], $options['format']);
 
 		$out['error'] = null;
-		if ($type != 'hidden' && $error !== false) {
+		if ($type !== 'hidden' && $error !== false) {
 			$errMsg = $this->error($fieldName, $error);
 			if ($errMsg) {
 				$divOptions = $this->addClass($divOptions, 'error');
@@ -1192,13 +1192,13 @@ class FormHelper extends AppHelper {
  * @return array
  */
 	protected function _getFormat($options) {
-		if ($options['type'] == 'hidden') {
+		if ($options['type'] === 'hidden') {
 			return array('input');
 		}
 		if (is_array($options['format']) && in_array('input', $options['format'])) {
 			return $options['format'];
 		}
-		if ($options['type'] == 'checkbox') {
+		if ($options['type'] === 'checkbox') {
 			return array('before', 'input', 'between', 'label', 'after', 'error');
 		}
 		return array('before', 'label', 'between', 'input', 'after', 'error');
@@ -1246,7 +1246,7 @@ class FormHelper extends AppHelper {
 		) {
 			$options['maxlength'] = $fieldDef['length'];
 		}
-		if ($autoLength && $fieldDef['type'] == 'float') {
+		if ($autoLength && $fieldDef['type'] === 'float') {
 			$options['maxlength'] = array_sum(explode(',', $fieldDef['length'])) + 1;
 		}
 		return $options;
@@ -2053,7 +2053,7 @@ class FormHelper extends AppHelper {
 			)
 		));
 
-		$template = ($style == 'checkbox') ? 'checkboxmultipleend' : 'selectend';
+		$template = ($style === 'checkbox') ? 'checkboxmultipleend' : 'selectend';
 		$select[] = $this->Html->useTag($template);
 		return implode("\n", $select);
 	}
@@ -2503,14 +2503,14 @@ class FormHelper extends AppHelper {
 		if (!empty($timeFormat)) {
 			$time = explode(':', $days[1]);
 
-			if ($time[0] >= '12' && $timeFormat == '12') {
+			if ($time[0] >= '12' && $timeFormat === '12') {
 				$meridian = 'pm';
-			} elseif ($time[0] == '00' && $timeFormat == '12') {
+			} elseif ($time[0] === '00' && $timeFormat === '12') {
 				$time[0] = 12;
 			} elseif ($time[0] >= 12) {
 				$meridian = 'pm';
 			}
-			if ($time[0] == 0 && $timeFormat == '12') {
+			if ($time[0] == 0 && $timeFormat === '12') {
 				$time[0] = 12;
 			}
 			$hour = $min = null;
@@ -2531,7 +2531,7 @@ class FormHelper extends AppHelper {
  * @return array
  */
 	protected function _name($options = array(), $field = null, $key = 'name') {
-		if ($this->requestType == 'get') {
+		if ($this->requestType === 'get') {
 			if ($options === null) {
 				$options = array();
 			} elseif (is_string($options)) {
@@ -2767,7 +2767,7 @@ class FormHelper extends AppHelper {
 				for ($i = $min; $i <= $max; $i++) {
 					$data[$i] = $i;
 				}
-				if ($options['order'] != 'asc') {
+				if ($options['order'] !== 'asc') {
 					$data = array_reverse($data, true);
 				}
 			break;