Permalink
Browse files

== to === and != to !== where applicable

  • Loading branch information...
1 parent ee4a116 commit 111366d5c856e5cb27b60c50c11f6deb69344570 @dereuromark dereuromark committed Feb 12, 2013
Showing with 291 additions and 291 deletions.
  1. +2 −2 lib/Cake/Cache/Engine/MemcacheEngine.php
  2. +1 −1 lib/Cake/Configure/IniReader.php
  3. +3 −3 lib/Cake/Console/Command/AclShell.php
  4. +10 −10 lib/Cake/Console/Command/Task/ControllerTask.php
  5. +9 −9 lib/Cake/Console/Command/Task/DbConfigTask.php
  6. +10 −10 lib/Cake/Console/Command/Task/ExtractTask.php
  7. +7 −7 lib/Cake/Console/Command/Task/FixtureTask.php
  8. +27 −27 lib/Cake/Console/Command/Task/ModelTask.php
  9. +1 −1 lib/Cake/Console/Command/Task/PluginTask.php
  10. +13 −13 lib/Cake/Console/Command/Task/TestTask.php
  11. +6 −6 lib/Cake/Console/Command/Task/ViewTask.php
  12. +1 −1 lib/Cake/Console/Command/TestShell.php
  13. +3 −3 lib/Cake/Console/Command/TestsuiteShell.php
  14. +4 −4 lib/Cake/Console/ConsoleOptionParser.php
  15. +1 −1 lib/Cake/Console/ConsoleOutput.php
  16. +5 −5 lib/Cake/Console/Shell.php
  17. +2 −2 lib/Cake/Console/ShellDispatcher.php
  18. +1 −1 lib/Cake/Console/Templates/default/classes/model.ctp
  19. +1 −1 lib/Cake/Console/Templates/skel/webroot/index.php
  20. +1 −1 lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
  21. +2 −2 lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
  22. +2 −2 lib/Cake/Controller/Component/RequestHandlerComponent.php
  23. +3 −3 lib/Cake/Controller/Controller.php
  24. +3 −3 lib/Cake/Controller/Scaffold.php
  25. +4 −4 lib/Cake/Core/App.php
  26. +1 −1 lib/Cake/Error/ErrorHandler.php
  27. +2 −2 lib/Cake/Error/ExceptionRenderer.php
  28. +2 −2 lib/Cake/I18n/I18n.php
  29. +1 −1 lib/Cake/I18n/Multibyte.php
  30. +1 −1 lib/Cake/Log/Engine/ConsoleLog.php
  31. +1 −1 lib/Cake/Log/Engine/FileLog.php
  32. +4 −4 lib/Cake/Model/Behavior/ContainableBehavior.php
  33. +1 −1 lib/Cake/Model/BehaviorCollection.php
  34. +5 −5 lib/Cake/Model/CakeSchema.php
  35. +14 −14 lib/Cake/Model/Datasource/Database/Postgres.php
  36. +3 −3 lib/Cake/Model/Datasource/Database/Sqlite.php
  37. +10 −10 lib/Cake/Model/Datasource/Database/Sqlserver.php
  38. +4 −4 lib/Cake/Model/Datasource/DboSource.php
  39. +5 −5 lib/Cake/Model/Model.php
  40. +2 −2 lib/Cake/Model/Permission.php
  41. +1 −1 lib/Cake/Model/Validator/CakeValidationRule.php
  42. +5 −5 lib/Cake/Network/CakeRequest.php
  43. +1 −1 lib/Cake/Network/CakeSocket.php
  44. +1 −1 lib/Cake/Network/Email/CakeEmail.php
  45. +3 −3 lib/Cake/Network/Http/HttpSocket.php
  46. +4 −4 lib/Cake/Routing/Router.php
  47. +2 −2 lib/Cake/Test/Case/BasicsTest.php
  48. +1 −1 lib/Cake/Test/Case/Cache/CacheTest.php
  49. +2 −2 lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
  50. +3 −3 lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
  51. +1 −1 lib/Cake/Test/Case/Controller/ControllerTest.php
  52. +1 −1 lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
  53. +2 −2 lib/Cake/Test/Case/Model/AclNodeTest.php
  54. +9 −9 lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
  55. +1 −1 lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
  56. +1 −1 lib/Cake/Test/Case/Model/models.php
  57. +1 −1 lib/Cake/Test/Case/Network/CakeRequestTest.php
  58. +2 −2 lib/Cake/Test/Case/Routing/DispatcherTest.php
  59. +1 −1 lib/Cake/Test/Case/Routing/RouterTest.php
  60. +1 −1 lib/Cake/Test/Case/Utility/FileTest.php
  61. +1 −1 lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
  62. +2 −2 lib/Cake/TestSuite/CakeTestCase.php
  63. +3 −3 lib/Cake/TestSuite/ControllerTestCase.php
  64. +3 −3 lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
  65. +3 −3 lib/Cake/Utility/CakeNumber.php
  66. +5 −5 lib/Cake/Utility/CakeTime.php
  67. +5 −5 lib/Cake/Utility/Debugger.php
  68. +1 −1 lib/Cake/Utility/File.php
  69. +3 −3 lib/Cake/Utility/Folder.php
  70. +1 −1 lib/Cake/Utility/Hash.php
  71. +1 −1 lib/Cake/Utility/Inflector.php
  72. +2 −2 lib/Cake/Utility/Security.php
  73. +1 −1 lib/Cake/Utility/String.php
  74. +2 −2 lib/Cake/Utility/Validation.php
  75. +1 −1 lib/Cake/View/Elements/exception_stack_trace.ctp
  76. +1 −1 lib/Cake/View/Helper.php
  77. +1 −1 lib/Cake/View/Helper/CacheHelper.php
  78. +11 −11 lib/Cake/View/Helper/FormHelper.php
  79. +1 −1 lib/Cake/View/Helper/HtmlHelper.php
  80. +2 −2 lib/Cake/View/Helper/JqueryEngineHelper.php
  81. +4 −4 lib/Cake/View/Helper/MootoolsEngineHelper.php
  82. +3 −3 lib/Cake/View/Helper/PaginatorHelper.php
  83. +6 −6 lib/Cake/View/Helper/PrototypeEngineHelper.php
  84. +1 −1 lib/Cake/View/Helper/RssHelper.php
  85. +1 −1 lib/Cake/View/Helper/SessionHelper.php
  86. +1 −1 lib/Cake/View/ScaffoldView.php
  87. +1 −1 lib/Cake/View/Scaffolds/form.ctp
  88. +1 −1 lib/Cake/View/View.php
  89. +2 −2 lib/Cake/basics.php
View
4 lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -106,10 +106,10 @@ public function init($settings = array()) {
* @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++;
View
2 lib/Cake/Configure/IniReader.php
@@ -160,7 +160,7 @@ public function dump($key, $data) {
$result = array();
foreach ($data as $k => $value) {
$isSection = false;
- if ($k[0] != '[') {
+ if ($k[0] !== '[') {
$result[] = "[$k]";
$isSection = true;
}
View
6 lib/Cake/Console/Command/AclShell.php
@@ -122,14 +122,14 @@ public function create() {
$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 @@ protected function _dataVars($type = null) {
}
$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;
View
20 lib/Cake/Console/Command/Task/ControllerTask.php
@@ -66,7 +66,7 @@ public function execute() {
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 @@ protected function _interactive() {
}
$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,20 +185,20 @@ protected function _interactive() {
list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
}
- if (strtolower($wannaBakeCrud) == 'y') {
- $actions = $this->bakeActions($controllerName, null, strtolower($wannaUseSession) == 'y');
+ if (strtolower($wannaBakeCrud) === '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;
if ($this->interactive === true) {
$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 @@ public function confirmController($controllerName, $useDynamicScaffold, $helpers
$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 @@ public function doComponents() {
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);
View
18 lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -110,7 +110,7 @@ protected function _interactive() {
$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 @@ protected function _interactive() {
$port = $this->in(__d('cake_console', 'Port?'), null, 'n');
}
- if (strtolower($port) == 'n') {
+ if (strtolower($port) === 'n') {
$port = null;
}
@@ -142,7 +142,7 @@ protected function _interactive() {
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,25 +157,25 @@ protected function _interactive() {
while (!$prefix) {
$prefix = $this->in(__d('cake_console', 'Table Prefix?'), null, 'n');
}
- if (strtolower($prefix) == 'n') {
+ if (strtolower($prefix) === 'n') {
$prefix = null;
}
$encoding = '';
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 @@ protected function _interactive() {
$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 @@ protected function _verify($config) {
$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;
View
20 lib/Cake/Console/Command/Task/ExtractTask.php
@@ -388,14 +388,14 @@ protected function _parse($functionName, $map) {
}
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 @@ protected function _buildFiles() {
}
$this->_store($domain, $header, $sentence);
- if ($domain != 'default' && $this->_merge) {
+ if ($domain !== 'default' && $this->_merge) {
$this->_store('default', $header, $sentence);
}
}
@@ -640,11 +640,11 @@ protected function _writeHeader() {
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 @@ protected function _getStrings(&$position, $target) {
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 @@ protected function _markerError($file, $line, $marker, $count) {
$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--;
}
}
View
14 lib/Cake/Console/Command/Task/FixtureTask.php
@@ -107,7 +107,7 @@ public function execute() {
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 @@ protected function _interactive() {
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 @@ public function bake($model, $useTable = false, $importOptions = array()) {
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 @@ protected function _generateRecords($tableInfo, $recordCount = 1) {
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) {
View
54 lib/Cake/Console/Command/Task/ModelTask.php
@@ -98,7 +98,7 @@ public function execute() {
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 @@ protected function _getModelObject($className, $table = null) {
$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 @@ protected function _interactive() {
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 @@ protected function _interactive() {
$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 @@ protected function _interactive() {
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 @@ protected function _interactive() {
$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 @@ protected function _printAssociation($modelName, $type, $associations) {
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 @@ public function findDisplayField($fields) {
$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 @@ public function initValidations() {
sort($options);
$default = 1;
foreach ($options as $option) {
- if ($option{0} != '_') {
+ if ($option{0} !== '_') {
$choices[$default] = strtolower($option);
$default++;
}
@@ -402,7 +402,7 @@ public function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
$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 @@ public function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
$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 @@ public function findBelongsTo(Model $model, $associations) {
$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 @@ public function findHasOneAndMany(Model $model, $associations) {
'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 @@ public function confirmAssociations(Model $model, $associations) {
if ('n' == strtolower($response)) {
unset($associations[$type][$i]);
- } elseif ($type == 'hasMany') {
+ } elseif ($type === 'hasMany') {
unset($associations['hasOne'][$i]);
}
}
@@ -755,7 +755,7 @@ protected function _generatePossibleKeys() {
$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 @@ public function getTable($modelName, $useDbConfig = null) {
$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?'));
}
}
View
2 lib/Cake/Console/Command/Task/PluginTask.php
@@ -107,7 +107,7 @@ public function bake($plugin) {
$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',
View
26 lib/Cake/Console/Command/Task/TestTask.php
@@ -198,7 +198,7 @@ public function getObjectType() {
}
$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 @@ public function &buildTestSubject($type, $class) {
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 @@ public function &buildTestSubject($type, $class) {
* @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 @@ public function getTestableMethods($className) {
$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 @@ protected function _processModel($subject) {
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 @@ protected function _addFixture($name) {
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 @@ public function getUserFixtures() {
*/
public function hasMockClass($type) {
$type = strtolower($type);
- return $type == 'controller';
+ return $type === 'controller';
}
/**
@@ -486,17 +486,17 @@ public function hasMockClass($type) {
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 @@ public function generateConstructor($type, $fullClassName, $plugin) {
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');
}
View
12 lib/Cake/Console/Command/Task/ViewTask.php
@@ -100,7 +100,7 @@ public function execute() {
$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 @@ protected function _interactive() {
$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 @@ protected function _interactive() {
$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 @@ public function customAction() {
$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 {
View
2 lib/Cake/Console/Command/TestShell.php
@@ -326,7 +326,7 @@ public function available() {
break;
}
- if ($choice == 'q') {
+ if ($choice === 'q') {
break;
}
}
View
6 lib/Cake/Console/Command/TestsuiteShell.php
@@ -67,11 +67,11 @@ protected function _parseArgs() {
$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;
}
View
8 lib/Cake/Console/ConsoleOptionParser.php
@@ -470,9 +470,9 @@ public function parse($argv, $command = null) {
$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 @@ public function help($subcommand = null, $format = 'text', $width = 72) {
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();
}
}
View
2 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;
}
}
View
10 lib/Cake/Console/Shell.php
@@ -290,7 +290,7 @@ public function hasMethod($name) {
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 @@ public function runCommand($command, $argv) {
*/
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 @@ public function createFile($path, $contents) {
$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 @@ protected function _checkUnitTest() {
$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();
View
4 lib/Cake/Console/ShellDispatcher.php
@@ -201,7 +201,7 @@ public function dispatch() {
}
$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 @@ public function parseParams($args) {
}
}
- 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']);
View
2 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
*
View
2 lib/Cake/Console/Templates/skel/webroot/index.php
@@ -77,7 +77,7 @@
}
// 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;
}
View
2 lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
@@ -23,7 +23,7 @@
* {{{
* public function isAuthorized($user) {
* if (!empty($this->request->params['admin'])) {
- * return $user['role'] == 'admin';
+ * return $user['role'] === 'admin';
* }
* return !empty($user);
* }
View
4 lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
@@ -188,7 +188,7 @@ protected function _getDigest() {
$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 @@ protected function _getDigest() {
* @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();
View
4 lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -130,7 +130,7 @@ public function initialize(Controller $controller) {
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 @@ public function renderAs(Controller $controller, $type, $options = array()) {
}
$options = array_merge($defaults, $options);
- if ($type == 'ajax') {
+ if ($type === 'ajax') {
$controller->layout = $this->ajaxLayout;
return $this->respondAs('html', $options);
}
View
6 lib/Cake/Controller/Controller.php
@@ -963,7 +963,7 @@ public function referer($default = null, $local = false) {
}
$referer = $this->request->referer($local);
- if ($referer == '/' && $default) {
+ if ($referer === '/' && $default) {
return Router::url($default, true);
}
return $referer;
@@ -1048,13 +1048,13 @@ public function postConditions($data = array(), $op = null, $bool = 'AND', $excl
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;
View
6 lib/Cake/Controller/Scaffold.php
@@ -227,7 +227,7 @@ protected function _scaffoldSave(CakeRequest $request, $action = 'edit') {
}
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 @@ protected function _scaffoldSave(CakeRequest $request, $action = 'edit') {
}
if (!empty($request->data)) {
- if ($action == 'create') {
+ if ($action === 'create') {
$this->ScaffoldModel->create();
}
@@ -443,7 +443,7 @@ protected function _associations() {
$associations[$type][$assocKey]['controller'] =
Inflector::pluralize(Inflector::underscore($model));
- if ($type == 'hasAndBelongsToMany') {
+ if ($type === 'hasAndBelongsToMany') {
$associations[$type][$assocKey]['with'] = $assocData['with'];
}
}
View
8 lib/Cake/Core/App.php
@@ -433,7 +433,7 @@ public static function objects($type, $path = null, $cache = true) {
$type = 'plugins';
}
- if ($type == 'plugins') {
+ if ($type === 'plugins') {
$extension = '/.*/';
$includeDirectories = true;
}
@@ -637,11 +637,11 @@ public static function import($type = null, $name = null, $parent = true, $searc
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 @@ public static function import($type = null, $name = null, $parent = true, $searc
* @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'];
View
2 lib/Cake/Error/ErrorHandler.php
@@ -149,7 +149,7 @@ protected static function _getMessage($exception) {
$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();
View
4 lib/Cake/Error/ExceptionRenderer.php
@@ -104,7 +104,7 @@ public function __construct(Exception $exception) {
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 @@ public function __construct(Exception $exception) {
}
$isNotDebug = !Configure::read('debug');
- if ($isNotDebug && $method == '_cakeError') {
+ if ($isNotDebug && $method === '_cakeError') {
$method = 'error400';
}
if ($isNotDebug && $code == 500) {
View
4 lib/Cake/I18n/I18n.php
@@ -174,7 +174,7 @@ public static function translate($singular, $plural = null, $domain = null, $cat
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 @@ public static function loadMo($filename) {
$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"]);
View
2 lib/Cake/I18n/Multibyte.php
@@ -750,7 +750,7 @@ public static function mimeEncode($string, $charset = null, $newline = "\r\n") {
$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);
View
2 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;
View
2 lib/Cake/Log/Engine/FileLog.php
@@ -76,7 +76,7 @@ public function write($type, $message) {
if (!empty($this->_file)) {
$filename = $this->_path . $this->_file;
- } elseif ($type == 'error' || $type == 'warning') {
+ } elseif ($type === 'error' || $type === 'warning') {
$filename = $this->_path . 'error.log';
} elseif (in_array($type, $debugTypes)) {
$filename = $this->_path . 'debug.log';
View
8 lib/Cake/Model/Behavior/ContainableBehavior.php
@@ -200,7 +200,7 @@ public function beforeFind(Model $Model, $query) {
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 @@ public function containments(Model $Model, $contain, $containments = array(), $t
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 @@ public function fieldDependencies(Model $Model, $map, $fields = array()) {
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--';
}
}
View
2 lib/Cake/Model/BehaviorCollection.php
@@ -160,7 +160,7 @@ public function load($behavior, $config = array()) {
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) {
View
10 lib/Cake/Model/CakeSchema.php
@@ -227,7 +227,7 @@ public function read($options = array()) {
foreach ($models as $model) {
$importModel = $model;
$plugin = null;
- if ($model == 'AppModel') {
+ if ($model === 'AppModel') {
continue;
}
@@ -412,22 +412,22 @@ public function generateTable($table, $fields) {
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);
}
$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 @@ public function compare($old, $new = null) {
}
$tables = array();
foreach ($new as $table => $fields) {
- if ($table == 'missing') {
+ if ($table === 'missing') {
continue;
}
if (!array_key_exists($table, $old)) {
View
28 lib/Cake/Model/Datasource/Database/Postgres.php
@@ -199,10 +199,10 @@ public function describe($model) {
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 +217,7 @@ public function describe($model) {
}
$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 +234,7 @@ public function describe($model) {
}
}
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 +247,7 @@ public function describe($model) {
$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 +382,7 @@ public function fields(Model $model, $alias = null, $fields = array(), $quote =
$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]};
@@ -576,7 +576,7 @@ protected function _alterIndexes($table, $indexes) {
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 +587,7 @@ protected function _alterIndexes($table, $indexes) {
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 +663,11 @@ public function column($real) {
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 +693,7 @@ public function length($real) {
if (strpos($col, '(') !== false) {
list($col, $limit) = explode('(', $col);
}
- if ($col == 'uuid') {
+ if ($col === 'uuid') {
return 36;
}
if ($limit) {
@@ -852,7 +852,7 @@ public function buildColumn($column) {
$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 +872,7 @@ public function buildIndex($indexes, $table = null) {
return array();
}
foreach ($indexes as $name => $value) {
- if ($name == 'PRIMARY') {
+ if ($name === 'PRIMARY') {
$out = 'PRIMARY KEY (' . $this->name($value['column']) . ')';
} else {
$out = 'CREATE ';
View
6 lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -357,7 +357,7 @@ public function fetchResult() {
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 @@ public function buildColumn($column) {
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 @@ public function buildIndex($indexes, $table = null) {
foreach ($indexes as $name => $value) {
- if ($name == 'PRIMARY') {
+ if ($name === 'PRIMARY') {
continue;
}
$out = 'CREATE ';
View
20 lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -227,15 +227,15 @@ public function describe($model) {
$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']);
}
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 @@ public function fields(Model $model, $alias = null, $fields = array(), $quote =
}
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 @@ public function fields(Model $model, $alias = null, $fields = array(), $quote =
$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 @@ public function column($real) {
$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 @@ public function column($real) {
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 @@ public function resultSet($results) {
} else {
$map = array(0, $name);
}