Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

rtim files

  • Loading branch information...
commit 3945c0e6a8e1cb6635cdf2dd8b80519e618d77c5 1 parent e1357ca
@dereuromark dereuromark authored
Showing with 76 additions and 76 deletions.
  1. +1 −1  lib/Cake/Cache/CacheEngine.php
  2. +1 −1  lib/Cake/Cache/Engine/FileEngine.php
  3. +1 −1  lib/Cake/Console/Command/Task/TemplateTask.php
  4. +2 −2 lib/Cake/Console/Command/TestShell.php
  5. +2 −2 lib/Cake/Console/Templates/skel/Config/core.php
  6. +1 −1  lib/Cake/Controller/Component.php
  7. +1 −1  lib/Cake/Controller/Component/Acl/IniAcl.php
  8. +17 −17 lib/Cake/Controller/Component/Acl/PhpAcl.php
  9. +1 −1  lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
  10. +1 −1  lib/Cake/Controller/Component/CookieComponent.php
  11. +1 −1  lib/Cake/Controller/Component/SecurityComponent.php
  12. +2 −2 lib/Cake/Controller/Component/SessionComponent.php
  13. +1 −1  lib/Cake/Core/CakePlugin.php
  14. +3 −3 lib/Cake/Core/Configure.php
  15. +1 −1  lib/Cake/Event/CakeEvent.php
  16. +3 −3 lib/Cake/Event/CakeEventManager.php
  17. +2 −2 lib/Cake/Model/Behavior/ContainableBehavior.php
  18. +1 −1  lib/Cake/Model/ConnectionManager.php
  19. +1 −1  lib/Cake/Model/Datasource/DataSource.php
  20. +1 −1  lib/Cake/Model/Datasource/Database/Sqlserver.php
  21. +1 −1  lib/Cake/Model/Validator/CakeValidationRule.php
  22. +3 −3 lib/Cake/Network/Email/CakeEmail.php
  23. +1 −1  lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
  24. +8 −8 lib/Cake/Test/Case/Console/Command/TestShellTest.php
  25. +1 −1  lib/Cake/Test/Case/Event/CakeEventManagerTest.php
  26. +1 −1  lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php
  27. +1 −1  lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
  28. +4 −4 lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php
  29. +1 −1  lib/Cake/TestSuite/Fixture/CakeTestFixture.php
  30. +1 −1  lib/Cake/TestSuite/templates/header.php
  31. +1 −1  lib/Cake/Utility/File.php
  32. +1 −1  lib/Cake/View/Elements/exception_stack_trace.ctp
  33. +1 −1  lib/Cake/View/Helper/SessionHelper.php
  34. +6 −6 lib/Cake/View/JsonView.php
  35. +1 −1  lib/Cake/View/ViewBlock.php
View
2  lib/Cake/Cache/CacheEngine.php
@@ -65,7 +65,7 @@ public function init($settings = array()) {
* Garbage collection
*
* Permanently remove all expired and deleted data
- *
+ *
* @param integer $expires [optional] An expires timestamp, invalidataing all data before.
* @return void
*/
View
2  lib/Cake/Cache/Engine/FileEngine.php
@@ -93,7 +93,7 @@ public function init($settings = array()) {
/**
* Garbage collection. Permanently remove all expired and deleted data
- *
+ *
* @param integer $expires [optional] An expires timestamp, invalidataing all data before.
* @return boolean True if garbage collection was successful, false on failure
*/
View
2  lib/Cake/Console/Command/Task/TemplateTask.php
@@ -56,7 +56,7 @@ public function initialize() {
*
* Bake themes are directories not named `skel` inside a `Console/Templates` path.
* They are listed in this order: app -> plugin -> default
- *
+ *
* @return array Array of bake themes that are installed.
*/
protected function _findThemes() {
View
4 lib/Cake/Console/Command/TestShell.php
@@ -335,8 +335,8 @@ public function available() {
* Find the test case for the passed file. The file could itself be a test.
*
* @param string $file
- * @param string $category
- * @param boolean $throwOnMissingFile
+ * @param string $category
+ * @param boolean $throwOnMissingFile
* @access protected
* @return array(type, case)
* @throws Exception
View
4 lib/Cake/Console/Templates/skel/Config/core.php
@@ -226,7 +226,7 @@
Configure::write('Acl.database', 'default');
/**
- * Uncomment this line and correct your server timezone to fix
+ * Uncomment this line and correct your server timezone to fix
* any date & time related errors.
*/
//date_default_timezone_set('UTC');
@@ -299,7 +299,7 @@
* By default File is used, but for improved performance you should use APC.
*
* Note: 'default' and other application caches should be configured in app/Config/bootstrap.php.
- * Please check the comments in boostrap.php for more info on the cache engines available
+ * Please check the comments in boostrap.php for more info on the cache engines available
* and their setttings.
*/
$engine = 'File';
View
2  lib/Cake/Controller/Component.php
@@ -120,7 +120,7 @@ public function startup(Controller $controller) {
}
/**
- * Called before the Controller::beforeRender(), and before
+ * Called before the Controller::beforeRender(), and before
* the view class is loaded, and before Controller::render()
*
* @param Controller $controller Controller with components to beforeRender
View
2  lib/Cake/Controller/Component/Acl/IniAcl.php
@@ -143,7 +143,7 @@ public function check($aro, $aco, $action = null) {
}
/**
- * Parses an INI file and returns an array that reflects the
+ * Parses an INI file and returns an array that reflects the
* INI file's section structure. Double-quote friendly.
*
* @param string $filename File
View
34 lib/Cake/Controller/Component/Acl/PhpAcl.php
@@ -18,7 +18,7 @@
*/
/**
- * PhpAcl implements an access control system using a plain PHP configuration file.
+ * PhpAcl implements an access control system using a plain PHP configuration file.
* An example file can be found in app/Config/acl.php
*
* @package Cake.Controller.Component.Acl
@@ -46,7 +46,7 @@ class PhpAcl extends Object implements AclInterface {
/**
* Aco Object
- *
+ *
* @var PhpAco
*/
public $Aco = null;
@@ -65,8 +65,8 @@ public function __construct() {
/**
* Initialize method
- *
- * @param AclComponent $Component Component instance
+ *
+ * @param AclComponent $Component Component instance
* @return void
*/
public function initialize(Component $Component) {
@@ -199,7 +199,7 @@ class PhpAco {
/**
* map modifiers for ACO paths to their respective PCRE pattern
- *
+ *
* @var array
*/
public static $modifiers = array(
@@ -263,7 +263,7 @@ public function path($aco) {
/**
* allow/deny ARO access to ARO
*
- * @return void
+ * @return void
*/
public function access($aro, $aco, $action, $type = 'deny') {
$aco = $this->resolve($aco);
@@ -315,7 +315,7 @@ public function resolve($aco) {
*
* @param array $allow ACO allow rules
* @param array $deny ACO deny rules
- * @return void
+ * @return void
*/
public function build(array $allow, array $deny = array()) {
$stack = array();
@@ -349,7 +349,7 @@ public function build(array $allow, array $deny = array()) {
class PhpAro {
/**
- * role to resolve to when a provided ARO is not listed in
+ * role to resolve to when a provided ARO is not listed in
* the internal tree
*
* @var string
@@ -359,12 +359,12 @@ class PhpAro {
/**
* map external identifiers. E.g. if
*
- * array('User' => array('username' => 'jeff', 'role' => 'editor'))
+ * array('User' => array('username' => 'jeff', 'role' => 'editor'))
*
- * is passed as an ARO to one of the methods of AclComponent, PhpAcl
+ * is passed as an ARO to one of the methods of AclComponent, PhpAcl
* will check if it can be resolved to an User or a Role defined in the
- * configuration file.
- *
+ * configuration file.
+ *
* @var array
* @see app/Config/acl.php
*/
@@ -375,7 +375,7 @@ class PhpAro {
/**
* aliases to map
- *
+ *
* @var array
*/
public $aliases = array();
@@ -400,9 +400,9 @@ public function __construct(array $aro = array(), array $map = array(), array $a
* From the perspective of the given ARO, walk down the tree and
* collect all inherited AROs levelwise such that AROs from different
* branches with equal distance to the requested ARO will be collected at the same
- * index. The resulting array will contain a prioritized list of (list of) roles ordered from
+ * index. The resulting array will contain a prioritized list of (list of) roles ordered from
* the most distant AROs to the requested one itself.
- *
+ *
* @param string|array $aro An ARO identifier
* @return array prioritized AROs
*/
@@ -427,7 +427,7 @@ public function roles($aro) {
/**
* resolve an ARO identifier to an internal ARO string using
- * the internal mapping information.
+ * the internal mapping information.
*
* @param string|array $aro ARO identifier (User.jeff, array('User' => ...), etc)
* @return string internal aro string (e.g. User/jeff, Role/default)
@@ -529,7 +529,7 @@ public function addAlias(array $alias) {
* build an ARO tree structure for internal processing
*
* @param array $aros array of AROs as key and their inherited AROs as values
- * @return void
+ * @return void
*/
public function build(array $aros) {
$this->_tree = array();
View
2  lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
@@ -68,7 +68,7 @@ class DigestAuthenticate extends BaseAuthenticate {
* - `realm` The realm authentication is for, Defaults to the servername.
* - `nonce` A nonce used for authentication. Defaults to `uniqid()`.
* - `qop` Defaults to auth, no other values are supported at this time.
- * - `opaque` A string that must be returned unchanged by clients.
+ * - `opaque` A string that must be returned unchanged by clients.
* Defaults to `md5($settings['realm'])`
*
* @var array
View
2  lib/Cake/Controller/Component/CookieComponent.php
@@ -155,7 +155,7 @@ class CookieComponent extends Component {
/**
* A reference to the Controller's CakeResponse object
- *
+ *
* @var CakeResponse
*/
protected $_response = null;
View
2  lib/Cake/Controller/Component/SecurityComponent.php
@@ -23,7 +23,7 @@
App::uses('Security', 'Utility');
/**
- * The Security Component creates an easy way to integrate tighter security in
+ * 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.
View
4 lib/Cake/Controller/Component/SessionComponent.php
@@ -21,8 +21,8 @@
App::uses('CakeSession', 'Model/Datasource');
/**
- * 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
+ * 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
View
2  lib/Cake/Core/CakePlugin.php
@@ -18,7 +18,7 @@
*/
/**
- * CakePlugin is responsible for loading and unloading plugins. It also can
+ * CakePlugin is responsible for loading and unloading plugins. It also can
* retrieve plugin paths and load their bootstrap and routes files.
*
* @package Cake.Core
View
6 lib/Cake/Core/Configure.php
@@ -286,7 +286,7 @@ public static function load($key, $config = 'default', $merge = true) {
/**
* Dump data currently in Configure into $filename. The serialization format
* is decided by the config reader attached as $config. For example, if the
- * 'default' adapter is a PhpReader, the generated file will be a PHP
+ * 'default' adapter is a PhpReader, the generated file will be a PHP
* configuration file loadable by the PhpReader.
*
* ## Usage
@@ -303,7 +303,7 @@ public static function load($key, $config = 'default', $merge = true) {
* @param string $key The identifier to create in the config adapter.
* This could be a filename or a cache key depending on the adapter being used.
* @param string $config The name of the configured adapter to dump data with.
- * @param array $keys The name of the top-level keys you want to dump.
+ * @param array $keys The name of the top-level keys you want to dump.
* This allows you save only some data stored in Configure.
* @return boolean success
* @throws ConfigureException if the adapter does not implement a `dump` method.
@@ -381,7 +381,7 @@ public static function clear() {
}
/**
* Set the error and exception handlers.
- *
+ *
* @param array $error The Error handling configuration.
* @param array $exception The exception handling configuration.
* @return void
View
2  lib/Cake/Event/CakeEvent.php
@@ -27,7 +27,7 @@ class CakeEvent {
/**
* Name of the event
- *
+ *
* @var string $name
*/
protected $_name = null;
View
6 lib/Cake/Event/CakeEventManager.php
@@ -50,7 +50,7 @@ class CakeEventManager {
protected $_listeners = array();
/**
- * Internal flag to distinguish a common manager from the sigleton
+ * Internal flag to distinguish a common manager from the sigleton
*
* @var boolean
*/
@@ -64,7 +64,7 @@ class CakeEventManager {
*
* If called with a first params, it will be set as the globally available instance
*
- * @param CakeEventManager $manager
+ * @param CakeEventManager $manager
* @return CakeEventManager the global event manager
*/
public static function instance($manager = null) {
@@ -80,7 +80,7 @@ public static function instance($manager = null) {
}
/**
- * Adds a new listener to an event. Listeners
+ * Adds a new listener to an event. Listeners
*
* @param callback|CakeEventListener $callable PHP valid callback type or instance of CakeEventListener to be called
* when the event named with $eventKey is triggered. If a CakeEventListener instances is passed, then the `implementedEvents`
View
4 lib/Cake/Model/Behavior/ContainableBehavior.php
@@ -20,8 +20,8 @@
*/
/**
- * Behavior to allow for dynamic and atomic manipulation of a Model's associations
- * used for a find call. Most useful for limiting the amount of associations and
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations
+ * used for a find call. Most useful for limiting the amount of associations and
* data returned.
*
* @package Cake.Model.Behavior
View
2  lib/Cake/Model/ConnectionManager.php
@@ -24,7 +24,7 @@
/**
* Manages loaded instances of DataSource objects
*
- * Provides an interface for loading and enumerating connections defined in
+ * Provides an interface for loading and enumerating connections defined in
* app/Config/database.php
*
* @package Cake.Model
View
2  lib/Cake/Model/Datasource/DataSource.php
@@ -418,7 +418,7 @@ public function getSchemaName() {
/**
* Closes a connection. Override in subclasses
- *
+ *
* @return boolean
* @access public
*/
View
2  lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -636,7 +636,7 @@ public function insertMulti($table, $fields, $values) {
/**
* Generate a database-native column schema string
*
- * @param array $column An array structured like the
+ * @param array $column An array structured like the
* following: array('name'=>'value', 'type'=>'value'[, options]),
* where options can be 'default', 'length', or 'key'.
* @return string
View
2  lib/Cake/Model/Validator/CakeValidationRule.php
@@ -246,7 +246,7 @@ protected function _getPropertiesArray() {
* If called with no parameters it will return whether this rule
* is configured for update operations or not.
*
- * @return boolean
+ * @return boolean
**/
public function isUpdate($exists = null) {
if ($exists === null) {
View
6 lib/Cake/Network/Email/CakeEmail.php
@@ -1035,7 +1035,7 @@ public function config($config = null) {
/**
* Send an email using the specified content, template and layout
- *
+ *
* @param string|array $content String with message or array with messages
* @return array
* @throws SocketException
@@ -1337,7 +1337,7 @@ protected function _createBoundary() {
/**
* Attach non-embedded files by adding file contents inside boundaries.
*
- * @param string $boundary Boundary to use. If null, will default to $this->_boundary
+ * @param string $boundary Boundary to use. If null, will default to $this->_boundary
* @return array An array of lines to add to the message
*/
protected function _attachFiles($boundary = null) {
@@ -1380,7 +1380,7 @@ protected function _readFile($file) {
/**
* Attach inline/embedded files to the message.
*
- * @param string $boundary Boundary to use. If null, will default to $this->_boundary
+ * @param string $boundary Boundary to use. If null, will default to $this->_boundary
* @return array An array of lines to add to the message
*/
protected function _attachInlineFiles($boundary = null) {
View
2  lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
@@ -102,7 +102,7 @@ public function testReadAndWriteCache() {
/**
* Test read/write on the same cache key. Ensures file handles are re-wound.
- *
+ *
* @return void
*/
public function testConsecutiveReadWrite() {
View
16 lib/Cake/Test/Case/Console/Command/TestShellTest.php
@@ -64,7 +64,7 @@ public function tearDown() {
/**
* testMapCoreFileToCategory
- *
+ *
* @return void
*/
public function testMapCoreFileToCategory() {
@@ -84,7 +84,7 @@ public function testMapCoreFileToCategory() {
* testMapCoreFileToCase
*
* basics.php is a slightly special case - it's the only file in the core with a test that isn't Capitalized
- *
+ *
* @return void
*/
public function testMapCoreFileToCase() {
@@ -102,7 +102,7 @@ public function testMapCoreFileToCase() {
/**
* testMapAppFileToCategory
- *
+ *
* @return void
*/
public function testMapAppFileToCategory() {
@@ -132,7 +132,7 @@ public function testMapAppFileToCase() {
/**
* testMapPluginFileToCategory
- *
+ *
* @return void
*/
public function testMapPluginFileToCategory() {
@@ -162,7 +162,7 @@ public function testMapPluginFileToCase() {
/**
* testMapCoreTestToCategory
- *
+ *
* @return void
*/
public function testMapCoreTestToCategory() {
@@ -182,7 +182,7 @@ public function testMapCoreTestToCategory() {
* testMapCoreTestToCase
*
* basics.php is a slightly special case - it's the only file in the core with a test that isn't Capitalized
- *
+ *
* @return void
*/
public function testMapCoreTestToCase() {
@@ -200,7 +200,7 @@ public function testMapCoreTestToCase() {
/**
* testMapAppTestToCategory
- *
+ *
* @return void
*/
public function testMapAppTestToCategory() {
@@ -230,7 +230,7 @@ public function testMapAppTestToCase() {
/**
* testMapPluginTestToCategory
- *
+ *
* @return void
*/
public function testMapPluginTestToCategory() {
View
2  lib/Cake/Test/Case/Event/CakeEventManagerTest.php
@@ -53,7 +53,7 @@ public function secondListenerFunction() {
/**
* Auxiliary function to help in stopPropagation testing
*
- * @param CakeEvent $event
+ * @param CakeEvent $event
* @return void
*/
public function stopListener($event) {
View
2  lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php
@@ -29,7 +29,7 @@ class TestSource extends DataSource {
/**
* _schema
- * @var type
+ * @var type
*/
protected $_schema = array(
'id' => array(
View
2  lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
@@ -227,7 +227,7 @@ public function testInit() {
}
/**
- * test that init() correctly sets the fixture table when the connection
+ * test that init() correctly sets the fixture table when the connection
* or model have prefixes defined.
*
* @return void
View
8 lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php
@@ -22,7 +22,7 @@ class CakeTestSuiteTest extends CakeTestCase {
/**
* testAddTestDirectory
- *
+ *
* @return void
*/
public function testAddTestDirectory() {
@@ -39,7 +39,7 @@ public function testAddTestDirectory() {
/**
* testAddTestDirectoryRecursive
- *
+ *
* @return void
*/
public function testAddTestDirectoryRecursive() {
@@ -57,7 +57,7 @@ public function testAddTestDirectoryRecursive() {
/**
* testAddTestDirectoryRecursiveWithHidden
- *
+ *
* @return void
*/
public function testAddTestDirectoryRecursiveWithHidden() {
@@ -81,7 +81,7 @@ public function testAddTestDirectoryRecursiveWithHidden() {
/**
* testAddTestDirectoryRecursiveWithNonPhp
- *
+ *
* @return void
*/
public function testAddTestDirectoryRecursiveWithNonPhp() {
View
2  lib/Cake/TestSuite/Fixture/CakeTestFixture.php
@@ -16,7 +16,7 @@
App::uses('CakeSchema', 'Model');
/**
- * CakeTestFixture is responsible for building and destroying tables to be used
+ * CakeTestFixture is responsible for building and destroying tables to be used
* during testing.
*
* @package Cake.TestSuite.Fixture
View
2  lib/Cake/TestSuite/templates/header.php
@@ -127,7 +127,7 @@
div.code-coverage-results span.result-bad { color: #a00; }
div.code-coverage-results span.result-ok { color: #fa0; }
div.code-coverage-results span.result-good { color: #0a0; }
-
+
div#version {
padding-top: 2px;
float: right;
View
2  lib/Cake/Utility/File.php
@@ -546,7 +546,7 @@ public function copy($dest, $overwrite = true) {
}
/**
- * Get the mime type of the file. Uses the finfo extension if
+ * Get the mime type of the file. Uses the finfo extension if
* its available, otherwise falls back to mime_content_type
*
* @return false|string The mimetype of the file, or false if reading fails.
View
2  lib/Cake/View/Elements/exception_stack_trace.ctp
@@ -49,7 +49,7 @@ App::uses('Debugger', 'Utility');
endif;
$called = isset($stack['class']) ? $stack['class'] . $stack['type'] . $stack['function'] : $stack['function'];
-
+
printf(
'<a href="#" onclick="traceToggle(event, \'trace-args-%s\')">%s(%s)</a> ',
$i,
View
2  lib/Cake/View/Helper/SessionHelper.php
@@ -100,7 +100,7 @@ public function error() {
* echo $this->Session->flash('flash', array('element' => 'my_custom_element'));
* }}}
*
- * If you want to use an element from a plugin for rendering your flash message you can do that using the
+ * If you want to use an element from a plugin for rendering your flash message you can do that using the
* plugin param:
*
* {{{
View
12 lib/Cake/View/JsonView.php
@@ -25,7 +25,7 @@
*
* `$this->set(array('posts' => $posts, '_serialize' => 'posts'));`
*
- * When the view is rendered, the `$posts` view variable will be serialized
+ * When the view is rendered, the `$posts` view variable will be serialized
* into JSON.
*
* You can also define `'_serialize'` as an array. This will create a top level object containing
@@ -35,7 +35,7 @@
* $this->set(compact('posts', 'users', 'stuff'));
* $this->set('_serialize', array('posts', 'users'));
* }}}
- *
+ *
* The above would generate a JSON object that looks like:
*
* `{"posts": [...], "users": [...]}`
@@ -49,9 +49,9 @@
class JsonView extends View {
/**
- * JSON views are always located in the 'json' sub directory for a
+ * JSON views are always located in the 'json' sub directory for a
* controllers views.
- *
+ *
* @var string
*/
public $subDir = 'json';
@@ -72,8 +72,8 @@ public function __construct(Controller $controller = null) {
* Render a JSON view.
*
* Uses the special '_serialize' parameter to convert a set of
- * view variables into a JSON response. Makes generating simple
- * JSON responses very easy. You can omit the '_serialize' parameter,
+ * view variables into a JSON response. Makes generating simple
+ * JSON responses very easy. You can omit the '_serialize' parameter,
* and use a normal view + layout as well.
*
* @param string $view The view being rendered.
View
2  lib/Cake/View/ViewBlock.php
@@ -73,7 +73,7 @@ public function end() {
}
/**
- * Append to an existing or new block. Appending to a new
+ * Append to an existing or new block. Appending to a new
* block will create the block.
*
* Calling append() without a value will create a new capturing
Please sign in to comment.
Something went wrong with that request. Please try again.