Permalink
Browse files

Merge branch '2.0' into 2.1

Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
  • Loading branch information...
2 parents 64eb38a + 8bb6f88 commit 2e8498e166b740ec52fc0a750bf00a5561e8d8ab @markstory markstory committed Dec 12, 2011
Showing with 920 additions and 306 deletions.
  1. +1 −0 app/Config/core.php
  2. +1 −0 app/View/Helper/AppHelper.php
  3. +2 −0 lib/Cake/Cache/Cache.php
  4. +5 −1 lib/Cake/Cache/Engine/FileEngine.php
  5. +1 −0 lib/Cake/Cache/Engine/XcacheEngine.php
  6. +3 −0 lib/Cake/Console/Command/ApiShell.php
  7. +5 −1 lib/Cake/Console/Command/BakeShell.php
  8. +3 −0 lib/Cake/Console/Command/SchemaShell.php
  9. +24 −19 lib/Cake/Console/Command/Task/ModelTask.php
  10. +1 −1 lib/Cake/Console/Command/Task/PluginTask.php
  11. +1 −3 lib/Cake/Console/Command/Task/ProjectTask.php
  12. +1 −0 lib/Cake/Console/Command/UpgradeShell.php
  13. +12 −3 lib/Cake/Console/Shell.php
  14. +1 −0 lib/Cake/Console/ShellDispatcher.php
  15. +1 −0 lib/Cake/Console/Templates/skel/Config/core.php
  16. +2 −0 lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
  17. +2 −0 lib/Cake/Console/Templates/skel/webroot/index.php
  18. +2 −0 lib/Cake/Console/Templates/skel/webroot/test.php
  19. +8 −0 lib/Cake/Controller/CakeErrorController.php
  20. +2 −0 lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
  21. +5 −1 lib/Cake/Controller/Component/RequestHandlerComponent.php
  22. +8 −1 lib/Cake/Controller/Component/SecurityComponent.php
  23. +4 −4 lib/Cake/Controller/Component/SessionComponent.php
  24. +6 −0 lib/Cake/Controller/ComponentCollection.php
  25. +2 −1 lib/Cake/Core/CakePlugin.php
  26. +1 −3 lib/Cake/Core/Object.php
  27. +1 −1 lib/Cake/Error/ExceptionRenderer.php
  28. +1 −0 lib/Cake/Error/exceptions.php
  29. +1 −1 lib/Cake/I18n/I18n.php
  30. +0 −4 lib/Cake/Model/AclNode.php
  31. +0 −3 lib/Cake/Model/Aco.php
  32. +0 −3 lib/Cake/Model/AcoAction.php
  33. +0 −3 lib/Cake/Model/Aro.php
  34. +2 −0 lib/Cake/Model/Behavior/AclBehavior.php
  35. +3 −2 lib/Cake/Model/Behavior/ContainableBehavior.php
  36. +7 −1 lib/Cake/Model/CakeSchema.php
  37. +3 −0 lib/Cake/Model/ConnectionManager.php
  38. +6 −9 lib/Cake/Model/Datasource/Database/Postgres.php
  39. +2 −0 lib/Cake/Model/Datasource/Database/Sqlserver.php
  40. +20 −8 lib/Cake/Model/Model.php
  41. +0 −3 lib/Cake/Model/Permission.php
  42. +1 −1 lib/Cake/Network/CakeRequest.php
  43. +1 −0 lib/Cake/Network/CakeSocket.php
  44. +1 −1 lib/Cake/Network/Email/AbstractTransport.php
  45. +1 −0 lib/Cake/Network/Email/CakeEmail.php
  46. +1 −1 lib/Cake/Network/Email/MailTransport.php
  47. +2 −1 lib/Cake/Network/Email/SmtpTransport.php
  48. +1 −1 lib/Cake/Network/Http/HttpResponse.php
  49. +29 −6 lib/Cake/Network/Http/HttpSocket.php
  50. +0 −3 lib/Cake/Routing/Dispatcher.php
  51. +1 −0 lib/Cake/Routing/Route/CakeRoute.php
  52. +11 −9 lib/Cake/Routing/Route/PluginShortRoute.php
  53. +13 −11 lib/Cake/Routing/Route/RedirectRoute.php
  54. +1 −0 lib/Cake/Test/Case/BasicsTest.php
  55. +1 −1 lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
  56. +1 −0 lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
  57. +2 −2 lib/Cake/Test/Case/Configure/IniReaderTest.php
  58. +1 −0 lib/Cake/Test/Case/Configure/PhpReaderTest.php
  59. +2 −1 lib/Cake/Test/Case/Console/Command/AclShellTest.php
  60. +1 −1 lib/Cake/Test/Case/Console/Command/BakeShellTest.php
  61. +1 −1 lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
  62. +1 −1 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
  63. +4 −2 lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
  64. +1 −1 lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
  65. +85 −2 lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
  66. +1 −1 lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
  67. +2 −2 lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
  68. +4 −4 lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
  69. +3 −3 lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
  70. +1 −1 lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
  71. +2 −0 lib/Cake/Test/Case/Console/ShellDispatcherTest.php
  72. +13 −0 lib/Cake/Test/Case/Console/ShellTest.php
  73. +19 −4 lib/Cake/Test/Case/Console/TaskCollectionTest.php
  74. +1 −1 lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
  75. +2 −1 lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
  76. +1 −1 lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
  77. +1 −0 lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
  78. +1 −0 lib/Cake/Test/Case/Controller/Component/DbAclTest.php
  79. +1 −0 lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
  80. +7 −4 lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
  81. +1 −1 lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
  82. +16 −2 lib/Cake/Test/Case/Controller/ControllerTest.php
  83. +3 −3 lib/Cake/Test/Case/Controller/ScaffoldTest.php
  84. +5 −2 lib/Cake/Test/Case/Error/ErrorHandlerTest.php
  85. +7 −2 lib/Cake/Test/Case/Error/ExceptionRendererTest.php
  86. +2 −0 lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
  87. +1 −0 lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
  88. +1 −0 lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
  89. +1 −0 lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
  90. +6 −0 lib/Cake/Test/Case/Model/CakeSchemaTest.php
  91. +1 −1 lib/Cake/Test/Case/Model/ConnectionManagerTest.php
  92. +4 −3 lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
  93. +1 −0 lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
  94. +1 −0 lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
  95. +5 −0 lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
  96. +1 −1 lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
  97. +13 −7 lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
  98. +1 −0 lib/Cake/Test/Case/Model/DbAclTest.php
  99. +2 −0 lib/Cake/Test/Case/Model/ModelIntegrationTest.php
  100. +1 −0 lib/Cake/Test/Case/Model/ModelReadTest.php
  101. +1 −0 lib/Cake/Test/Case/Model/ModelTestBase.php
  102. +2 −0 lib/Cake/Test/Case/Model/ModelWriteTest.php
  103. +1 −0 lib/Cake/Test/Case/Model/models.php
  104. +17 −1 lib/Cake/Test/Case/Network/CakeRequestTest.php
  105. +2 −0 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
  106. +20 −0 lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
  107. +3 −0 lib/Cake/Test/Case/Routing/DispatcherTest.php
  108. +4 −0 lib/Cake/Test/Case/Routing/RouterTest.php
  109. +1 −1 lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
  110. +99 −0 lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php
  111. +1 −1 lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
  112. +3 −2 lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
  113. +29 −8 lib/Cake/Test/Case/Utility/ClassRegistryTest.php
  114. +2 −2 lib/Cake/Test/Case/Utility/DebuggerTest.php
  115. +8 −6 lib/Cake/Test/Case/Utility/FileTest.php
  116. +51 −0 lib/Cake/Test/Case/Utility/FolderTest.php
  117. +1 −1 lib/Cake/Test/Case/Utility/InflectorTest.php
  118. +6 −4 lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
  119. +1 −0 lib/Cake/Test/Case/Utility/SetTest.php
  120. +3 −2 lib/Cake/Test/Case/Utility/ValidationTest.php
  121. +2 −2 lib/Cake/Test/Case/Utility/XmlTest.php
  122. +2 −0 lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
  123. +19 −0 lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  124. +13 −3 lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
  125. +13 −1 lib/Cake/Test/Case/View/Helper/JsHelperTest.php
  126. +10 −0 lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
  127. +11 −30 lib/Cake/Test/Case/View/Helper/RssHelperTest.php
  128. +11 −9 lib/Cake/Test/Case/View/Helper/TextHelperTest.php
  129. +6 −4 lib/Cake/Test/Case/View/HelperCollectionTest.php
  130. +1 −1 lib/Cake/Test/Case/View/ScaffoldViewTest.php
  131. +1 −0 lib/Cake/Test/Case/View/ViewTest.php
  132. +3 −0 lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
  133. +1 −3 lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
  134. +8 −0 lib/Cake/TestSuite/CakeTestLoader.php
  135. +9 −0 lib/Cake/TestSuite/CakeTestSuite.php
  136. +1 −0 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
  137. +7 −0 lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
  138. +6 −0 lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
  139. +6 −0 lib/Cake/TestSuite/Coverage/TextCoverageReport.php
  140. +6 −0 lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
  141. +3 −5 lib/Cake/TestSuite/Fixture/CakeTestFixture.php
  142. +1 −5 lib/Cake/TestSuite/Fixture/CakeTestModel.php
  143. +9 −5 lib/Cake/Utility/ClassRegistry.php
  144. +0 −4 lib/Cake/Utility/Debugger.php
  145. +0 −4 lib/Cake/Utility/File.php
  146. +1 −0 lib/Cake/Utility/ObjectCollection.php
  147. +2 −1 lib/Cake/Utility/Sanitize.php
  148. +7 −0 lib/Cake/Utility/Xml.php
  149. +2 −1 lib/Cake/View/Helper/CacheHelper.php
  150. +2 −10 lib/Cake/View/Helper/FormHelper.php
  151. +11 −0 lib/Cake/View/Helper/JqueryEngineHelper.php
  152. +1 −0 lib/Cake/View/Helper/JsBaseEngineHelper.php
  153. +1 −1 lib/Cake/View/Helper/JsHelper.php
  154. +13 −0 lib/Cake/View/Helper/MootoolsEngineHelper.php
  155. +8 −0 lib/Cake/View/Helper/PrototypeEngineHelper.php
  156. +13 −20 lib/Cake/View/Helper/TextHelper.php
  157. +1 −0 lib/Cake/View/Helper/TimeHelper.php
  158. +6 −0 lib/Cake/View/HelperCollection.php
  159. +1 −0 lib/Cake/View/MediaView.php
  160. +1 −0 lib/Cake/View/ScaffoldView.php
  161. +1 −0 lib/Cake/View/ThemeView.php
  162. +0 −3 lib/Cake/View/View.php
View
@@ -200,6 +200,7 @@
* timestamping regardless of debug value.
*/
//Configure::write('Asset.timestamp', true);
+
/**
* Compress CSS output by removing comments, whitespace, repeating tags, etc.
* This requires a/var/cache directory to be writable by the web server for caching.
@@ -19,6 +19,7 @@
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
+
App::uses('Helper', 'View');
/**
View
@@ -374,6 +374,7 @@ public static function increment($key, $offset = 1, $config = 'default') {
self::set(null, $config);
return $success;
}
+
/**
* Decrement a number under the key and return decremented value.
*
@@ -401,6 +402,7 @@ public static function decrement($key, $offset = 1, $config = 'default') {
self::set(null, $config);
return $success;
}
+
/**
* Delete a key from the cache.
*
@@ -21,7 +21,11 @@
*/
/**
- * File Storage engine for cache
+ * File Storage engine for cache. Filestorage is the slowest cache storage
+ * to read and write. However, it is good for servers that don't have other storage
+ * engine available, or have content which is not performance sensitive.
+ *
+ * You can configure a FileEngine cache, using Cache::config()
*
* @package Cake.Cache.Engine
*/
@@ -110,6 +110,7 @@ public function increment($key, $offset = 1) {
public function decrement($key, $offset = 1) {
return xcache_dec($key, $offset);
}
+
/**
* Delete a key from the cache
*
@@ -24,6 +24,8 @@
/**
* API shell to show method signatures of CakePHP core classes.
*
+ * Implementation of a Cake Shell to show CakePHP core method signatures.
+ *
* @package Cake.Console.Command
*/
class ApiShell extends AppShell {
@@ -151,6 +153,7 @@ public function getOptionParser() {
))->description(__d('cake_console', 'Lookup doc block comments for classes in CakePHP.'));
return $parser;
}
+
/**
* Show help for this shell.
*
@@ -24,7 +24,11 @@
App::uses('Model', 'Model');
/**
- * Bake is a command-line code generation utility for automating programmer chores.
+ * Command-line code generation utility to automate programmer chores.
+ *
+ * Bake is CakePHP's code generation script, which can help you kickstart
+ * application development by writing fully functional skeleton controllers,
+ * models, and views. Going further, Bake can also write Unit Tests for you.
*
* @package Cake.Console.Command
* @link http://book.cakephp.org/2.0/en/console-and-shells/code-generation-with-bake.html
@@ -27,6 +27,9 @@
/**
* Schema is a command-line database management utility for automating programmer chores.
*
+ * Schema is CakePHP's database management utility. This helps you maintain versions of
+ * of your database.
+ *
* @package Cake.Console.Command
* @link http://book.cakephp.org/2.0/en/console-and-shells/schema-management-and-migrations.html
*/
@@ -101,10 +101,12 @@ public function execute() {
return $this->all();
}
$model = $this->_modelName($this->args[0]);
- $object = $this->_getModelObject($model);
+ $this->listAll($this->connection);
+ $useTable = $this->getTable($model);
+ $object = $this->_getModelObject($model, $useTable);
if ($this->bake($object, false)) {
if ($this->_checkUnitTest()) {
- $this->bakeFixture($model);
+ $this->bakeFixture($model, $useTable);
$this->bakeTest($model);
}
}
@@ -822,12 +824,14 @@ public function bakeTest($className) {
public function listAll($useDbConfig = null) {
$this->_tables = (array) $this->getAllTables($useDbConfig);
+ $this->_modelNames = array();
+ $count = count($this->_tables);
+ for ($i = 0; $i < $count; $i++) {
+ $this->_modelNames[] = $this->_modelName($this->_tables[$i]);
+ }
if ($this->interactive === true) {
$this->out(__d('cake_console', 'Possible Models based on your current database:'));
- $this->_modelNames = array();
- $count = count($this->_tables);
for ($i = 0; $i < $count; $i++) {
- $this->_modelNames[] = $this->_modelName($this->_tables[$i]);
$this->out($i + 1 . ". " . $this->_modelNames[$i]);
}
}
@@ -842,26 +846,27 @@ public function listAll($useDbConfig = null) {
* @return string Table name
*/
public function getTable($modelName, $useDbConfig = null) {
- if (!isset($useDbConfig)) {
- $useDbConfig = $this->connection;
- }
-
- $db = ConnectionManager::getDataSource($useDbConfig);
$useTable = Inflector::tableize($modelName);
if (in_array($modelName, $this->_modelNames)) {
$modelNames = array_flip($this->_modelNames);
$useTable = $this->_tables[$modelNames[$modelName]];
}
- $fullTableName = $db->fullTableName($useTable, false);
- $tableIsGood = false;
- if (array_search($useTable, $this->_tables) === false) {
- $this->out();
- $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') {
- $useTable = $this->in(__d('cake_console', 'What is the name of the table?'));
+ if ($this->interactive === true) {
+ if (!isset($useDbConfig)) {
+ $useDbConfig = $this->connection;
+ }
+ $db = ConnectionManager::getDataSource($useDbConfig);
+ $fullTableName = $db->fullTableName($useTable, false);
+ $tableIsGood = false;
+ if (array_search($useTable, $this->_tables) === false) {
+ $this->out();
+ $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') {
+ $useTable = $this->in(__d('cake_console', 'What is the name of the table?'));
+ }
}
return $useTable;
}
@@ -21,7 +21,7 @@
App::uses('Folder', 'Utility');
/**
- * Task class for creating a plugin
+ * The Plugin Task handles creating an empty plugin, ready to be used
*
* @package Cake.Console.Command.Task
*/
@@ -288,9 +288,7 @@ public function securityCipherSeed($path) {
$File = new File($path . 'Config' . DS . 'core.php');
$contents = $File->read();
if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
- if (!class_exists('Security')) {
- require CAKE . 'Utility' . DS . 'security.php';
- }
+ App::uses('Security', 'Utility');
$string = substr(bin2hex(Security::generateAuthKey()), 0, 30);
$result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \''.$string.'\');', $contents);
if ($File->write($result)) {
@@ -554,6 +554,7 @@ public function exceptions() {
);
$this->_filesRegexpUpdate($patterns);
}
+
/**
* Move application views files to where they now should be
*
View
@@ -80,6 +80,14 @@ class Shell extends Object {
public $name = null;
/**
+ * The name of the plugin the shell belongs to.
+ * Is automatically set by ShellDispatcher when a shell is constructed.
+ *
+ * @var string
+ */
+ public $plugin = null;
+
+/**
* Contains tasks to load and instantiate
*
* @var array
@@ -409,7 +417,8 @@ protected function _displayHelp($command) {
* @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::getOptionParser
*/
public function getOptionParser() {
- $parser = new ConsoleOptionParser($this->name);
+ $name = ($this->plugin ? $this->plugin . '.' : '') . $this->name;
+ $parser = new ConsoleOptionParser($name);
return $parser;
}
@@ -716,10 +725,10 @@ protected function _controllerName($name) {
}
/**
- * Creates the proper controller camelized name (singularized) for the specified name
+ * Creates the proper model camelized name (singularized) for the specified name
*
* @param string $name Name
- * @return string Camelized and singularized controller name
+ * @return string Camelized and singularized model name
*/
protected function _modelName($name) {
return Inflector::camelize(Inflector::singularize($name));
@@ -219,6 +219,7 @@ protected function _getShell($shell) {
));
}
$Shell = new $class();
+ $Shell->plugin = trim($plugin, '.');
return $Shell;
}
@@ -200,6 +200,7 @@
* timestamping regardless of debug value.
*/
//Configure::write('Asset.timestamp', true);
+
/**
* Compress CSS output by removing comments, whitespace, repeating tags, etc.
* This requires a/var/cache directory to be writable by the web server for caching.
@@ -365,6 +365,7 @@ form .submit input[type=submit] {
form .submit input[type=submit]:hover {
background: #5BA150;
}
+
/* Form errors */
form .error {
background: #FFDACC;
@@ -646,6 +647,7 @@ pre {
overflow: auto;
text-shadow: none;
}
+
/* excerpt */
.cake-code-dump pre,
.cake-code-dump pre code {
@@ -24,6 +24,7 @@
if (!defined('DS')) {
define('DS', DIRECTORY_SEPARATOR);
}
+
/**
* These defines should only be edited if you have cake installed in
* a directory layout other than the way it is distributed.
@@ -37,6 +38,7 @@
if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__))));
}
+
/**
* The actual directory name for the "app".
*
@@ -24,6 +24,7 @@
if (!defined('DS')) {
define('DS', DIRECTORY_SEPARATOR);
}
+
/**
* These defines should only be edited if you have cake installed in
* a directory layout other than the way it is distributed.
@@ -37,6 +38,7 @@
if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__))));
}
+
/**
* The actual directory name for the "app".
*
@@ -18,6 +18,14 @@
* @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
+
+/**
+ * Error Handling Controller
+ *
+ * Controller used by ErrorHandler to render error views.
+ *
+ * @package Cake.Controller
+ */
class CakeErrorController extends AppController {
/**
@@ -100,6 +100,7 @@ public function __construct(ComponentCollection $collection, $settings) {
$this->settings['opaque'] = md5($this->settings['realm']);
}
}
+
/**
* Authenticate a user using Digest HTTP auth. Will use the configured User model and attempt a
* login using Digest HTTP auth.
@@ -142,6 +143,7 @@ public function getUser($request) {
}
return false;
}
+
/**
* Find a user record using the standard options.
*
@@ -22,7 +22,11 @@
App::uses('Xml', 'Utility');
/**
- * Request object for handling HTTP requests
+ * Request object for handling alternative HTTP requests
+ *
+ * Alternative HTTP requests can come from wireless units like mobile phones, palmtop computers,
+ * and the like. These units have no use for Ajax requests, and this Component can tell how Cake
+ * should respond to the different needs of a handheld computer and a desktop machine.
*
* @package Cake.Controller.Component
* @link http://book.cakephp.org/2.0/en/core-libraries/components/request-handling.html
@@ -22,7 +22,14 @@
App::uses('Security', 'Utility');
/**
- * SecurityComponent
+ * The Security Component creates an easy way to integrate tighter security in
+ * your application. It provides methods for various tasks like:
+ *
+ * - Restricting which HTTP methods your application accepts.
+ * - CSRF protection.
+ * - Form tampering protection
+ * - Requiring that SSL be used.
+ * - Limiting cross controller communication.
*
* @package Cake.Controller.Component
* @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html
@@ -1,6 +1,6 @@
<?php
/**
- * SessionComponent. Provides access to Sessions from the Controller layer
+ * SessionComponent. Provides access to Sessions from the Controller layer
*
* PHP 5
*
@@ -21,9 +21,9 @@
App::uses('CakeSession', 'Model/Datasource');
/**
- * Session Component.
- *
- * Session handling from the controller.
+ * The CakePHP SessionComponent provides a way to persist client data between
+ * page requests. It acts as a wrapper for the `$_SESSION` as well as providing
+ * convenience methods for several `$_SESSION` related functions.
*
* @package Cake.Controller.Component
* @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html
@@ -19,6 +19,12 @@
App::uses('ObjectCollection', 'Utility');
App::uses('Component', 'Controller');
+/**
+ * Components collection is used as a registry for loaded components and handles loading
+ * and constructing component class objects.
+ *
+ * @package Cake.Controller
+ */
class ComponentCollection extends ObjectCollection {
/**
Oops, something went wrong.

0 comments on commit 2e8498e

Please sign in to comment.