Skip to content
This repository
Browse code

Adhere to code formatting standard

  • Loading branch information...
commit 94e119fe67720d535bae697902cdf2bf1e706e67 1 parent 49708ec
Kyle Robinson Young authored November 30, 2011

Showing 84 changed files with 474 additions and 474 deletions. Show diff stats Hide diff stats

  1. 2  lib/Cake/Cache/Cache.php
  2. 4  lib/Cake/Cache/Engine/FileEngine.php
  3. 4  lib/Cake/Cache/Engine/MemcacheEngine.php
  4. 2  lib/Cake/Console/Command/ConsoleShell.php
  5. 16  lib/Cake/Console/Command/Task/DbConfigTask.php
  6. 16  lib/Cake/Console/Command/Task/ModelTask.php
  7. 2  lib/Cake/Console/Command/Task/ProjectTask.php
  8. 2  lib/Cake/Console/Command/Task/TestTask.php
  9. 8  lib/Cake/Console/Command/Task/ViewTask.php
  10. 2  lib/Cake/Console/Command/UpgradeShell.php
  11. 4  lib/Cake/Console/Shell.php
  12. 2  lib/Cake/Console/Templates/default/actions/controller_actions.ctp
  13. 42  lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
  14. 12  lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
  15. 6  lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
  16. 20  lib/Cake/Console/Templates/skel/Config/core.php
  17. 2  lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
  18. 134  lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
  19. 2  lib/Cake/I18n/I18n.php
  20. 2  lib/Cake/Model/Behavior/ContainableBehavior.php
  21. 2  lib/Cake/Model/Behavior/TranslateBehavior.php
  22. 2  lib/Cake/Model/CakeSchema.php
  23. 2  lib/Cake/Model/Datasource/Database/Sqlite.php
  24. 4  lib/Cake/Model/Datasource/DboSource.php
  25. 2  lib/Cake/Model/Model.php
  26. 2  lib/Cake/Test/Case/BasicsTest.php
  27. 8  lib/Cake/Test/Case/Cache/CacheTest.php
  28. 6  lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
  29. 6  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
  30. 2  lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
  31. 2  lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
  32. 36  lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
  33. 2  lib/Cake/Test/Case/Controller/ControllerTest.php
  34. 10  lib/Cake/Test/Case/Controller/ScaffoldTest.php
  35. 2  lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
  36. 4  lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
  37. 2  lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
  38. 8  lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
  39. 10  lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
  40. 24  lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
  41. 54  lib/Cake/Test/Case/Model/ModelIntegrationTest.php
  42. 44  lib/Cake/Test/Case/Model/ModelReadTest.php
  43. 30  lib/Cake/Test/Case/Model/ModelWriteTest.php
  44. 34  lib/Cake/Test/Case/Model/models.php
  45. 2  lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
  46. 24  lib/Cake/Test/Case/Routing/DispatcherTest.php
  47. 36  lib/Cake/Test/Case/Routing/RouterTest.php
  48. 2  lib/Cake/Test/Case/Utility/FileTest.php
  49. 68  lib/Cake/Test/Case/Utility/SetTest.php
  50. 2  lib/Cake/Test/Case/Utility/XmlTest.php
  51. 10  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  52. 8  lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
  53. 20  lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
  54. 12  lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
  55. 6  lib/Cake/Test/Case/View/Helper/RssHelperTest.php
  56. 12  lib/Cake/Test/Case/View/Helper/TextHelperTest.php
  57. 8  lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
  58. 2  lib/Cake/Test/Case/View/HelperTest.php
  59. 10  lib/Cake/Test/Case/View/ScaffoldViewTest.php
  60. 2  lib/Cake/Test/Fixture/AcoFixture.php
  61. 2  lib/Cake/Test/Fixture/AcoTwoFixture.php
  62. 20  lib/Cake/Test/Fixture/AroTwoFixture.php
  63. 2  lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php
  64. 2  lib/Cake/Test/Fixture/ArticlesTagFixture.php
  65. 2  lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php
  66. 4  lib/Cake/Test/Fixture/BakeCommentFixture.php
  67. 4  lib/Cake/Test/Fixture/CommentFixture.php
  68. 4  lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php
  69. 2  lib/Cake/Test/Fixture/DatatypeFixture.php
  70. 6  lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
  71. 40  lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
  72. 2  lib/Cake/Test/Fixture/StoriesTagFixture.php
  73. 4  lib/Cake/Test/Fixture/TestPluginCommentFixture.php
  74. 14  lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
  75. 2  lib/Cake/Test/test_app/View/Layouts/default.ctp
  76. 2  lib/Cake/Utility/Folder.php
  77. 2  lib/Cake/Utility/Inflector.php
  78. 2  lib/Cake/Utility/Set.php
  79. 4  lib/Cake/View/Helper.php
  80. 2  lib/Cake/View/Helper/HtmlHelper.php
  81. 8  lib/Cake/View/Helper/NumberHelper.php
  82. 6  lib/Cake/View/Helper/PaginatorHelper.php
  83. 2  lib/Cake/View/Layouts/default.ctp
  84. 4  lib/Cake/View/Scaffolds/form.ctp
2  lib/Cake/Cache/Cache.php
@@ -505,7 +505,7 @@ public static function settings($name = 'default') {
505 505
  */
506 506
 	public function init($settings = array()) {
507 507
 		$this->settings = array_merge(
508  
-			array('prefix' => 'cake_', 'duration'=> 3600, 'probability'=> 100),
  508
+			array('prefix' => 'cake_', 'duration' => 3600, 'probability' => 100),
509 509
 			$this->settings,
510 510
 			$settings
511 511
 		);
4  lib/Cake/Cache/Engine/FileEngine.php
@@ -66,8 +66,8 @@ class FileEngine extends CacheEngine {
66 66
 	public function init($settings = array()) {
67 67
 		parent::init(array_merge(
68 68
 			array(
69  
-				'engine' => 'File', 'path' => CACHE, 'prefix'=> 'cake_', 'lock'=> true,
70  
-				'serialize'=> true, 'isWindows' => false, 'mask' => 0664
  69
+				'engine' => 'File', 'path' => CACHE, 'prefix' => 'cake_', 'lock' => true,
  70
+				'serialize' => true, 'isWindows' => false, 'mask' => 0664
71 71
 			),
72 72
 			$settings
73 73
 		));
4  lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -59,10 +59,10 @@ public function init($settings = array()) {
59 59
 			return false;
60 60
 		}
61 61
 		parent::init(array_merge(array(
62  
-			'engine'=> 'Memcache',
  62
+			'engine' => 'Memcache',
63 63
 			'prefix' => Inflector::slug(APP_DIR) . '_',
64 64
 			'servers' => array('127.0.0.1'),
65  
-			'compress'=> false,
  65
+			'compress' => false,
66 66
 			'persistent' => true
67 67
 			), $settings)
68 68
 		);
2  lib/Cake/Console/Command/ConsoleShell.php
@@ -117,7 +117,7 @@ public function help() {
117 117
 		$out .= "\n";
118 118
 		$out .= "will return something like the following:";
119 119
 		$out .= "\n";
120  
-		$out .= "\tarray (";
  120
+		$out .= "\tarray(";
121 121
 		$out .= "\t  [...]";
122 122
 		$out .= "\t  'controller' => 'posts',";
123 123
 		$out .= "\t  'action' => 'view',";
16  lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -39,14 +39,14 @@ class DbConfigTask extends AppShell {
39 39
  */
40 40
 	protected $_defaultConfig = array(
41 41
 		'name' => 'default',
42  
-		'datasource'=> 'Database/Mysql',
43  
-		'persistent'=> 'false',
44  
-		'host'=> 'localhost',
45  
-		'login'=> 'root',
46  
-		'password'=> 'password',
47  
-		'database'=> 'project_name',
48  
-		'schema'=> null,
49  
-		'prefix'=> null,
  42
+		'datasource' => 'Database/Mysql',
  43
+		'persistent' => 'false',
  44
+		'host' => 'localhost',
  45
+		'login' => 'root',
  46
+		'password' => 'password',
  47
+		'database' => 'project_name',
  48
+		'schema' => null,
  49
+		'prefix' => null,
50 50
 		'encoding' => null,
51 51
 		'port' => null
52 52
 	);
16  lib/Cake/Console/Command/Task/ModelTask.php
@@ -220,13 +220,13 @@ protected function _interactive() {
220 220
 		}
221 221
 
222 222
 		$prompt = __d('cake_console', "Would you like to supply validation criteria \nfor the fields in your model?");
223  
-		$wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
  223
+		$wannaDoValidation = $this->in($prompt, array('y', 'n'), 'y');
224 224
 		if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) == 'y') {
225 225
 			$validate = $this->doValidation($tempModel);
226 226
 		}
227 227
 
228 228
 		$prompt = __d('cake_console', "Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?");
229  
-		$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
  229
+		$wannaDoAssoc = $this->in($prompt, array('y', 'n'), 'y');
230 230
 		if (strtolower($wannaDoAssoc) == 'y') {
231 231
 			$associations = $this->doAssociations($tempModel);
232 232
 		}
@@ -258,7 +258,7 @@ protected function _interactive() {
258 258
 		}
259 259
 
260 260
 		$this->hr();
261  
-		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y');
  261
+		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
262 262
 
263 263
 		if (strtolower($looksGood) == 'y') {
264 264
 			$vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField');
@@ -486,7 +486,7 @@ public function doAssociations($model) {
486 486
 		}
487 487
 
488 488
 		$associations = array(
489  
-			'belongsTo' => array(), 'hasMany' => array(), 'hasOne'=> array(), 'hasAndBelongsToMany' => array()
  489
+			'belongsTo' => array(), 'hasMany' => array(), 'hasOne' => array(), 'hasAndBelongsToMany' => array()
490 490
 		);
491 491
 
492 492
 		$associations = $this->findBelongsTo($model, $associations);
@@ -635,7 +635,7 @@ public function confirmAssociations($model, $associations) {
635 635
 			if (!empty($associations[$type])) {
636 636
 				foreach ($associations[$type] as $i => $assoc) {
637 637
 					$prompt = "{$model->name} {$type} {$assoc['alias']}?";
638  
-					$response = $this->in($prompt, array('y','n'), 'y');
  638
+					$response = $this->in($prompt, array('y', 'n'), 'y');
639 639
 
640 640
 					if ('n' == strtolower($response)) {
641 641
 						unset($associations[$type][$i]);
@@ -658,7 +658,7 @@ public function confirmAssociations($model, $associations) {
658 658
  */
659 659
 	public function doMoreAssociations($model, $associations) {
660 660
 		$prompt = __d('cake_console', 'Would you like to define some additional model associations?');
661  
-		$wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n');
  661
+		$wannaDoMoreAssoc = $this->in($prompt, array('y', 'n'), 'n');
662 662
 		$possibleKeys = $this->_generatePossibleKeys();
663 663
 		while (strtolower($wannaDoMoreAssoc) == 'y') {
664 664
 			$assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
@@ -710,7 +710,7 @@ public function doMoreAssociations($model, $associations) {
710 710
 				$associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey;
711 711
 				$associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable;
712 712
 			}
713  
-			$wannaDoMoreAssoc = $this->in(__d('cake_console', 'Define another association?'), array('y','n'), 'y');
  713
+			$wannaDoMoreAssoc = $this->in(__d('cake_console', 'Define another association?'), array('y', 'n'), 'y');
714 714
 		}
715 715
 		return $associations;
716 716
 	}
@@ -832,7 +832,7 @@ public function getTable($modelName, $useDbConfig = null) {
832 832
 		if (array_search($useTable, $this->_tables) === false) {
833 833
 			$this->out();
834 834
 			$this->out(__d('cake_console', "Given your model named '%s',\nCake would expect a database table named '%s'", $modelName, $fullTableName));
835  
-			$tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y','n'), 'y');
  835
+			$tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y', 'n'), 'y');
836 836
 		}
837 837
 		if (strtolower($tableIsGood) == 'n') {
838 838
 			$useTable = $this->in(__d('cake_console', 'What is the name of the table?'));
2  lib/Cake/Console/Command/Task/ProjectTask.php
@@ -62,7 +62,7 @@ public function execute() {
62 62
 		$response = false;
63 63
 		while ($response == false && is_dir($project) === true && file_exists($project . 'Config' . 'core.php')) {
64 64
 			$prompt = __d('cake_console', '<warning>A project already exists in this location:</warning> %s Overwrite?', $project);
65  
-			$response = $this->in($prompt, array('y','n'), 'n');
  65
+			$response = $this->in($prompt, array('y', 'n'), 'n');
66 66
 			if (strtolower($response) === 'n') {
67 67
 				$response = $project = false;
68 68
 			}
2  lib/Cake/Console/Command/Task/TestTask.php
@@ -402,7 +402,7 @@ protected function _addFixture($name) {
402 402
  * @return array Array of fixtures the user wants to add.
403 403
  */
404 404
 	public function getUserFixtures() {
405  
-		$proceed = $this->in(__d('cake_console', 'Bake could not detect fixtures, would you like to add some?'), array('y','n'), 'n');
  405
+		$proceed = $this->in(__d('cake_console', 'Bake could not detect fixtures, would you like to add some?'), array('y', 'n'), 'n');
406 406
 		$fixtures = array();
407 407
 		if (strtolower($proceed) == 'y') {
408 408
 			$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'"));
8  lib/Cake/Console/Command/Task/ViewTask.php
@@ -215,9 +215,9 @@ protected function _interactive() {
215 215
 		}
216 216
 
217 217
 		$prompt = __d('cake_console', "Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models).");
218  
-		$wannaDoScaffold = $this->in($prompt, array('y','n'), 'y');
  218
+		$wannaDoScaffold = $this->in($prompt, array('y', 'n'), 'y');
219 219
 
220  
-		$wannaDoAdmin = $this->in(__d('cake_console', "Would you like to create the views for admin routing?"), array('y','n'), 'n');
  220
+		$wannaDoAdmin = $this->in(__d('cake_console', "Would you like to create the views for admin routing?"), array('y', 'n'), 'n');
221 221
 
222 222
 		if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') {
223 223
 			$vars = $this->_loadController();
@@ -292,7 +292,7 @@ protected function _loadController() {
292 292
 		$pluralHumanName = $this->_pluralHumanName($this->controllerName);
293 293
 
294 294
 		return compact('modelClass', 'schema', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
295  
-				'singularHumanName', 'pluralHumanName', 'fields','associations');
  295
+				'singularHumanName', 'pluralHumanName', 'fields', 'associations');
296 296
 	}
297 297
 
298 298
 /**
@@ -330,7 +330,7 @@ public function customAction() {
330 330
 		$this->out(__d('cake_console', 'Action Name:     %s', $action));
331 331
 		$this->out(__d('cake_console', 'Path:            %s', $this->getPath() . $this->controllerName . DS . Inflector::underscore($action) . ".ctp"));
332 332
 		$this->hr();
333  
-		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y');
  333
+		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
334 334
 		if (strtolower($looksGood) == 'y') {
335 335
 			$this->bake($action, ' ');
336 336
 			$this->_stop();
2  lib/Cake/Console/Command/UpgradeShell.php
@@ -764,7 +764,7 @@ public function getOptionParser() {
764 764
 					'help' => __d('cake_console', 'Use git command for moving files around.'),
765 765
 					'boolean' => true
766 766
 				),
767  
-				'dry-run'=> array(
  767
+				'dry-run' => array(
768 768
 					'short' => 'd',
769 769
 					'help' => __d('cake_console', 'Dry run the update, no files will actually be modified.'),
770 770
 					'boolean' => true
4  lib/Cake/Console/Shell.php
@@ -366,7 +366,7 @@ public function runCommand($command, $argv) {
366 366
 			return $this->_displayHelp($command);
367 367
 		}
368 368
 
369  
-		if (($isTask || $isMethod || $isMain) && $command !== 'execute' ) {
  369
+		if (($isTask || $isMethod || $isMain) && $command !== 'execute') {
370 370
 			$this->startup();
371 371
 		}
372 372
 
@@ -672,7 +672,7 @@ protected function _checkUnitTest() {
672 672
 			return true;
673 673
 		}
674 674
 		$prompt = __d('cake_console', 'PHPUnit is not installed. Do you want to bake unit test files anyway?');
675  
-		$unitTest = $this->in($prompt, array('y','n'), 'y');
  675
+		$unitTest = $this->in($prompt, array('y', 'n'), 'y');
676 676
 		$result = strtolower($unitTest) == 'y' || strtolower($unitTest) == 'yes';
677 677
 
678 678
 		if ($result) {
2  lib/Cake/Console/Templates/default/actions/controller_actions.ctp
@@ -143,7 +143,7 @@
143 143
 		if ($this-><?php echo $currentModelName; ?>->delete()) {
144 144
 <?php if ($wannaUseSession): ?>
145 145
 			$this->Session->setFlash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted'));
146  
-			$this->redirect(array('action'=>'index'));
  146
+			$this->redirect(array('action' => 'index'));
147 147
 <?php else: ?>
148 148
 			$this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted'), array('action' => 'index'));
149 149
 <?php endif; ?>
42  lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
@@ -39,35 +39,35 @@ public function after($event = array()) {
39 39
 	}
40 40
 
41 41
 	public $acos = array(
42  
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
43  
-			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
44  
-			'model' => array('type'=>'string', 'null' => true),
45  
-			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
46  
-			'alias' => array('type'=>'string', 'null' => true),
47  
-			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
48  
-			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  42
+			'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
  43
+			'parent_id' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  44
+			'model' => array('type' => 'string', 'null' => true),
  45
+			'foreign_key' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  46
+			'alias' => array('type' => 'string', 'null' => true),
  47
+			'lft' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  48
+			'rght' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
49 49
 			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
50 50
 		);
51 51
 
52 52
 	public $aros = array(
53  
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
54  
-			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
55  
-			'model' => array('type'=>'string', 'null' => true),
56  
-			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
57  
-			'alias' => array('type'=>'string', 'null' => true),
58  
-			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
59  
-			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  53
+			'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
  54
+			'parent_id' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  55
+			'model' => array('type' => 'string', 'null' => true),
  56
+			'foreign_key' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  57
+			'alias' => array('type' => 'string', 'null' => true),
  58
+			'lft' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
  59
+			'rght' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
60 60
 			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
61 61
 		);
62 62
 
63 63
 	public $aros_acos = array(
64  
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
65  
-			'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
66  
-			'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10),
67  
-			'_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
68  
-			'_read' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
69  
-			'_update' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
70  
-			'_delete' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
  64
+			'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
  65
+			'aro_id' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
  66
+			'aco_id' => array('type' => 'integer', 'null' => false, 'length' => 10),
  67
+			'_create' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
  68
+			'_read' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
  69
+			'_update' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
  70
+			'_delete' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
71 71
 			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
72 72
 		);
73 73
 
12  lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
@@ -39,12 +39,12 @@ public function after($event = array()) {
39 39
 	}
40 40
 
41 41
 	public $i18n = array(
42  
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
43  
-			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
44  
-			'model' => array('type'=>'string', 'null' => false, 'key' => 'index'),
45  
-			'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
46  
-			'field' => array('type'=>'string', 'null' => false, 'key' => 'index'),
47  
-			'content' => array('type'=>'text', 'null' => true, 'default' => NULL),
  42
+			'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
  43
+			'locale' => array('type' => 'string', 'null' => false, 'length' => 6, 'key' => 'index'),
  44
+			'model' => array('type' => 'string', 'null' => false, 'key' => 'index'),
  45
+			'foreign_key' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
  46
+			'field' => array('type' => 'string', 'null' => false, 'key' => 'index'),
  47
+			'content' => array('type' => 'text', 'null' => true, 'default' => NULL),
48 48
 			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'locale' => array('column' => 'locale', 'unique' => 0), 'model' => array('column' => 'model', 'unique' => 0), 'row_id' => array('column' => 'foreign_key', 'unique' => 0), 'field' => array('column' => 'field', 'unique' => 0))
49 49
 		);
50 50
 
6  lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
@@ -39,9 +39,9 @@ public function after($event = array()) {
39 39
 	}
40 40
 
41 41
 	public $cake_sessions = array(
42  
-			'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
43  
-			'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
44  
-			'expires' => array('type'=>'integer', 'null' => true, 'default' => NULL),
  42
+			'id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
  43
+			'data' => array('type' => 'text', 'null' => true, 'default' => NULL),
  44
+			'expires' => array('type' => 'integer', 'null' => true, 'default' => NULL),
45 45
 			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
46 46
 		);
47 47
 
20  lib/Cake/Console/Templates/skel/Config/core.php
@@ -239,8 +239,8 @@
239 239
  *
240 240
  * 	 Cache::config('default', array(
241 241
  *		'engine' => 'File', //[required]
242  
- *		'duration'=> 3600, //[optional]
243  
- *		'probability'=> 100, //[optional]
  242
+ *		'duration' => 3600, //[optional]
  243
+ *		'probability' => 100, //[optional]
244 244
  * 		'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
245 245
  * 		'prefix' => 'cake_', //[optional]  prefix every cache file with this string
246 246
  * 		'lock' => false, //[optional]  use file locking
@@ -251,8 +251,8 @@
251 251
  *
252 252
  * 	 Cache::config('default', array(
253 253
  *		'engine' => 'Apc', //[required]
254  
- *		'duration'=> 3600, //[optional]
255  
- *		'probability'=> 100, //[optional]
  254
+ *		'duration' => 3600, //[optional]
  255
+ *		'probability' => 100, //[optional]
256 256
  * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
257 257
  *	));
258 258
  *
@@ -260,8 +260,8 @@
260 260
  *
261 261
  * 	 Cache::config('default', array(
262 262
  *		'engine' => 'Xcache', //[required]
263  
- *		'duration'=> 3600, //[optional]
264  
- *		'probability'=> 100, //[optional]
  263
+ *		'duration' => 3600, //[optional]
  264
+ *		'probability' => 100, //[optional]
265 265
  *		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
266 266
  *		'user' => 'user', //user from xcache.admin.user settings
267 267
  *		'password' => 'password', //plaintext password (xcache.admin.pass)
@@ -271,8 +271,8 @@
271 271
  *
272 272
  * 	 Cache::config('default', array(
273 273
  *		'engine' => 'Memcache', //[required]
274  
- *		'duration'=> 3600, //[optional]
275  
- *		'probability'=> 100, //[optional]
  274
+ *		'duration' => 3600, //[optional]
  275
+ *		'probability' => 100, //[optional]
276 276
  * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
277 277
  * 		'servers' => array(
278 278
  * 			'127.0.0.1:11211' // localhost, default port 11211
@@ -285,8 +285,8 @@
285 285
  *
286 286
  * 	 Cache::config('default', array(
287 287
  *		'engine' => 'Wincache', //[required]
288  
- *		'duration'=> 3600, //[optional]
289  
- *		'probability'=> 100, //[optional]
  288
+ *		'duration' => 3600, //[optional]
  289
+ *		'probability' => 100, //[optional]
290 290
  *		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
291 291
  *	));
292 292
  */
2  lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
@@ -46,7 +46,7 @@
46 46
 		</div>
47 47
 		<div id="footer">
48 48
 			<?php echo $this->Html->link(
49  
-					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework'), 'border' => '0')),
  49
+					$this->Html->image('cake.power.gif', array('alt' => __('CakePHP: the rapid development php framework'), 'border' => '0')),
50 50
 					'http://www.cakephp.org/',
51 51
 					array('target' => '_blank', 'escape' => false)
52 52
 				);
134  lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
@@ -16,16 +16,16 @@
16 16
  */
17 17
 
18 18
 * {
19  
-	margin:0;
20  
-	padding:0;
  19
+	margin: 0;
  20
+	padding: 0;
21 21
 }
22 22
 
23 23
 /** General Style Info **/
24 24
 body {
25 25
 	background: #003d4c;
26 26
 	color: #fff;
27  
-	font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
28  
-	font-size:90%;
  27
+	font-family: 'lucida grande', verdana, helvetica, arial, sans-serif;
  28
+	font-size: 90%;
29 29
 	margin: 0;
30 30
 }
31 31
 a {
@@ -35,29 +35,29 @@ a {
35 35
 }
36 36
 a:hover {
37 37
 	color: #367889;
38  
-	text-decoration:none;
  38
+	text-decoration: none;
39 39
 }
40 40
 a img {
41  
-	border:none;
  41
+	border: none;
42 42
 }
43 43
 h1, h2, h3, h4 {
44 44
 	font-weight: normal;
45  
-	margin-bottom:0.5em;
  45
+	margin-bottom: 0.5em;
46 46
 }
47 47
 h1 {
48  
-	background:#fff;
  48
+	background: #fff;
49 49
 	color: #003d4c;
50 50
 	font-size: 100%;
51 51
 }
52 52
 h2 {
53  
-	background:#fff;
  53
+	background: #fff;
54 54
 	color: #e32;
55  
-	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
  55
+	font-family: 'Gill Sans', 'lucida grande', helvetica, arial, sans-serif;
56 56
 	font-size: 190%;
57 57
 }
58 58
 h3 {
59 59
 	color: #2c6877;
60  
-	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
  60
+	font-family: 'Gill Sans', 'lucida grande', helvetica, arial, sans-serif;
61 61
 	font-size: 165%;
62 62
 }
63 63
 h4 {
@@ -80,7 +80,7 @@ p {
80 80
 	padding: 10px 20px;
81 81
 }
82 82
 #header h1 {
83  
-	line-height:20px;
  83
+	line-height: 20px;
84 84
 	background: #003d4c url('../img/cake.icon.png') no-repeat left;
85 85
 	color: #fff;
86 86
 	padding: 0px 30px;
@@ -113,35 +113,35 @@ p {
113 113
 div.form,
114 114
 div.index,
115 115
 div.view {
116  
-	float:right;
117  
-	width:76%;
118  
-	border-left:1px solid #666;
119  
-	padding:10px 2%;
  116
+	float: right;
  117
+	width: 76%;
  118
+	border-left: 1px solid #666;
  119
+	padding: 10px 2%;
120 120
 }
121 121
 div.actions {
122  
-	float:left;
123  
-	width:16%;
124  
-	padding:10px 1.5%;
  122
+	float: left;
  123
+	width: 16%;
  124
+	padding: 10px 1.5%;
125 125
 }
126 126
 div.actions h3 {
127  
-	padding-top:0;
128  
-	color:#777;
  127
+	padding-top: 0;
  128
+	color: #777;
129 129
 }
130 130
 
131 131
 
132 132
 /** Tables **/
133 133
 table {
134  
-	border-right:0;
  134
+	border-right: 0;
135 135
 	clear: both;
136 136
 	color: #333;
137 137
 	margin-bottom: 10px;
138 138
 	width: 100%;
139 139
 }
140 140
 th {
141  
-	border:0;
142  
-	border-bottom:2px solid #555;
  141
+	border: 0;
  142
+	border-bottom: 2px solid #555;
143 143
 	text-align: left;
144  
-	padding:4px;
  144
+	padding: 4px;
145 145
 }
146 146
 th a {
147 147
 	display: block;
@@ -158,7 +158,7 @@ table tr td {
158 158
 	padding: 6px;
159 159
 	text-align: left;
160 160
 	vertical-align: top;
161  
-	border-bottom:1px solid #ddd;
  161
+	border-bottom: 1px solid #ddd;
162 162
 }
163 163
 table tr:nth-child(even) {
164 164
 	background: #f9f9f9;
@@ -169,7 +169,7 @@ td.actions {
169 169
 }
170 170
 table td.actions a {
171 171
 	margin: 0px 6px;
172  
-	padding:2px 5px;
  172
+	padding: 2px 5px;
173 173
 }
174 174
 
175 175
 /* SQL log */
@@ -182,15 +182,15 @@ table td.actions a {
182 182
 	font-family: Monaco, Consolas, "Courier New", monospaced;
183 183
 }
184 184
 .cake-sql-log caption {
185  
-	color:#fff;
  185
+	color: #fff;
186 186
 }
187 187
 
188 188
 /** Paging **/
189 189
 .paging {
190  
-	background:#fff;
  190
+	background: #fff;
191 191
 	color: #ccc;
192 192
 	margin-top: 1em;
193  
-	clear:both;
  193
+	clear: both;
194 194
 }
195 195
 .paging .current,
196 196
 .paging .disabled,
@@ -296,7 +296,7 @@ form .required {
296 296
 form .required label:after {
297 297
 	color: #e32;
298 298
 	content: '*';
299  
-	display:inline;
  299
+	display: inline;
300 300
 }
301 301
 form div.submit {
302 302
 	border: 0;
@@ -306,14 +306,14 @@ form div.submit {
306 306
 label {
307 307
 	display: block;
308 308
 	font-size: 110%;
309  
-	margin-bottom:3px;
  309
+	margin-bottom: 3px;
310 310
 }
311 311
 input, textarea {
312 312
 	clear: both;
313 313
 	font-size: 140%;
314 314
 	font-family: "frutiger linotype", "lucida grande", "verdana", sans-serif;
315 315
 	padding: 1%;
316  
-	width:98%;
  316
+	width: 98%;
317 317
 }
318 318
 select {
319 319
 	clear: both;
@@ -337,8 +337,8 @@ div.checkbox label {
337 337
 	display: inline;
338 338
 }
339 339
 input[type=radio] {
340  
-	float:left;
341  
-	width:auto;
  340
+	float: left;
  341
+	width: auto;
342 342
 	margin: 6px 0;
343 343
 	padding: 0;
344 344
 	line-height: 26px;
@@ -353,7 +353,7 @@ input[type=submit] {
353 353
 	width: auto;
354 354
 }
355 355
 form .submit input[type=submit] {
356  
-	background:#62af56;
  356
+	background: #62af56;
357 357
 	background-image: -webkit-gradient(linear, left top, left bottom, from(#76BF6B), to(#3B8230));
358 358
 	background-image: -webkit-linear-gradient(top, #76BF6B, #3B8230);
359 359
 	background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
@@ -491,7 +491,7 @@ p.error em {
491 491
 	padding: 0;
492 492
 }
493 493
 .actions li {
494  
-	margin:0 0 0.5em 0;
  494
+	margin: 0 0 0.5em 0;
495 495
 	list-style-type: none;
496 496
 	white-space: nowrap;
497 497
 	padding: 0;
@@ -506,7 +506,7 @@ p.error em {
506 506
 input[type=submit],
507 507
 .actions ul li a,
508 508
 .actions a {
509  
-	font-weight:normal;
  509
+	font-weight: normal;
510 510
 	padding: 4px 8px;
511 511
 	background: #dcdcdc;
512 512
 	background-image: -webkit-gradient(linear, left top, left bottom, from(#fefefe), to(#dcdcdc));
@@ -515,8 +515,8 @@ input[type=submit],
515 515
 	background-image: -ms-linear-gradient(top, #fefefe, #dcdcdc);
516 516
 	background-image: -o-linear-gradient(top, #fefefe, #dcdcdc);
517 517
 	background-image: linear-gradient(top, #fefefe, #dcdcdc);
518  
-	color:#333;
519  
-	border:1px solid #bbb;
  518
+	color: #333;
  519
+	border: 1px solid #bbb;
520 520
 	-webkit-border-radius: 4px;
521 521
 	-moz-border-radius: 4px;
522 522
 	border-radius: 4px;
@@ -661,50 +661,50 @@ pre {
661 661
 	background-color: rgba(255, 255, 0, 0.5);
662 662
 }
663 663
 .code-coverage-results div.code-line {
664  
-	padding-left:5px;
665  
-	display:block;
666  
-	margin-left:10px;
  664
+	padding-left: 5px;
  665
+	display: block;
  666
+	margin-left: 10px;
667 667
 }
668 668
 .code-coverage-results div.uncovered span.content {
669  
-	background:#ecc;
  669
+	background: #ecc;
670 670
 }
671 671
 .code-coverage-results div.covered span.content {
672  
-	background:#cec;
  672
+	background: #cec;
673 673
 }
674 674
 .code-coverage-results div.ignored span.content {
675  
-	color:#aaa;
  675
+	color: #aaa;
676 676
 }
677 677
 .code-coverage-results span.line-num {
678  
-	color:#666;
679  
-	display:block;
680  
-	float:left;
681  
-	width:20px;
682  
-	text-align:right;
683  
-	margin-right:5px;
  678
+	color: #666;
  679
+	display: block;
  680
+	float: left;
  681
+	width: 20px;
  682
+	text-align: right;
  683
+	margin-right: 5px;
684 684
 }
685 685
 .code-coverage-results span.line-num strong {
686  
-	color:#666;
  686
+	color: #666;
687 687
 }
688 688
 .code-coverage-results div.start {
689  
-	border:1px solid #aaa;
690  
-	border-width:1px 1px 0px 1px;
691  
-	margin-top:30px;
692  
-	padding-top:5px;
  689
+	border: 1px solid #aaa;
  690
+	border-width: 1px 1px 0px 1px;
  691
+	margin-top: 30px;
  692
+	padding-top: 5px;
693 693
 }
694 694
 .code-coverage-results div.end {
695  
-	border:1px solid #aaa;
696  
-	border-width:0px 1px 1px 1px;
697  
-	margin-bottom:30px;
698  
-	padding-bottom:5px;
  695
+	border: 1px solid #aaa;
  696
+	border-width: 0px 1px 1px 1px;
  697
+	margin-bottom: 30px;
  698
+	padding-bottom: 5px;
699 699
 }
700 700
 .code-coverage-results div.realstart {
701  
-	margin-top:0px;
  701
+	margin-top: 0px;
702 702
 }
703 703
 .code-coverage-results p.note {
704  
-	color:#bbb;
705  
-	padding:5px;
706  
-	margin:5px 0 10px;
707  
-	font-size:10px;
  704
+	color: #bbb;
  705
+	padding: 5px;
  706
+	margin: 5px 0 10px;
  707
+	font-size: 10px;
708 708
 }
709 709
 .code-coverage-results span.result-bad {
710 710
 	color: #a00;
@@ -718,5 +718,5 @@ pre {
718 718
 
719 719
 /** Elements **/
720 720
 #url-rewriting-warning {
721  
-	display:none;
  721
+	display: none;
722 722
 }
2  lib/Cake/I18n/I18n.php
@@ -511,7 +511,7 @@ protected function _loadLocaleDefinition($file, $domain = null) {
511 511
 				continue;
512 512
 			}
513 513
 
514  
-			$mustEscape = array($escape . ',' , $escape . ';', $escape . '<', $escape . '>', $escape . $escape);
  514
+			$mustEscape = array($escape . ',', $escape . ';', $escape . '<', $escape . '>', $escape . $escape);
515 515
 			$replacements = array_map('crc32', $mustEscape);
516 516
 			$value = str_replace($mustEscape, $replacements, $value);
517 517
 			$value = explode(';', $value);
2  lib/Cake/Model/Behavior/ContainableBehavior.php
@@ -349,7 +349,7 @@ public function containments($Model, $contain, $containments = array(), $throwEr
349 349
 		}
350 350
 
351 351
 		if (!isset($containments['models'][$Model->alias])) {
352  
-			$containments['models'][$Model->alias] = array('keep' => array(),'instance' => &$Model);
  352
+			$containments['models'][$Model->alias] = array('keep' => array(), 'instance' => &$Model);
353 353
 		}
354 354
 
355 355
 		$containments['models'][$Model->alias]['keep'] = array_merge($containments['models'][$Model->alias]['keep'], $keep);
2  lib/Cake/Model/Behavior/TranslateBehavior.php
@@ -38,7 +38,7 @@ class TranslateBehavior extends ModelBehavior {
38 38
  * Callback
39 39
  *
40 40
  * $config for TranslateBehavior should be
41  
- * array( 'fields' => array('field_one',
  41
+ * array('fields' => array('field_one',
42 42
  * 'field_two' => 'FieldAssoc', 'field_three'))
43 43
  *
44 44
  * With above example only one permanent hasMany will be joined (for field_two
2  lib/Cake/Model/CakeSchema.php
@@ -402,7 +402,7 @@ public function generateTable($table, $fields) {
402 402
 				if ($field != 'indexes' && $field != 'tableParameters') {
403 403
 					if (is_string($value)) {
404 404
 						$type = $value;
405  
-						$value = array('type'=> $type);
  405
+						$value = array('type' => $type);
406 406
 					}
407 407
 					$col = "\t\t'{$field}' => array('type' => '" . $value['type'] . "', ";
408 408
 					unset($value['type']);
2  lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -297,7 +297,7 @@ public function resultSet($results) {
297 297
 				continue;
298 298
 			}
299 299
 			if (preg_match('/\bAS\s+(.*)/i', $selects[$j], $matches)) {
300  
-				 $columnName = trim($matches[1],'"');
  300
+				 $columnName = trim($matches[1], '"');
301 301
 			} else {
302 302
 				$columnName = trim(str_replace('"', '', $selects[$j]));
303 303
 			}
4  lib/Cake/Model/Datasource/DboSource.php
@@ -2877,7 +2877,7 @@ public function dropSchema(CakeSchema $schema, $table = null) {
2877 2877
 /**
2878 2878
  * Generate a database-native column schema string
2879 2879
  *
2880  
- * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
  2880
+ * @param array $column An array structured like the following: array('name' => 'value', 'type' => 'value'[, options]),
2881 2881
  *   where options can be 'default', 'length', or 'key'.
2882 2882
  * @return string
2883 2883
  */
@@ -2911,7 +2911,7 @@ public function buildColumn($column) {
2911 2911
 			$out .= '(' . $length . ')';
2912 2912
 		}
2913 2913
 
2914  
-		if (($column['type'] === 'integer' || $column['type'] === 'float' ) && isset($column['default']) && $column['default'] === '') {
  2914
+		if (($column['type'] === 'integer' || $column['type'] === 'float') && isset($column['default']) && $column['default'] === '') {
2915 2915
 			$column['default'] = null;
2916 2916
 		}
2917 2917
 		$out = $this->_buildFieldParameters($out, $column, 'beforeDefault');
2  lib/Cake/Model/Model.php
@@ -537,7 +537,7 @@ class Model extends Object {
537 537
  */
538 538
 	protected $_associationKeys = array(
539 539
 		'belongsTo' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'counterCache'),
540  
-		'hasOne' => array('className', 'foreignKey','conditions', 'fields','order', 'dependent'),
  540
+		'hasOne' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'dependent'),
541 541
 		'hasMany' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'dependent', 'exclusive', 'finderQuery', 'counterQuery'),
542 542
 		'hasAndBelongsToMany' => array('className', 'joinTable', 'with', 'foreignKey', 'associationForeignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'unique', 'finderQuery', 'deleteQuery', 'insertQuery')
543 543
 	);
2  lib/Cake/Test/Case/BasicsTest.php
@@ -256,7 +256,7 @@ public function testAm() {
256 256
 		$this->assertEquals($expected, $result);
257 257
 
258 258
 		$result = am(array('one' => array(2, 3), 'two' => array('foo')), array('one' => array(4, 5)));
259  
-		$expected = array('one' => array(4, 5),'two' => array('foo'));
  259
+		$expected = array('one' => array(4, 5), 'two' => array('foo'));
260 260
 		$this->assertEquals($expected, $result);
261 261
 	}
262 262
 
8  lib/Cake/Test/Case/Cache/CacheTest.php
@@ -161,10 +161,10 @@ public function testConfigChange() {
161 161
 		$_cacheConfigSessions = Cache::config('sessions');
162 162
 		$_cacheConfigTests = Cache::config('tests');
163 163
 
164  
-		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
  164
+		$result = Cache::config('sessions', array('engine' => 'File', 'path' => TMP . 'sessions'));
165 165
 		$this->assertEquals($result['settings'], Cache::settings('sessions'));
166 166
 
167  
-		$result = Cache::config('tests', array('engine'=> 'File', 'path' => TMP . 'tests'));
  167
+		$result = Cache::config('tests', array('engine' => 'File', 'path' => TMP . 'tests'));
168 168
 		$this->assertEquals($result['settings'], Cache::settings('tests'));
169 169
 
170 170
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
@@ -335,7 +335,7 @@ public function testWriteTriggerError() {
335 335
  */
336 336
 	public function testCacheDisable() {
337 337
 		Configure::write('Cache.disable', false);
338  
-		Cache::config('test_cache_disable_1', array('engine'=> 'File', 'path' => TMP . 'tests'));
  338
+		Cache::config('test_cache_disable_1', array('engine' => 'File', 'path' => TMP . 'tests'));
339 339
 
340 340
 		$this->assertTrue(Cache::write('key_1', 'hello', 'test_cache_disable_1'));
341 341
 		$this->assertSame(Cache::read('key_1', 'test_cache_disable_1'), 'hello');
@@ -351,7 +351,7 @@ public function testCacheDisable() {
351 351
 		$this->assertSame(Cache::read('key_3', 'test_cache_disable_1'), 'hello');
352 352
 
353 353
 		Configure::write('Cache.disable', true);
354  
-		Cache::config('test_cache_disable_2', array('engine'=> 'File', 'path' => TMP . 'tests'));
  354
+		Cache::config('test_cache_disable_2', array('engine' => 'File', 'path' => TMP . 'tests'));
355 355
 
356 356
 		$this->assertFalse(Cache::write('key_4', 'hello', 'test_cache_disable_2'));
357 357
 		$this->assertFalse(Cache::read('key_4', 'test_cache_disable_2'));
6  lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
@@ -61,10 +61,10 @@ public function tearDown() {
61 61
  * @return void
62 62
  */
63 63
 	public function testCacheDirChange() {
64  
-		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
  64
+		$result = Cache::config('sessions', array('engine' => 'File', 'path' => TMP . 'sessions'));
65 65
 		$this->assertEquals($result['settings'], Cache::settings('sessions'));
66 66
 
67  
-		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'tests'));
  67
+		$result = Cache::config('sessions', array('engine' => 'File', 'path' => TMP . 'tests'));
68 68
 		$this->assertEquals($result['settings'], Cache::settings('sessions'));
69 69
 		$this->assertNotEquals($result['settings'], Cache::settings('default'));
70 70
 	}
@@ -276,7 +276,7 @@ public function testKeyPath() {
276 276
 	public function testRemoveWindowsSlashesFromCache() {
277 277
 		Cache::config('windows_test', array('engine' => 'File', 'isWindows' => true, 'prefix' => null, 'path' => TMP));
278 278
 
279  
-		$expected = array (
  279
+		$expected = array(
280 280
 			'C:\dev\prj2\sites\cake\libs' => array(
281 281
 				0 => 'C:\dev\prj2\sites\cake\libs', 1 => 'C:\dev\prj2\sites\cake\libs\view',
282 282
 				2 => 'C:\dev\prj2\sites\cake\libs\view\scaffolds', 3 => 'C:\dev\prj2\sites\cake\libs\view\pages',
6  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -81,7 +81,7 @@ public function testSettings() {
81 81
 		unset($settings['serialize'], $settings['path']);
82 82
 		$expecting = array(
83 83
 			'prefix' => 'cake_',
84  
-			'duration'=> 3600,
  84
+			'duration' => 3600,
85 85
 			'probability' => 100,
86 86
 			'servers' => array('127.0.0.1'),
87 87
 			'persistent' => true,
@@ -312,12 +312,12 @@ public function testIncrement() {
312 312
 	public function testConfigurationConflict() {
313 313
 		Cache::config('long_memcache', array(
314 314
 		  'engine' => 'Memcache',
315  
-		  'duration'=> '+2 seconds',
  315
+		  'duration' => '+2 seconds',
316 316
 		  'servers' => array('127.0.0.1:11211'),
317 317
 		));
318 318
 		Cache::config('short_memcache', array(
319 319
 		  'engine' => 'Memcache',
320  
-		  'duration'=> '+1 seconds',
  320
+		  'duration' => '+1 seconds',
321 321
 		  'servers' => array('127.0.0.1:11211'),
322 322
 		));
323 323
 		Cache::config('some_file', array('engine' => 'File'));
2  lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
@@ -59,7 +59,7 @@ public function testSettings() {
59 59
 		$settings = Cache::settings();
60 60
 		$expecting = array(
61 61
 			'prefix' => 'cake_',
62  
-			'duration'=> 3600,
  62
+			'duration' => 3600,
63 63
 			'probability' => 100,
64 64
 			'engine' => 'Xcache',
65 65
 		);
2  lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -782,7 +782,7 @@ public function testLoginRedirect() {
782 782
 		$this->Auth->Session->delete('Auth');
783 783
 		$_SERVER['HTTP_REFERER'] = $_ENV['HTTP_REFERER'] = Router::url('/admin', true);
784 784
 		$this->Auth->Session->write('Auth', array(
785  
-			'AuthUser' => array('id'=>'1', 'username' => 'nate')
  785
+			'AuthUser' => array('id' => '1', 'username' => 'nate')
786 786
 		));
787 787
 		$this->Auth->request->params['action'] = 'login';
788 788
 		$this->Auth->request->url = 'auth_test/login';
36  lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
@@ -102,12 +102,12 @@ public function tearDown() {
102 102
  * @return void
103 103
  */
104 104
 	protected function _setCookieData() {
105  
-		$this->Cookie->write(array('Encrytped_array' => array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')));
  105
+		$this->Cookie->write(array('Encrytped_array' => array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!')));
106 106
 		$this->Cookie->write(array('Encrytped_multi_cookies.name' => 'CakePHP'));
107 107
 		$this->Cookie->write(array('Encrytped_multi_cookies.version' => '1.2.0.x'));
108 108
 		$this->Cookie->write(array('Encrytped_multi_cookies.tag' => 'CakePHP Rocks!'));
109 109
 
110  
-		$this->Cookie->write(array('Plain_array' => array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')), null, false);
  110
+		$this->Cookie->write(array('Plain_array' => array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!')), null, false);
111 111
 		$this->Cookie->write(array('Plain_multi_cookies.name' => 'CakePHP'), null, false);
112 112
 		$this->Cookie->write(array('Plain_multi_cookies.version' => '1.2.0.x'), null, false);
113 113
 		$this->Cookie->write(array('Plain_multi_cookies.tag' => 'CakePHP Rocks!'), null, false);
@@ -145,11 +145,11 @@ public function testCookieName() {
145 145
 	public function testReadEncryptedCookieData() {
146 146
 		$this->_setCookieData();
147 147
 		$data = $this->Cookie->read('Encrytped_array');
148  
-		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  148
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
149 149
 		$this->assertEquals($data, $expected);
150 150
 
151 151
 		$data = $this->Cookie->read('Encrytped_multi_cookies');
152  
-		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  152
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
153 153
 		$this->assertEquals($data, $expected);
154 154
 	}
155 155
 
@@ -162,11 +162,11 @@ public function testReadPlainCookieData() {
162 162
 		$this->_setCookieData();
163 163
 
164 164
 		$data = $this->Cookie->read('Plain_array');
165  
-		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  165
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
166 166
 		$this->assertEquals($data, $expected);
167 167
 
168 168
 		$data = $this->Cookie->read('Plain_multi_cookies');
169  
-		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  169
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
170 170
 		$this->assertEquals($data, $expected);
171 171
 	}
172 172
 
@@ -279,7 +279,7 @@ public function testDeleteCookieValue() {
279 279
 		$this->_setCookieData();
280 280
 		$this->Cookie->delete('Encrytped_multi_cookies.name');
281 281
 		$data = $this->Cookie->read('Encrytped_multi_cookies');
282  
-		$expected = array('version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  282
+		$expected = array('version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
283 283
 		$this->assertEquals($data, $expected);
284 284
 
285 285
 		$this->Cookie->delete('Encrytped_array');
@@ -288,7 +288,7 @@ public function testDeleteCookieValue() {
288 288
 
289 289
 		$this->Cookie->delete('Plain_multi_cookies.name');
290 290
 		$data = $this->Cookie->read('Plain_multi_cookies');
291  
-		$expected = array('version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  291
+		$expected = array('version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
292 292
 		$this->assertEquals($data, $expected);
293 293
 
294 294
 		$this->Cookie->delete('Plain_array');
@@ -372,7 +372,7 @@ public function testReadingCookieDataOnStartup() {
372 372
 		$this->assertNull($data);
373 373
 
374 374
 		$_COOKIE['CakeTestCookie'] = array(
375  
-				'Encrytped_array' => $this->__encrypt(array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')),
  375
+				'Encrytped_array' => $this->__encrypt(array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!')),
376 376
 				'Encrytped_multi_cookies' => array(
377 377
 						'name' => $this->__encrypt('CakePHP'),
378 378
 						'version' => $this->__encrypt('1.2.0.x'),
@@ -386,19 +386,19 @@ public function testReadingCookieDataOnStartup() {
386 386
 		$this->Cookie->startup(null);
387 387
 
388 388
 		$data = $this->Cookie->read('Encrytped_array');
389  
-		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
  389
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!');
390 390
 		$this->assertEquals($expected, $data);
391 391