Skip to content
This repository
Browse code

Merge pull request #1070 from dereuromark/2.3-cleanup

fix doc block endings
  • Loading branch information...
commit ead469fff38b9166803e098946c8394c4eab34aa 2 parents 92d9b11 + 11a8804
Mark Story authored January 11, 2013

Showing 36 changed files with 82 additions and 82 deletions. Show diff stats Hide diff stats

  1. 2  lib/Cake/Cache/CacheEngine.php
  2. 6  lib/Cake/Cache/Engine/ApcEngine.php
  3. 2  lib/Cake/Cache/Engine/FileEngine.php
  4. 6  lib/Cake/Cache/Engine/MemcacheEngine.php
  5. 6  lib/Cake/Cache/Engine/RedisEngine.php
  6. 6  lib/Cake/Cache/Engine/WincacheEngine.php
  7. 4  lib/Cake/Cache/Engine/XcacheEngine.php
  8. 2  lib/Cake/Console/Shell.php
  9. 2  lib/Cake/Controller/Component/RequestHandlerComponent.php
  10. 16  lib/Cake/Model/ModelValidator.php
  11. 20  lib/Cake/Model/Validator/CakeValidationSet.php
  12. 6  lib/Cake/Network/CakeResponse.php
  13. 8  lib/Cake/Routing/DispatcherFilter.php
  14. 2  lib/Cake/Routing/Filter/AssetDispatcher.php
  15. 2  lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
  16. 2  lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
  17. 2  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
  18. 2  lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
  19. 2  lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php
  20. 2  lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
  21. 2  lib/Cake/Test/Case/Console/ShellTest.php
  22. 8  lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
  23. 2  lib/Cake/Test/Case/Log/CakeLogTest.php
  24. 2  lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
  25. 2  lib/Cake/Test/Case/Model/ModelIntegrationTest.php
  26. 2  lib/Cake/Test/Case/Model/ModelValidationTest.php
  27. 6  lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php
  28. 2  lib/Cake/Test/Case/Model/models.php
  29. 14  lib/Cake/Test/Case/Network/CakeResponseTest.php
  30. 10  lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
  31. 4  lib/Cake/Test/Case/Routing/RouterTest.php
  32. 2  lib/Cake/Test/Case/Utility/CakeTimeTest.php
  33. 2  lib/Cake/Test/Case/Utility/ValidationTest.php
  34. 2  lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
  35. 2  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  36. 2  lib/Cake/View/Helper/JsHelper.php
2  lib/Cake/Cache/CacheEngine.php
@@ -32,7 +32,7 @@
32 32
  * prefixes to be prepeded to every key in this cache engine
33 33
  *
34 34
  * @var string
35  
- **/
  35
+ */
36 36
 	protected $_groupPrefix = null;
37 37
 
38 38
 /**
6  lib/Cake/Cache/Engine/ApcEngine.php
@@ -30,7 +30,7 @@ class ApcEngine extends CacheEngine {
30 30
  * (prefixed witht the global configuration prefix)
31 31
  *
32 32
  * @var array
33  
- **/
  33
+ */
34 34
 	protected $_compiledGroupNames = array();
35 35
 
36 36
 /**
@@ -144,7 +144,7 @@ public function clear($check) {
144 144
  * the group accordingly.
145 145
  *
146 146
  * @return array
147  
- **/
  147
+ */
148 148
 	public function groups() {
149 149
 		if (empty($this->_compiledGroupNames)) {
150 150
 			foreach ($this->settings['groups'] as $group) {
@@ -176,7 +176,7 @@ public function groups() {
176 176
  * old values will remain in storage until they expire.
177 177
  *
178 178
  * @return boolean success
179  
- **/
  179
+ */
180 180
 	public function clearGroup($group) {
181 181
 		apc_inc($this->settings['prefix'] . $group, 1, $success);
182 182
 		return $success;
2  lib/Cake/Cache/Engine/FileEngine.php
@@ -358,7 +358,7 @@ public function key($key) {
358 358
  * Recursively deletes all files under any directory named as $group
359 359
  *
360 360
  * @return boolean success
361  
- **/
  361
+ */
362 362
 	public function clearGroup($group) {
363 363
 		$directoryIterator = new RecursiveDirectoryIterator($this->settings['path']);
364 364
 		$contents = new RecursiveIteratorIterator($directoryIterator, RecursiveIteratorIterator::CHILD_FIRST);
6  lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -32,7 +32,7 @@ class MemcacheEngine extends CacheEngine {
32 32
  * (prefixed witht the global configuration prefix)
33 33
  *
34 34
  * @var array
35  
- **/
  35
+ */
36 36
 	protected $_compiledGroupNames = array();
37 37
 
38 38
 /**
@@ -251,7 +251,7 @@ public function connect($host, $port = 11211) {
251 251
  * the group accordingly.
252 252
  *
253 253
  * @return array
254  
- **/
  254
+ */
255 255
 	public function groups() {
256 256
 		if (empty($this->_compiledGroupNames)) {
257 257
 			foreach ($this->settings['groups'] as $group) {
@@ -284,7 +284,7 @@ public function groups() {
284 284
  * old values will remain in storage until they expire.
285 285
  *
286 286
  * @return boolean success
287  
- **/
  287
+ */
288 288
 	public function clearGroup($group) {
289 289
 		return (bool)$this->_Memcache->increment($this->settings['prefix'] . $group);
290 290
 	}
6  lib/Cake/Cache/Engine/RedisEngine.php
@@ -186,7 +186,7 @@ public function clear($check) {
186 186
  * the group accordingly.
187 187
  *
188 188
  * @return array
189  
- **/
  189
+ */
190 190
 	public function groups() {
191 191
 		$result = array();
192 192
 		foreach ($this->settings['groups'] as $group) {
@@ -205,7 +205,7 @@ public function groups() {
205 205
  * old values will remain in storage until they expire.
206 206
  *
207 207
  * @return boolean success
208  
- **/
  208
+ */
209 209
 	public function clearGroup($group) {
210 210
 		return (bool)$this->_Redis->incr($this->settings['prefix'] . $group);
211 211
 	}
@@ -214,7 +214,7 @@ public function clearGroup($group) {
214 214
  * Disconnects from the redis server
215 215
  *
216 216
  * @return void
217  
- **/
  217
+ */
218 218
 	public function __destruct() {
219 219
 		if (!$this->settings['persistent']) {
220 220
 			$this->_Redis->close();
6  lib/Cake/Cache/Engine/WincacheEngine.php
@@ -31,7 +31,7 @@ class WincacheEngine extends CacheEngine {
31 31
  * (prefixed witht the global configuration prefix)
32 32
  *
33 33
  * @var array
34  
- **/
  34
+ */
35 35
 	protected $_compiledGroupNames = array();
36 36
 
37 37
 /**
@@ -149,7 +149,7 @@ public function clear($check) {
149 149
  * the group accordingly.
150 150
  *
151 151
  * @return array
152  
- **/
  152
+ */
153 153
 	public function groups() {
154 154
 		if (empty($this->_compiledGroupNames)) {
155 155
 			foreach ($this->settings['groups'] as $group) {
@@ -181,7 +181,7 @@ public function groups() {
181 181
  * old values will remain in storage until they expire.
182 182
  *
183 183
  * @return boolean success
184  
- **/
  184
+ */
185 185
 	public function clearGroup($group) {
186 186
 		$success = null;
187 187
 		wincache_ucache_inc($this->settings['prefix'] . $group, 1, $success);
4  lib/Cake/Cache/Engine/XcacheEngine.php
@@ -146,7 +146,7 @@ public function clear($check) {
146 146
  * the group accordingly.
147 147
  *
148 148
  * @return array
149  
- **/
  149
+ */
150 150
 	public function groups() {
151 151
 		$result = array();
152 152
 		foreach ($this->settings['groups'] as $group) {
@@ -165,7 +165,7 @@ public function groups() {
165 165
  * old values will remain in storage until they expire.
166 166
  *
167 167
  * @return boolean success
168  
- **/
  168
+ */
169 169
 	public function clearGroup($group) {
170 170
 		return (bool)xcache_inc($this->settings['prefix'] . $group, 1);
171 171
 	}
2  lib/Cake/Console/Shell.php
@@ -826,7 +826,7 @@ protected function _pluginPath($pluginName) {
826 826
  *
827 827
  * @param boolean $enable wheter to enable CakeLog output or not
828 828
  * @return void
829  
- **/
  829
+ */
830 830
 	protected function _useLogger($enable = true) {
831 831
 		if (!$enable) {
832 832
 			CakeLog::drop('stdout');
2  lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -268,7 +268,7 @@ public function beforeRedirect(Controller $controller, $url, $status = null, $ex
268 268
  *
269 269
  * @params Controller $controller
270 270
  * @return boolean false if the render process should be aborted
271  
- **/
  271
+ */
272 272
 	public function beforeRender(Controller $controller) {
273 273
 		if ($this->settings['checkHttpCache'] && $this->response->checkNotModified($this->request)) {
274 274
 			return false;
16  lib/Cake/Model/ModelValidator.php
@@ -466,7 +466,7 @@ protected function _triggerBeforeValidate($options = array()) {
466 466
  *
467 467
  * @param string $field name of the field to check
468 468
  * @return boolean
469  
- **/
  469
+ */
470 470
 	public function offsetExists($field) {
471 471
 		$this->_parseRules();
472 472
 		return isset($this->_fields[$field]);
@@ -477,7 +477,7 @@ public function offsetExists($field) {
477 477
  *
478 478
  * @param string $field name of the field to check
479 479
  * @return CakeValidationSet
480  
- **/
  480
+ */
481 481
 	public function offsetGet($field) {
482 482
 		$this->_parseRules();
483 483
 		return $this->_fields[$field];
@@ -489,7 +489,7 @@ public function offsetGet($field) {
489 489
  * @param string $field name of the field to set
490 490
  * @param array|CakeValidationSet $rules set of rules to apply to field
491 491
  * @return void
492  
- **/
  492
+ */
493 493
 	public function offsetSet($field, $rules) {
494 494
 		$this->_parseRules();
495 495
 		if (!$rules instanceof CakeValidationSet) {
@@ -505,7 +505,7 @@ public function offsetSet($field, $rules) {
505 505
  *
506 506
  * @param string $field name of the field to unset
507 507
  * @return void
508  
- **/
  508
+ */
509 509
 	public function offsetUnset($field) {
510 510
 		$this->_parseRules();
511 511
 		unset($this->_fields[$field]);
@@ -515,7 +515,7 @@ public function offsetUnset($field) {
515 515
  * Returns an iterator for each of the fields to be validated
516 516
  *
517 517
  * @return ArrayIterator
518  
- **/
  518
+ */
519 519
 	public function getIterator() {
520 520
 		$this->_parseRules();
521 521
 		return new ArrayIterator($this->_fields);
@@ -525,7 +525,7 @@ public function getIterator() {
525 525
  * Returns the number of fields having validation rules
526 526
  *
527 527
  * @return int
528  
- **/
  528
+ */
529 529
 	public function count() {
530 530
 		$this->_parseRules();
531 531
 		return count($this->_fields);
@@ -553,7 +553,7 @@ public function count() {
553 553
  * @param string|array|CakeValidationSet $name name of the rule to be added or list of rules for the field
554 554
  * @param array|CakeValidationRule $rule or list of rules to be added to the field's rule set
555 555
  * @return ModelValidator this instance
556  
- **/
  556
+ */
557 557
 	public function add($field, $name, $rule = null) {
558 558
 		$this->_parseRules();
559 559
 		if ($name instanceof CakeValidationSet) {
@@ -592,7 +592,7 @@ public function add($field, $name, $rule = null) {
592 592
  * @param string $field The name of the field from wich the rule will be removed
593 593
  * @param string $rule the name of the rule to be removed
594 594
  * @return ModelValidator this instance
595  
- **/
  595
+ */
596 596
 	public function remove($field, $rule = null) {
597 597
 		$this->_parseRules();
598 598
 		if ($rule === null) {
20  lib/Cake/Model/Validator/CakeValidationSet.php
@@ -41,14 +41,14 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
41 41
  * List of methods available for validation
42 42
  *
43 43
  * @var array
44  
- **/
  44
+ */
45 45
 	protected $_methods = array();
46 46
 
47 47
 /**
48 48
  * I18n domain for validation messages.
49 49
  *
50 50
  * @var string
51  
- **/
  51
+ */
52 52
 	protected $_validationDomain = null;
53 53
 
54 54
 /**
@@ -96,7 +96,7 @@ public function __construct($fieldName, $ruleSet) {
96 96
  *
97 97
  * @param array $methods Methods list
98 98
  * @return void
99  
- **/
  99
+ */
100 100
 	public function setMethods(&$methods) {
101 101
 		$this->_methods =& $methods;
102 102
 	}
@@ -151,7 +151,7 @@ public function validate($data, $isUpdate = false) {
151 151
  * Resets interal state for all validation rules in this set
152 152
  *
153 153
  * @return void
154  
- **/
  154
+ */
155 155
 	public function reset() {
156 156
 		foreach ($this->getRules() as $rule) {
157 157
 			$rule->reset();
@@ -310,7 +310,7 @@ protected function _translateArgs($args) {
310 310
  *
311 311
  * @param string $index name of the rule
312 312
  * @return boolean
313  
- **/
  313
+ */
314 314
 	public function offsetExists($index) {
315 315
 		return isset($this->_rules[$index]);
316 316
 	}
@@ -320,7 +320,7 @@ public function offsetExists($index) {
320 320
  *
321 321
  * @param string $index name of the rule
322 322
  * @return CakeValidationRule
323  
- **/
  323
+ */
324 324
 	public function offsetGet($index) {
325 325
 		return $this->_rules[$index];
326 326
 	}
@@ -330,7 +330,7 @@ public function offsetGet($index) {
330 330
  *
331 331
  * @param string $index name of the rule
332 332
  * @param CakeValidationRule|array rule to add to $index
333  
- **/
  333
+ */
334 334
 	public function offsetSet($index, $rule) {
335 335
 		$this->setRule($index, $rule);
336 336
 	}
@@ -340,7 +340,7 @@ public function offsetSet($index, $rule) {
340 340
  *
341 341
  * @param string $index name of the rule
342 342
  * @return void
343  
- **/
  343
+ */
344 344
 	public function offsetUnset($index) {
345 345
 		unset($this->_rules[$index]);
346 346
 	}
@@ -349,7 +349,7 @@ public function offsetUnset($index) {
349 349
  * Returns an iterator for each of the rules to be applied
350 350
  *
351 351
  * @return ArrayIterator
352  
- **/
  352
+ */
353 353
 	public function getIterator() {
354 354
 		return new ArrayIterator($this->_rules);
355 355
 	}
@@ -358,7 +358,7 @@ public function getIterator() {
358 358
  * Returns the number of rules in this set
359 359
  *
360 360
  * @return int
361  
- **/
  361
+ */
362 362
 	public function count() {
363 363
 		return count($this->_rules);
364 364
 	}
6  lib/Cake/Network/CakeResponse.php
@@ -941,7 +941,7 @@ public function modified($time = null) {
941 941
  * conflicting headers
942 942
  *
943 943
  * @return void
944  
- **/
  944
+ */
945 945
 	public function notModified() {
946 946
 		$this->statusCode(304);
947 947
 		$this->body('');
@@ -968,7 +968,7 @@ public function notModified() {
968 968
  * @param string|array $cacheVariances a single Vary string or a array
969 969
  * containig the list for variances.
970 970
  * @return array
971  
- **/
  971
+ */
972 972
 	public function vary($cacheVariances = null) {
973 973
 		if ($cacheVariances !== null) {
974 974
 			$cacheVariances = (array)$cacheVariances;
@@ -1000,7 +1000,7 @@ public function vary($cacheVariances = null) {
1000 1000
  * @param boolean $weak whether the response is semantically the same as
1001 1001
  * other with th same hash or not
1002 1002
  * @return string
1003  
- **/
  1003
+ */
1004 1004
 	public function etag($tag = null, $weak = false) {
1005 1005
 		if ($tag !== null) {
1006 1006
 			$this->_headers['Etag'] = sprintf('%s"%s"', ($weak) ? 'W/' : null, $tag);
8  lib/Cake/Routing/DispatcherFilter.php
@@ -31,7 +31,7 @@
31 31
  * Default priority for all methods in this filter
32 32
  *
33 33
  * @var int
34  
- **/
  34
+ */
35 35
 	public $priority = 10;
36 36
 
37 37
 /**
@@ -42,7 +42,7 @@
42 42
  * Override this method at will to only listen to the events you are interested in.
43 43
  *
44 44
  * @return array
45  
- **/
  45
+ */
46 46
 	public function implementedEvents() {
47 47
 		return array(
48 48
 			'Dispatcher.beforeDispatch' => array('callable' => 'beforeDispatch', 'priority' => $this->priority),
@@ -65,7 +65,7 @@ public function implementedEvents() {
65 65
  * @param CakeEvent $event container object having the `request`, `response` and `additionalParams`
66 66
  *	keys in the data property.
67 67
  * @return CakeResponse|boolean
68  
- **/
  68
+ */
69 69
 	public function beforeDispatch(CakeEvent $event) {
70 70
 	}
71 71
 
@@ -80,7 +80,7 @@ public function beforeDispatch(CakeEvent $event) {
80 80
  * @param CakeEvent $event container object having the `request` and  `response`
81 81
  *	keys in the data property.
82 82
  * @return mixed boolean to stop the event dispatching or null to continue
83  
- **/
  83
+ */
84 84
 	public function afterDispatch(CakeEvent $event) {
85 85
 	}
86 86
 }
2  lib/Cake/Routing/Filter/AssetDispatcher.php
@@ -31,7 +31,7 @@ class AssetDispatcher extends DispatcherFilter {
31 31
  * This filter should run before the request gets parsed by router
32 32
  *
33 33
  * @var int
34  
- **/
  34
+ */
35 35
 	public $priority = 9;
36 36
 
37 37
 /**
2  lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
@@ -253,7 +253,7 @@ public function testGroupDelete() {
253 253
  * Test clearing a cache group
254 254
  *
255 255
  * @return void
256  
- **/
  256
+ */
257 257
 	public function testGroupClear() {
258 258
 		Cache::config('apc_groups', array(
259 259
 			'engine' => 'Apc',
2  lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
@@ -428,7 +428,7 @@ public function testGroupDelete() {
428 428
  * Test clearing a cache group
429 429
  *
430 430
  * @return void
431  
- **/
  431
+ */
432 432
 	public function testGroupClear() {
433 433
 		Cache::config('file_groups', array('engine' => 'File', 'duration' => 3600, 'groups' => array('group_a', 'group_b')));
434 434
 		Cache::config('file_groups2', array('engine' => 'File', 'duration' => 3600, 'groups' => array('group_b')));
2  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -459,7 +459,7 @@ public function testGroupDelete() {
459 459
  * Test clearing a cache group
460 460
  *
461 461
  * @return void
462  
- **/
  462
+ */
463 463
 	public function testGroupClear() {
464 464
 		Cache::config('memcache_groups', array(
465 465
 			'engine' => 'Memcache',
2  lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
@@ -316,7 +316,7 @@ public function testGroupDelete() {
316 316
  * Test clearing a cache group
317 317
  *
318 318
  * @return void
319  
- **/
  319
+ */
320 320
 	public function testGroupClear() {
321 321
 		Cache::config('redis_groups', array(
322 322
 			'engine' => 'Redis',
2  lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php
@@ -243,7 +243,7 @@ public function testGroupDelete() {
243 243
  * Test clearing a cache group
244 244
  *
245 245
  * @return void
246  
- **/
  246
+ */
247 247
 	public function testGroupClear() {
248 248
 		Cache::config('wincache_groups', array(
249 249
 			'engine' => 'Wincache',
2  lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
@@ -252,7 +252,7 @@ public function testGroupDelete() {
252 252
  * Test clearing a cache group
253 253
  *
254 254
  * @return void
255  
- **/
  255
+ */
256 256
 	public function testGroupClear() {
257 257
 		Cache::config('xcache_groups', array(
258 258
 			'engine' => 'Xcache',
2  lib/Cake/Test/Case/Console/ShellTest.php
@@ -848,7 +848,7 @@ public function testFileAndConsoleLogging() {
848 848
  * Tests that _useLogger works properly
849 849
  *
850 850
  * @return void
851  
- **/
  851
+ */
852 852
 	public function testProtectedUseLogger() {
853 853
 		CakeLog::drop('stdout');
854 854
 		CakeLog::drop('stderr');
8  lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -863,7 +863,7 @@ public function testAddInputTypeException() {
863 863
  * Test checkNotModified method
864 864
  *
865 865
  * @return void
866  
- **/
  866
+ */
867 867
 	public function testCheckNotModifiedByEtagStar() {
868 868
 		$_SERVER['HTTP_IF_NONE_MATCH'] = '*';
869 869
 		$RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -877,7 +877,7 @@ public function testCheckNotModifiedByEtagStar() {
877 877
  * Test checkNotModified method
878 878
  *
879 879
  * @return void
880  
- **/
  880
+ */
881 881
 	public function testCheckNotModifiedByEtagExact() {
882 882
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something", "other"';
883 883
 		$RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -891,7 +891,7 @@ public function testCheckNotModifiedByEtagExact() {
891 891
  * Test checkNotModified method
892 892
  *
893 893
  * @return void
894  
- **/
  894
+ */
895 895
 	public function testCheckNotModifiedByEtagAndTime() {
896 896
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something", "other"';
897 897
 		$_SERVER['HTTP_IF_MODIFIED_SINCE'] = '2012-01-01 00:00:00';
@@ -907,7 +907,7 @@ public function testCheckNotModifiedByEtagAndTime() {
907 907
  * Test checkNotModified method
908 908
  *
909 909
  * @return void
910  
- **/
  910
+ */
911 911
 	public function testCheckNotModifiedNoInfo() {
912 912
 		$RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
913 913
 		$RequestHandler->response = $this->getMock('CakeResponse', array('notModified'));
2  lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -164,7 +164,7 @@ public function testConfig() {
164 164
  * explicit tests for drop()
165 165
  *
166 166
  * @return void
167  
- **/
  167
+ */
168 168
 	public function testDrop() {
169 169
 		CakeLog::config('file', array(
170 170
 			'engine' => 'FileLog',
2  lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -950,7 +950,7 @@ public function testLastError() {
950 950
  * Tests that transaction commands are logged
951 951
  *
952 952
  * @return void
953  
- **/
  953
+ */
954 954
 	public function testTransactionLogging() {
955 955
 		$conn = $this->getMock('MockPDO');
956 956
 		$db = new DboTestSource;
2  lib/Cake/Test/Case/Model/ModelIntegrationTest.php
@@ -2438,7 +2438,7 @@ public function testMultischemaFixtureWithThreeDatabases() {
2438 2438
  * does not trigger any calls on any datasource
2439 2439
  *
2440 2440
  * @return void
2441  
- **/
  2441
+ */
2442 2442
 	public function testSchemaNoDB() {
2443 2443
 		$model = $this->getMock('Article', array('getDataSource'));
2444 2444
 		$model->useTable = false;
2  lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -2177,7 +2177,7 @@ public function testValidateFirstAssociatedWithBeforeValidate2() {
2177 2177
  * after a presentation made to show off this new feature
2178 2178
  *
2179 2179
  * @return void
2180  
- **/
  2180
+ */
2181 2181
 	public function testDynamicValidationRuleBuilding() {
2182 2182
 		$model = new Article;
2183 2183
 		$validator = $model->validator();
6  lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php
@@ -30,7 +30,7 @@ class CakeValidationRuleTest extends CakeTestCase {
30 30
  * Auxiliary method to test custom validators
31 31
  *
32 32
  * @return boolean
33  
- **/
  33
+ */
34 34
 	public function myTestRule() {
35 35
 		return false;
36 36
 	}
@@ -39,7 +39,7 @@ public function myTestRule() {
39 39
  * Auxiliary method to test custom validators
40 40
  *
41 41
  * @return boolean
42  
- **/
  42
+ */
43 43
 	public function myTestRule2() {
44 44
 		return true;
45 45
 	}
@@ -48,7 +48,7 @@ public function myTestRule2() {
48 48
  * Auxiliary method to test custom validators
49 49
  *
50 50
  * @return string
51  
- **/
  51
+ */
52 52
 	public function myTestRule3() {
53 53
 		return 'string';
54 54
 	}
2  lib/Cake/Test/Case/Model/models.php
@@ -4976,7 +4976,7 @@ protected function _findUnPublished($state, $query, $results = array()) {
4976 4976
  * Alters title data
4977 4977
  *
4978 4978
  * @return void
4979  
- **/
  4979
+ */
4980 4980
 	public function beforeValidate($options = array()) {
4981 4981
 		$this->data[$this->alias]['title'] = 'foo';
4982 4982
 		if ($this->findMethods['unPublished'] === true) {
14  lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -848,7 +848,7 @@ public function testNotModified() {
848 848
  * Test checkNotModified method
849 849
  *
850 850
  * @return void
851  
- **/
  851
+ */
852 852
 	public function testCheckNotModifiedByEtagStar() {
853 853
 		$_SERVER['HTTP_IF_NONE_MATCH'] = '*';
854 854
 		$response = $this->getMock('CakeResponse', array('notModified'));
@@ -861,7 +861,7 @@ public function testCheckNotModifiedByEtagStar() {
861 861
  * Test checkNotModified method
862 862
  *
863 863
  * @return void
864  
- **/
  864
+ */
865 865
 	public function testCheckNotModifiedByEtagExact() {
866 866
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something", "other"';
867 867
 		$response = $this->getMock('CakeResponse', array('notModified'));
@@ -874,7 +874,7 @@ public function testCheckNotModifiedByEtagExact() {
874 874
  * Test checkNotModified method
875 875
  *
876 876
  * @return void
877  
- **/
  877
+ */
878 878
 	public function testCheckNotModifiedByEtagAndTime() {
879 879
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something", "other"';
880 880
 		$_SERVER['HTTP_IF_MODIFIED_SINCE'] = '2012-01-01 00:00:00';
@@ -889,7 +889,7 @@ public function testCheckNotModifiedByEtagAndTime() {
889 889
  * Test checkNotModified method
890 890
  *
891 891
  * @return void
892  
- **/
  892
+ */
893 893
 	public function testCheckNotModifiedByEtagAndTimeMismatch() {
894 894
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something", "other"';
895 895
 		$_SERVER['HTTP_IF_MODIFIED_SINCE'] = '2012-01-01 00:00:00';
@@ -904,7 +904,7 @@ public function testCheckNotModifiedByEtagAndTimeMismatch() {
904 904
  * Test checkNotModified method
905 905
  *
906 906
  * @return void
907  
- **/
  907
+ */
908 908
 	public function testCheckNotModifiedByEtagMismatch() {
909 909
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something-else", "other"';
910 910
 		$_SERVER['HTTP_IF_MODIFIED_SINCE'] = '2012-01-01 00:00:00';
@@ -919,7 +919,7 @@ public function testCheckNotModifiedByEtagMismatch() {
919 919
  * Test checkNotModified method
920 920
  *
921 921
  * @return void
922  
- **/
  922
+ */
923 923
 	public function testCheckNotModifiedByTime() {
924 924
 		$_SERVER['HTTP_IF_MODIFIED_SINCE'] = '2012-01-01 00:00:00';
925 925
 		$response = $this->getMock('CakeResponse', array('notModified'));
@@ -932,7 +932,7 @@ public function testCheckNotModifiedByTime() {
932 932
  * Test checkNotModified method
933 933
  *
934 934
  * @return void
935  
- **/
  935
+ */
936 936
 	public function testCheckNotModifiedNoHints() {
937 937
 		$_SERVER['HTTP_IF_NONE_MATCH'] = 'W/"something", "other"';
938 938
 		$_SERVER['HTTP_IF_MODIFIED_SINCE'] = '2012-01-01 00:00:00';
10  lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
@@ -24,7 +24,7 @@
24 24
  * Test case for CakeRoute
25 25
  *
26 26
  * @package       Cake.Test.Case.Routing.Route
27  
- **/
  27
+ */
28 28
 class CakeRouteTest extends CakeTestCase {
29 29
 
30 30
 /**
@@ -41,7 +41,7 @@ public function setUp() {
41 41
  * Test the construction of a CakeRoute
42 42
  *
43 43
  * @return void
44  
- **/
  44
+ */
45 45
 	public function testConstruction() {
46 46
 		$route = new CakeRoute('/:controller/:action/:id', array(), array('id' => '[0-9]+'));
47 47
 
@@ -55,7 +55,7 @@ public function testConstruction() {
55 55
  * test Route compiling.
56 56
  *
57 57
  * @return void
58  
- **/
  58
+ */
59 59
 	public function testBasicRouteCompiling() {
60 60
 		$route = new CakeRoute('/', array('controller' => 'pages', 'action' => 'display', 'home'));
61 61
 		$result = $route->compile();
@@ -107,7 +107,7 @@ public function testRouteParameterOverlap() {
107 107
  * test compiling routes with keys that have patterns
108 108
  *
109 109
  * @return void
110  
- **/
  110
+ */
111 111
 	public function testRouteCompilingWithParamPatterns() {
112 112
 		$route = new CakeRoute(
113 113
 			'/:controller/:action/:id',
@@ -235,7 +235,7 @@ public function testComplexRouteCompilingAndParsing() {
235 235
  * test that routes match their pattern.
236 236
  *
237 237
  * @return void
238  
- **/
  238
+ */
239 239
 	public function testMatchBasic() {
240 240
 		$route = new CakeRoute('/:controller/:action/:id', array('plugin' => null));
241 241
 		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null));
4  lib/Cake/Test/Case/Routing/RouterTest.php
@@ -535,7 +535,7 @@ public function testArrayNamedParameters() {
535 535
  * Test generation of routes with query string parameters.
536 536
  *
537 537
  * @return void
538  
- **/
  538
+ */
539 539
 	public function testUrlGenerationWithQueryStrings() {
540 540
 		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
541 541
 		$expected = '/posts/index/0?var=test&var2=test2';
@@ -559,7 +559,7 @@ public function testUrlGenerationWithQueryStrings() {
559 559
  * test that regex validation of keyed route params is working.
560 560
  *
561 561
  * @return void
562  
- **/
  562
+ */
563 563
 	public function testUrlGenerationWithRegexQualifiedParams() {
564 564
 		Router::connect(
565 565
 			':language/galleries',
2  lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -1055,7 +1055,7 @@ public function testListTimezones() {
1055 1055
  * from one timezone to the other correctly
1056 1056
  *
1057 1057
  * @return void
1058  
- **/
  1058
+ */
1059 1059
 	public function testCorrectTimezoneConversion() {
1060 1060
 		date_default_timezone_set('UTC');
1061 1061
 		$date = '2012-01-01 10:00:00';
2  lib/Cake/Test/Case/Utility/ValidationTest.php
@@ -2171,7 +2171,7 @@ public function testPassThroughMethodFailure() {
2171 2171
  *
2172 2172
  * @expectedException PHPUnit_Framework_Error
2173 2173
  * @return void
2174  
- **/
  2174
+ */
2175 2175
 	public function testPassThroughClassFailure() {
2176 2176
 		Validation::postal('text', null, 'AUTOFAIL');
2177 2177
 	}
2  lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
@@ -517,7 +517,7 @@ public function testCacheWithCustomRoutes() {
517 517
  * apps url would look something like http://localhost/cache/cacheTest/cache_name
518 518
  *
519 519
  * @return void
520  
- **/
  520
+ */
521 521
 	public function testCacheBaseNameControllerName() {
522 522
 		$this->Controller->cache_parsing();
523 523
 		$this->Controller->cacheAction = array(
2  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -3314,7 +3314,7 @@ public function testError() {
3314 3314
 		);
3315 3315
 		$this->assertTags($result, $expected);
3316 3316
 
3317  
-		/** Testing error messages list options **/
  3317
+		// Testing error messages list options
3318 3318
 		$Contact->validationErrors['field'] = array('notEmpty', 'email');
3319 3319
 
3320 3320
 		$result = $this->Form->error('Contact.field', null, array('listOptions' => 'ol'));
2  lib/Cake/View/Helper/JsHelper.php
@@ -161,7 +161,7 @@ public function __call($method, $params) {
161 161
  * @param boolean $quoteString If false, leaves string values unquoted
162 162
  * @return string a JavaScript-safe/JSON representation of $val
163 163
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::value
164  
- **/
  164
+ */
165 165
 	public function value($val = array(), $quoteString = null, $key = 'value') {
166 166
 		if ($quoteString === null) {
167 167
 			$quoteString = true;

0 notes on commit ead469f

Please sign in to comment.
Something went wrong with that request. Please try again.