Skip to content

Commit e74d835

Browse files
committed
Fixed some API doc in routing and cache.
1 parent 3723f7d commit e74d835

File tree

9 files changed

+18
-16
lines changed

9 files changed

+18
-16
lines changed

lib/Cake/Cache/Engine/ApcEngine.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public function delete($key) {
108108
/**
109109
* Delete all keys from the cache. This will clear every cache config using APC.
110110
*
111+
* @param boolean $check
111112
* @return boolean True if the cache was successfully cleared, false otherwise
112113
*/
113114
public function clear($check) {

lib/Cake/Cache/Engine/FileEngine.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ public function clear($check) {
247247
/**
248248
* Not implemented
249249
*
250+
* @param string $key
251+
* @param integer $offset
250252
* @return void
251253
* @throws CacheException
252254
*/
@@ -257,6 +259,8 @@ public function decrement($key, $offset = 1) {
257259
/**
258260
* Not implemented
259261
*
262+
* @param string $key
263+
* @param integer $offset
260264
* @return void
261265
* @throws CacheException
262266
*/

lib/Cake/Cache/Engine/MemcacheEngine.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ public function delete($key) {
189189
/**
190190
* Delete all keys from the cache
191191
*
192+
* @param boolean $check
192193
* @return boolean True if the cache was successfully cleared, false otherwise
193194
*/
194195
public function clear($check) {

lib/Cake/Cache/Engine/WincacheEngine.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public function delete($key) {
115115
* Delete all keys from the cache. This will clear every cache value stored
116116
* in wincache.
117117
*
118+
* @param boolean $check
118119
* @return boolean True if the cache was successfully cleared, false otherwise
119120
*/
120121
public function clear($check) {

lib/Cake/Cache/Engine/XcacheEngine.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public function delete($key) {
124124
/**
125125
* Delete all keys from the cache
126126
*
127+
* @param boolean $check
127128
* @return boolean True if the cache was successfully cleared, false otherwise
128129
*/
129130
public function clear($check) {
@@ -144,7 +145,7 @@ public function clear($check) {
144145
* (see xcache.admin configuration settings)
145146
*
146147
* @param boolean $reverse Revert changes
147-
* @access private
148+
* @return void
148149
*/
149150
function __auth($reverse = false) {
150151
static $backup = array();

lib/Cake/Routing/Dispatcher.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public function dispatch(CakeRequest $request, CakeResponse $response, $addition
9595
*
9696
* @param Controller $controller Controller to invoke
9797
* @param CakeRequest $request The request object to invoke the controller for.
98-
* @return string Output as sent by controller
99-
* @throws MissingActionException when the action being called is missing.
98+
* @param CakeResponse $response The response object to receive the output
99+
* @return void
100100
*/
101101
protected function _invoke(Controller $controller, CakeRequest $request, CakeResponse $response) {
102102
$controller->constructClasses();
@@ -165,7 +165,7 @@ protected function _getController($request, $response) {
165165
/**
166166
* Load controller and return controller classname
167167
*
168-
* @param array $params Array of parameters
168+
* @param CakeRequest $request
169169
* @return string|bool Name of controller class name
170170
*/
171171
protected function _loadController($request) {
@@ -202,6 +202,7 @@ protected function _loadRoutes() {
202202
* Outputs cached dispatch view cache
203203
*
204204
* @param string $path Requested URL path
205+
* @return string|boolean False if is not cached or output
205206
*/
206207
public function cached($path) {
207208
if (Configure::read('Cache.check') === true) {

lib/Cake/Routing/Route/CakeRoute.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,27 @@ class CakeRoute {
2727
* `/:controller/:action/:id` has 3 key elements
2828
*
2929
* @var array
30-
* @access public
3130
*/
3231
public $keys = array();
3332

3433
/**
3534
* An array of additional parameters for the Route.
3635
*
3736
* @var array
38-
* @access public
3937
*/
4038
public $options = array();
4139

4240
/**
4341
* Default parameters for a Route
4442
*
4543
* @var array
46-
* @access public
4744
*/
4845
public $defaults = array();
4946

5047
/**
5148
* The routes template string.
5249
*
5350
* @var string
54-
* @access public
5551
*/
5652
public $template = null;
5753

@@ -60,23 +56,20 @@ class CakeRoute {
6056
* template
6157
*
6258
* @var string
63-
* @access protected
6459
*/
6560
protected $_greedy = false;
6661

6762
/**
6863
* The compiled route regular expresssion
6964
*
7065
* @var string
71-
* @access protected
7266
*/
7367
protected $_compiledRoute = null;
7468

7569
/**
7670
* HTTP header shortcut map. Used for evaluating header-based route expressions.
7771
*
7872
* @var array
79-
* @access private
8073
*/
8174
private $__headerMap = array(
8275
'type' => 'content_type',
@@ -89,7 +82,7 @@ class CakeRoute {
8982
*
9083
* @param string $template Template string with parameter placeholders
9184
* @param array $defaults Array of defaults for the route.
92-
* @param string $params Array of parameters and additional options for the Route
85+
* @param array $options Array of additional options for the Route
9386
* @return void
9487
*/
9588
public function __construct($template, $defaults = array(), $options = array()) {

lib/Cake/Routing/Route/RedirectRoute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class RedirectRoute extends CakeRoute {
4242
*
4343
* @param string $template Template string with parameter placeholders
4444
* @param array $defaults Array of defaults for the route.
45-
* @param string $params Array of parameters and additional options for the Route
45+
* @param array $options Array of additional options for the Route
4646
*/
4747
public function __construct($template, $defaults = array(), $options = array()) {
4848
parent::__construct($template, $defaults, $options);

lib/Cake/Routing/Router.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ private static function __parseExtension($url) {
520520
* Will accept either a CakeRequest object or an array of arrays. Support for
521521
* accepting arrays may be removed in the future.
522522
*
523-
* @param mixed $params Parameters and path information or a CakeRequest object.
523+
* @param CakeRequest|array $request Parameters and path information or a CakeRequest object.
524524
* @return void
525525
*/
526526
public static function setRequestInfo($request) {
@@ -618,7 +618,7 @@ public static function reload() {
618618
/**
619619
* Promote a route (by default, the last one added) to the beginning of the list
620620
*
621-
* @param $which A zero-based array index representing the route to move. For example,
621+
* @param integer $which A zero-based array index representing the route to move. For example,
622622
* if 3 routes have been added, the last route would be 2.
623623
* @return boolean Returns false if no route exists at the position specified by $which.
624624
*/
@@ -909,7 +909,7 @@ public static function queryString($q, $extra = array(), $escape = false) {
909909
* This will strip out 'autoRender', 'bare', 'requested', and 'return' param names as those
910910
* are used for CakePHP internals and should not normally be part of an output url.
911911
*
912-
* @param mixed $param The params array or CakeRequest object that needs to be reversed.
912+
* @param CakeRequest|array $params The params array or CakeRequest object that needs to be reversed.
913913
* @param boolean $full Set to true to include the full url including the protocol when reversing
914914
* the url.
915915
* @return string The string that is the reversed result of the array

0 commit comments

Comments
 (0)