Permalink
Browse files

double spaces to single ones

  • Loading branch information...
1 parent a8bd7c6 commit b811afbc44aa032aa6931c9fbebd9e9d827eb892 @dereuromark dereuromark committed Dec 22, 2012
Showing with 654 additions and 654 deletions.
  1. +18 −18 lib/Cake/Cache/Cache.php
  2. +2 −2 lib/Cake/Cache/Engine/ApcEngine.php
  3. +4 −4 lib/Cake/Cache/Engine/FileEngine.php
  4. +4 −4 lib/Cake/Cache/Engine/MemcacheEngine.php
  5. +1 −1 lib/Cake/Cache/Engine/WincacheEngine.php
  6. +1 −1 lib/Cake/Config/cacert.pem
  7. +1 −1 lib/Cake/Configure/IniReader.php
  8. +2 −2 lib/Cake/Configure/PhpReader.php
  9. +3 −3 lib/Cake/Console/Command/AclShell.php
  10. +1 −1 lib/Cake/Console/Command/ConsoleShell.php
  11. +2 −2 lib/Cake/Console/Command/SchemaShell.php
  12. +1 −1 lib/Cake/Console/Command/Task/BakeTask.php
  13. +1 −1 lib/Cake/Console/Command/Task/ControllerTask.php
  14. +1 −1 lib/Cake/Console/Command/Task/FixtureTask.php
  15. +1 −1 lib/Cake/Console/Command/Task/TemplateTask.php
  16. +2 −2 lib/Cake/Console/Command/Task/ViewTask.php
  17. +2 −2 lib/Cake/Console/ConsoleInputOption.php
  18. +24 −24 lib/Cake/Console/ConsoleOptionParser.php
  19. +3 −3 lib/Cake/Console/ConsoleOutput.php
  20. +4 −4 lib/Cake/Console/HelpFormatter.php
  21. +3 −3 lib/Cake/Console/Shell.php
  22. +1 −1 lib/Cake/Console/ShellDispatcher.php
  23. +2 −2 lib/Cake/Console/TaskCollection.php
  24. +1 −1 lib/Cake/Console/Templates/default/views/view.ctp
  25. +9 −9 lib/Cake/Console/Templates/skel/Config/core.php
  26. +3 −3 lib/Cake/Console/Templates/skel/Config/database.php.default
  27. +1 −1 lib/Cake/Console/Templates/skel/Config/email.php.default
  28. +1 −1 lib/Cake/Console/Templates/skel/Config/routes.php
  29. +2 −2 lib/Cake/Console/Templates/skel/webroot/index.php
  30. +2 −2 lib/Cake/Console/Templates/skel/webroot/test.php
  31. +5 −5 lib/Cake/Controller/Component.php
  32. +2 −2 lib/Cake/Controller/Component/Acl/DbAcl.php
  33. +2 −2 lib/Cake/Controller/Component/Acl/IniAcl.php
  34. +1 −1 lib/Cake/Controller/Component/AclComponent.php
  35. +1 −1 lib/Cake/Controller/Component/Auth/ActionsAuthorize.php
  36. +1 −1 lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
  37. +7 −7 lib/Cake/Controller/Component/Auth/BaseAuthorize.php
  38. +7 −7 lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
  39. +2 −2 lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
  40. +4 −4 lib/Cake/Controller/Component/Auth/CrudAuthorize.php
  41. +10 −10 lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
  42. +4 −4 lib/Cake/Controller/Component/Auth/FormAuthenticate.php
  43. +24 −24 lib/Cake/Controller/Component/AuthComponent.php
  44. +1 −1 lib/Cake/Controller/Component/CookieComponent.php
  45. +1 −1 lib/Cake/Controller/Component/EmailComponent.php
  46. +12 −12 lib/Cake/Controller/Component/PaginatorComponent.php
  47. +16 −16 lib/Cake/Controller/Component/RequestHandlerComponent.php
  48. +7 −7 lib/Cake/Controller/Component/SecurityComponent.php
  49. +1 −1 lib/Cake/Controller/Component/SessionComponent.php
  50. +2 −2 lib/Cake/Controller/ComponentCollection.php
  51. +10 −10 lib/Cake/Controller/Controller.php
  52. +1 −1 lib/Cake/Controller/Scaffold.php
  53. +7 −7 lib/Cake/Core/App.php
  54. +14 −14 lib/Cake/Core/Configure.php
  55. +9 −9 lib/Cake/Core/Object.php
  56. +12 −12 lib/Cake/Error/ErrorHandler.php
  57. +4 −4 lib/Cake/Error/ExceptionRenderer.php
  58. +8 −8 lib/Cake/Error/exceptions.php
  59. +2 −2 lib/Cake/I18n/I18n.php
  60. +12 −12 lib/Cake/Log/CakeLog.php
  61. +1 −1 lib/Cake/Log/Engine/BaseLog.php
  62. +1 −1 lib/Cake/Log/Engine/ConsoleLog.php
  63. +1 −1 lib/Cake/Log/Engine/FileLog.php
  64. +3 −3 lib/Cake/Model/Behavior/TranslateBehavior.php
  65. +3 −3 lib/Cake/Model/BehaviorCollection.php
  66. +1 −1 lib/Cake/Model/Datasource/CakeSession.php
  67. +1 −1 lib/Cake/Model/Datasource/DataSource.php
  68. +1 −1 lib/Cake/Model/Datasource/Database/Mysql.php
  69. +2 −2 lib/Cake/Model/Datasource/Database/Postgres.php
  70. +1 −1 lib/Cake/Model/Datasource/Database/Sqlite.php
  71. +3 −3 lib/Cake/Model/Datasource/Database/Sqlserver.php
  72. +22 −22 lib/Cake/Model/Datasource/DboSource.php
  73. +1 −1 lib/Cake/Model/Datasource/Session/CacheSession.php
  74. +2 −2 lib/Cake/Model/Datasource/Session/CakeSessionHandlerInterface.php
  75. +2 −2 lib/Cake/Model/Datasource/Session/DatabaseSession.php
  76. +13 −13 lib/Cake/Model/Model.php
  77. +17 −17 lib/Cake/Model/ModelBehavior.php
  78. +1 −1 lib/Cake/Model/ModelValidator.php
  79. +2 −2 lib/Cake/Model/Permission.php
  80. +17 −17 lib/Cake/Network/CakeRequest.php
  81. +2 −2 lib/Cake/Network/CakeResponse.php
  82. +1 −1 lib/Cake/Network/Email/CakeEmail.php
  83. +2 −2 lib/Cake/Network/Http/HttpSocket.php
  84. +4 −4 lib/Cake/Routing/Dispatcher.php
  85. +7 −7 lib/Cake/Routing/Route/CakeRoute.php
  86. +32 −32 lib/Cake/Routing/Router.php
  87. +1 −1 lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
  88. +1 −1 lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
  89. +2 −2 lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
  90. +1 −1 lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
  91. +1 −1 lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
  92. +5 −5 lib/Cake/Test/Case/Model/ModelIntegrationTest.php
  93. +1 −1 lib/Cake/Test/Case/Model/ModelValidationTest.php
  94. +1 −1 lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
  95. +2 −2 lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  96. +2 −2 lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
  97. +1 −1 lib/Cake/Test/Case/View/HelperTest.php
  98. +1 −1 lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
  99. +1 −1 lib/Cake/TestSuite/CakeTestRunner.php
  100. +2 −2 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
  101. +4 −4 lib/Cake/TestSuite/ControllerTestCase.php
  102. +2 −2 lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
  103. +1 −1 lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
  104. +3 −3 lib/Cake/Utility/CakeNumber.php
  105. +2 −2 lib/Cake/Utility/ClassRegistry.php
  106. +11 −11 lib/Cake/Utility/Debugger.php
  107. +3 −3 lib/Cake/Utility/File.php
  108. +4 −4 lib/Cake/Utility/Hash.php
  109. +8 −8 lib/Cake/Utility/ObjectCollection.php
  110. +1 −1 lib/Cake/Utility/Security.php
  111. +2 −2 lib/Cake/Utility/Set.php
  112. +1 −1 lib/Cake/Utility/String.php
  113. +2 −2 lib/Cake/Utility/Validation.php
  114. +2 −2 lib/Cake/Utility/Xml.php
  115. +1 −1 lib/Cake/View/Elements/sql_dump.ctp
  116. +12 −12 lib/Cake/View/Helper.php
  117. +1 −1 lib/Cake/View/Helper/CacheHelper.php
  118. +35 −35 lib/Cake/View/Helper/FormHelper.php
  119. +6 −6 lib/Cake/View/Helper/HtmlHelper.php
  120. +3 −3 lib/Cake/View/Helper/JqueryEngineHelper.php
  121. +7 −7 lib/Cake/View/Helper/JsBaseEngineHelper.php
  122. +8 −8 lib/Cake/View/Helper/JsHelper.php
  123. +3 −3 lib/Cake/View/Helper/MootoolsEngineHelper.php
  124. +16 −16 lib/Cake/View/Helper/PaginatorHelper.php
  125. +1 −1 lib/Cake/View/Helper/SessionHelper.php
  126. +1 −1 lib/Cake/View/Helper/TextHelper.php
  127. +5 −5 lib/Cake/View/HelperCollection.php
  128. +4 −4 lib/Cake/View/JsonView.php
  129. +3 −3 lib/Cake/View/MediaView.php
  130. +26 −26 lib/Cake/View/View.php
  131. +5 −5 lib/Cake/View/ViewBlock.php
  132. +5 −5 lib/Cake/View/XmlView.php
  133. +9 −9 lib/Cake/basics.php
@@ -19,10 +19,10 @@
/**
* Cache provides a consistent interface to Caching in your application. It allows you
* to use several different Cache engines, without coupling your application to a specific
- * implementation. It also allows you to change out cache storage or configuration without effecting
+ * implementation. It also allows you to change out cache storage or configuration without effecting
* the rest of your application.
*
- * You can configure Cache engines in your application's `bootstrap.php` file. A sample configuration would
+ * You can configure Cache engines in your application's `bootstrap.php` file. A sample configuration would
* be
*
* {{{
@@ -32,9 +32,9 @@
* ));
* }}}
*
- * This would configure an APC cache engine to the 'shared' alias. You could then read and write
- * to that cache alias by using it for the `$config` parameter in the various Cache methods. In
- * general all Cache operations are supported by all cache engines. However, Cache::increment() and
+ * This would configure an APC cache engine to the 'shared' alias. You could then read and write
+ * to that cache alias by using it for the `$config` parameter in the various Cache methods. In
+ * general all Cache operations are supported by all cache engines. However, Cache::increment() and
* Cache::decrement() are not supported by File caching.
*
* @package Cake.Cache
@@ -65,7 +65,7 @@ class Cache {
protected static $_engines = array();
/**
- * Set the cache configuration to use. config() can
+ * Set the cache configuration to use. config() can
* both create new configurations, return the settings for already configured
* configurations.
*
@@ -95,15 +95,15 @@ class Cache {
* handy for deleting a complete group from cache.
* - `prefix` Prefix appended to all entries. Good for when you need to share a keyspace
* with either another cache config or another application.
- * - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
+ * - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
* cache::gc from ever being called automatically.
* - `servers' Used by memcache. Give the address of the memcached servers to use.
- * - `compress` Used by memcache. Enables memcache's compressed format.
- * - `serialize` Used by FileCache. Should cache objects be serialized first.
- * - `path` Used by FileCache. Path to where cachefiles should be saved.
- * - `lock` Used by FileCache. Should files be locked before writing to them?
- * - `user` Used by Xcache. Username for XCache
- * - `password` Used by Xcache/Redis. Password for XCache/Redis
+ * - `compress` Used by memcache. Enables memcache's compressed format.
+ * - `serialize` Used by FileCache. Should cache objects be serialized first.
+ * - `path` Used by FileCache. Path to where cachefiles should be saved.
+ * - `lock` Used by FileCache. Should files be locked before writing to them?
+ * - `user` Used by Xcache. Username for XCache
+ * - `password` Used by Xcache/Redis. Password for XCache/Redis
*
* @see app/Config/core.php for configuration settings
* @param string $name Name of the configuration
@@ -180,7 +180,7 @@ public static function configured() {
}
/**
- * Drops a cache engine. Deletes the cache configuration information
+ * Drops a cache engine. Deletes the cache configuration information
* If the deleted configuration is the last configuration using an certain engine,
* the Engine instance is also unset.
*
@@ -196,7 +196,7 @@ public static function drop($name) {
}
/**
- * Temporarily change the settings on a cache config. The settings will persist for the next write
+ * Temporarily change the settings on a cache config. The settings will persist for the next write
* operation (write, decrement, increment, clear). Any reads that are done before the write, will
* use the modified settings. If `$settings` is empty, the settings will be reset to the
* original configuration.
@@ -262,7 +262,7 @@ public static function gc($config = 'default', $expires = null) {
/**
* Write data for key into cache. Will automatically use the currently
- * active cache configuration. To set the currently active configuration use
+ * active cache configuration. To set the currently active configuration use
* Cache::config()
*
* ### Usage:
@@ -312,8 +312,8 @@ public static function write($key, $value, $config = 'default') {
}
/**
- * Read a key from the cache. Will automatically use the currently
- * active cache configuration. To set the currently active configuration use
+ * Read a key from the cache. Will automatically use the currently
+ * active cache configuration. To set the currently active configuration use
* Cache::config()
*
* ### Usage:
@@ -117,10 +117,10 @@ public function delete($key) {
}
/**
- * Delete all keys from the cache. This will clear every cache config using APC.
+ * Delete all keys from the cache. This will clear every cache config using APC.
*
* @param boolean $check If true, nothing will be cleared, as entries are removed
- * from APC as they expired. This flag is really only used by FileEngine.
+ * from APC as they expired. This flag is really only used by FileEngine.
* @return boolean True Returns true.
*/
public function clear($check) {
@@ -1,7 +1,7 @@
<?php
/**
- * 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
+ * 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()
@@ -21,8 +21,8 @@
*/
/**
- * 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
+ * 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()
@@ -19,8 +19,8 @@
*/
/**
- * Memcache storage engine for cache. Memcache has some limitations in the amount of
- * control you have over expire times far in the future. See MemcacheEngine::write() for
+ * Memcache storage engine for cache. Memcache has some limitations in the amount of
+ * control you have over expire times far in the future. See MemcacheEngine::write() for
* more information.
*
* @package Cake.Cache.Engine
@@ -98,7 +98,7 @@ public function init($settings = array()) {
}
/**
- * Parses the server address into the host/port. Handles both IPv6 and IPv4
+ * Parses the server address into the host/port. Handles both IPv6 and IPv4
* addresses and Unix sockets
*
* @param string $server The server address string.
@@ -126,7 +126,7 @@ protected function _parseServerString($server) {
}
/**
- * Write data for key into cache. When using memcache as your cache engine
+ * Write data for key into cache. When using memcache as your cache engine
* remember that the Memcache pecl extension does not support cache expiry times greater
* than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
*
@@ -121,7 +121,7 @@ public function delete($key) {
}
/**
- * Delete all keys from the cache. This will clear every
+ * Delete all keys from the cache. This will clear every
* item in the cache matching the cache config prefix.
*
* @param boolean $check If true, nothing will be cleared, as entries will
@@ -5,7 +5,7 @@
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt). This file can be found in the mozilla source tree:
+## file (certdata.txt). This file can be found in the mozilla source tree:
## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
##
## It contains the certificates in PEM format and therefore
@@ -25,7 +25,7 @@
* class shares the same behavior, especially with regards to boolean and null values.
*
* In addition to the native `parse_ini_file` features, IniReader also allows you
- * to create nested array structures through usage of `.` delimited names. This allows
+ * to create nested array structures through usage of `.` delimited names. This allows
* you to create nested arrays structures in an ini config file. For example:
*
* `db.password = secret` would turn into `array('db' => array('password' => 'secret'))`
@@ -37,7 +37,7 @@ class PhpReader implements ConfigReaderInterface {
/**
* Constructor for PHP Config file reading.
*
- * @param string $path The path to read config files from. Defaults to APP . 'Config' . DS
+ * @param string $path The path to read config files from. Defaults to APP . 'Config' . DS
*/
public function __construct($path = null) {
if (!$path) {
@@ -49,7 +49,7 @@ public function __construct($path = null) {
/**
* Read a config file and return its contents.
*
- * Files with `.` in the name will be treated as values in plugins. Instead of reading from
+ * Files with `.` in the name will be treated as values in plugins. Instead of reading from
* the initialized path, plugin keys will be located using App::pluginPath().
*
* @param string $key The identifier to read from. If the key has a . it will be treated
@@ -24,8 +24,8 @@
App::uses('Hash', 'Utility');
/**
- * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode
- * being enabled. Be sure to turn it off when using this shell.
+ * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode
+ * being enabled. Be sure to turn it off when using this shell.
*
* @package Cake.Console.Command
*/
@@ -501,7 +501,7 @@ public function getOptionParser() {
' - <model>.<id> - The node will be bound to a specific record of the given model.',
'',
' - <alias> - The node will be given a string alias (or path, in the case of <parent>)',
- " i.e. 'John'. When used with <parent>, this takes the form of an alias path,",
+ " i.e. 'John'. When used with <parent>, this takes the form of an alias path,",
" i.e. <group>/<subgroup>/<parent>.",
'',
"To add a node at the root level, enter 'root' or '/' as the <parent> parameter."
@@ -120,7 +120,7 @@ public function getOptionParser() {
"\tRoute <url>",
"",
"where url is the path to your your action plus any query parameters,",
- "minus the application's base path. For example:",
+ "minus the application's base path. For example:",
"",
"\tRoute /posts/view/1",
"",
@@ -237,7 +237,7 @@ public function dump() {
}
/**
- * Run database create commands. Alias for run create.
+ * Run database create commands. Alias for run create.
*
* @return void
*/
@@ -247,7 +247,7 @@ public function create() {
}
/**
- * Run database create commands. Alias for run create.
+ * Run database create commands. Alias for run create.
*
* @return void
*/
@@ -59,7 +59,7 @@ public function startup() {
}
/**
- * Gets the path for output. Checks the plugin property
+ * Gets the path for output. Checks the plugin property
* and returns the correct path.
*
* @return string Path to output.
@@ -96,7 +96,7 @@ public function execute() {
}
/**
- * Bake All the controllers at once. Will only bake controllers for models that exist.
+ * Bake All the controllers at once. Will only bake controllers for models that exist.
*
* @return void
*/
@@ -115,7 +115,7 @@ public function execute() {
}
/**
- * Bake All the Fixtures at once. Will only bake fixtures for models that exist.
+ * Bake All the Fixtures at once. Will only bake fixtures for models that exist.
*
* @return void
*/
@@ -43,7 +43,7 @@ class TemplateTask extends AppShell {
public $templatePaths = array();
/**
- * Initialize callback. Setup paths for the template task.
+ * Initialize callback. Setup paths for the template task.
*
* @return void
*/
@@ -63,7 +63,7 @@ class ViewTask extends BakeTask {
public $scaffoldActions = array('index', 'view', 'add', 'edit');
/**
- * An array of action names that don't require templates. These
+ * An array of action names that don't require templates. These
* actions will not emit errors when doing bakeActions()
*
* @var array
@@ -423,7 +423,7 @@ public function getOptionParser() {
return $parser->description(
__d('cake_console', 'Bake views for a controller, using built-in or custom templates.')
)->addArgument('controller', array(
- 'help' => __d('cake_console', 'Name of the controller views to bake. Can be Plugin.name as a shortcut for plugin baking.')
+ 'help' => __d('cake_console', 'Name of the controller views to bake. Can be Plugin.name as a shortcut for plugin baking.')
))->addArgument('action', array(
'help' => __d('cake_console', "Will bake a single action's file. core templates are (index, add, edit, view)")
))->addArgument('alias', array(
@@ -47,7 +47,7 @@ class ConsoleInputOption {
protected $_help;
/**
- * Is the option a boolean option. Boolean options do not consume a parameter.
+ * Is the option a boolean option. Boolean options do not consume a parameter.
*
* @var boolean
*/
@@ -73,7 +73,7 @@ class ConsoleInputOption {
* @param string|array $name The long name of the option, or an array with all the properties.
* @param string $short The short alias for this option
* @param string $help The help text for this option
- * @param boolean $boolean Whether this option is a boolean option. Boolean options don't consume extra tokens
+ * @param boolean $boolean Whether this option is a boolean option. Boolean options don't consume extra tokens
* @param string $default The default value for this option.
* @param array $choices Valid choices for this option.
* @throws ConsoleException
Oops, something went wrong.

0 comments on commit b811afb

Please sign in to comment.