Completed
Pull Request — master (#6244)
by Michael
15:14
created
tests/security/GroupTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -175,6 +175,10 @@
 block discarded – undo
175 175
 
176 176
 class GroupTest_MemberForm extends Form {
177 177
 
178
+	/**
179
+	 * @param GroupTest $controller
180
+	 * @param string $name
181
+	 */
178 182
 	public function __construct($controller, $name) {
179 183
 		$fields = singleton('GroupTest_Member')->getCMSFields();
180 184
 		$actions = new FieldList(
Please login to merge, or discard this patch.
tests/security/MemberTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -913,6 +913,9 @@
 block discarded – undo
913 913
  */
914 914
 class MemberTest_ValidatorExtension extends DataExtension implements TestOnly {
915 915
 
916
+	/**
917
+	 * @param Member_Validator $validator
918
+	 */
916 919
 	public function updateValidator(&$validator) {
917 920
 		$validator->addRequiredField('Surname');
918 921
 		$validator->removeRequiredField('FirstName');
Please login to merge, or discard this patch.
tests/security/SecurityTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -577,6 +577,8 @@  discard block
 block discarded – undo
577 577
 	/**
578 578
 	 * Execute a log-in form using Director::test().
579 579
 	 * Helper method for the tests above
580
+	 * @param string $email
581
+	 * @param string $password
580 582
 	 */
581 583
 	public function doTestLoginForm($email, $password, $backURL = 'test/link') {
582 584
 		$this->get(Config::inst()->get('Security', 'logout_url'));
@@ -597,6 +599,8 @@  discard block
 block discarded – undo
597 599
 
598 600
 	/**
599 601
 	 * Helper method to execute a change password form
602
+	 * @param string $oldPassword
603
+	 * @param string $newPassword
600 604
 	 */
601 605
 	public function doTestChangepasswordForm($oldPassword, $newPassword) {
602 606
 		return $this->submitForm(
Please login to merge, or discard this patch.
tests/view/ContentNegotiatorTest.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -5,6 +5,7 @@
 block discarded – undo
5 5
 	/**
6 6
 	 * Small helper to render templates from strings
7 7
 	 * Cloned from SSViewerTest
8
+	 * @param string $templateString
8 9
 	 */
9 10
 	private function render($templateString, $data = null) {
10 11
 		$t = SSViewer::fromString($templateString);
Please login to merge, or discard this patch.
tests/view/SSViewerCacheBlockTest.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -28,6 +28,9 @@  discard block
 block discarded – undo
28 28
 		"Versioned('Stage', 'Live')"
29 29
 	);
30 30
 
31
+	/**
32
+	 * @param string $entropy
33
+	 */
31 34
 	public function setEntropy($entropy) {
32 35
 		$this->entropy = $entropy;
33 36
 	}
@@ -53,6 +56,9 @@  discard block
 block discarded – undo
53 56
 		SS_Cache::set_cache_lifetime('cacheblock', $cacheOn ? 600 : -1);
54 57
 	}
55 58
 
59
+	/**
60
+	 * @param string $template
61
+	 */
56 62
 	protected function _runtemplate($template, $data = null) {
57 63
 		if ($data === null) $data = $this->data;
58 64
 		if (is_array($data)) $data = $this->data->customise($data);
Please login to merge, or discard this patch.
thirdparty/php-peg/Compiler.php 1 patch
Doc Comments   +43 added lines patch added patch discarded remove patch
@@ -48,6 +48,9 @@  discard block
 block discarded – undo
48 48
 		return $str ;
49 49
 	}
50 50
 
51
+	/**
52
+	 * @param string $id
53
+	 */
51 54
 	function save($id) {
52 55
 		return PHPBuilder::build()
53 56
 			->l(
@@ -56,6 +59,9 @@  discard block
 block discarded – undo
56 59
 			);
57 60
 	}
58 61
 
62
+	/**
63
+	 * @param string $id
64
+	 */
59 65
 	function restore( $id, $remove = FALSE ) {
60 66
 		$code = PHPBuilder::build()
61 67
 			->l(
@@ -71,6 +77,10 @@  discard block
 block discarded – undo
71 77
 		return $code ;
72 78
 	}
73 79
 
80
+	/**
81
+	 * @param string $on
82
+	 * @param PHPBuilder $fail
83
+	 */
74 84
 	function match_fail_conditional( $on, $match = NULL, $fail = NULL ) {
75 85
 		return PHPBuilder::build()
76 86
 			->b( 'if (' . $on . ')',
@@ -83,6 +93,9 @@  discard block
 block discarded – undo
83 93
 			);
84 94
 	}
85 95
 	
96
+	/**
97
+	 * @param PHPBuilder $code
98
+	 */
86 99
 	function match_fail_block( $code ) {
87 100
 		$id = $this->varid() ;
88 101
 
@@ -131,6 +144,9 @@  discard block
 block discarded – undo
131 144
 	public $type ;
132 145
 	public $value ;
133 146
 
147
+	/**
148
+	 * @param string $type
149
+	 */
134 150
 	function __construct( $type, $value = NULL ) {
135 151
 		$this->type = $type ;
136 152
 		$this->value = $value ;
@@ -269,6 +285,10 @@  discard block
 block discarded – undo
269 285
 }
270 286
 
271 287
 class TokenLiteral extends TokenExpressionable {
288
+
289
+	/**
290
+	 * @param string $value
291
+	 */
272 292
 	function __construct( $value ) {
273 293
 		parent::__construct( 'literal', "'" . substr($value,1,-1) . "'" );
274 294
 	}
@@ -294,6 +314,9 @@  discard block
 block discarded – undo
294 314
 		return $rx ;
295 315
 	}
296 316
 	
317
+	/**
318
+	 * @param string $value
319
+	 */
297 320
 	function __construct( $value ) {
298 321
 		parent::__construct('rx', self::escape($value));
299 322
 	}
@@ -304,6 +327,10 @@  discard block
 block discarded – undo
304 327
 }
305 328
 
306 329
 class TokenWhitespace extends TokenTerminal {
330
+
331
+	/**
332
+	 * @param boolean $optional
333
+	 */
307 334
 	function __construct( $optional ) {
308 335
 		parent::__construct( 'whitespace', $optional ) ;
309 336
 	}
@@ -316,6 +343,10 @@  discard block
 block discarded – undo
316 343
 }
317 344
 
318 345
 class TokenRecurse extends Token {
346
+
347
+	/**
348
+	 * @param string $value
349
+	 */
319 350
 	function __construct( $value ) {
320 351
 		parent::__construct( 'recurse', $value ) ;
321 352
 	}
@@ -438,6 +469,9 @@  discard block
 block discarded – undo
438 469
 		$this->what = NULL ;
439 470
 	}
440 471
 
472
+	/**
473
+	 * @param string $what
474
+	 */
441 475
 	function set( $what, $val = TRUE ) {
442 476
 		$this->what = $what ;
443 477
 		$this->val = $val ;
@@ -498,6 +532,9 @@  discard block
 block discarded – undo
498 532
 	public $mode;
499 533
 	public $rule;
500 534
 	
535
+	/**
536
+	 * @param RuleSet $parser
537
+	 */
501 538
 	function __construct($parser, $lines) {
502 539
 		$this->parser = $parser;
503 540
 		$this->lines = $lines;
@@ -595,6 +632,9 @@  discard block
 block discarded – undo
595 632
 		[^/]               # Anything except /
596 633
 	)*/}xu' ;
597 634
 
635
+	/**
636
+	 * @param string $str
637
+	 */
598 638
 	function tokenize( $str, &$tokens, $o = 0 ) {
599 639
 
600 640
 		$pending = new Pending() ;
@@ -848,6 +888,9 @@  discard block
 block discarded – undo
848 888
 		return self::$parsers[$class]->compile($indent, $match[3]);
849 889
 	}
850 890
 
891
+	/**
892
+	 * @param string $string
893
+	 */
851 894
 	static function compile( $string ) {
852 895
 		static $rx = '@
853 896
 			^([\x20\t]*)/\*!\* (?:[\x20\t]*(!?\w*))?   # Start with some indent, a comment with the special marker, then an optional name
Please login to merge, or discard this patch.
thirdparty/php-peg/Parser.php 1 patch
Doc Comments   +25 added lines patch added patch discarded remove patch
@@ -9,6 +9,10 @@  discard block
 block discarded – undo
9 9
  *  the bracket if a failed match + restore has moved the current position backwards - so we have to check that too.
10 10
  */
11 11
 class ParserRegexp {
12
+
13
+	/**
14
+	 * @param Parser $parser
15
+	 */
12 16
 	function __construct( $parser, $rx ) {
13 17
 		$this->parser = $parser ;
14 18
 		$this->rx = $rx . 'Sx' ;
@@ -63,6 +67,9 @@  discard block
 block discarded – undo
63 67
 		return FALSE ;
64 68
 	}
65 69
 
70
+ 	/**
71
+ 	 * @param string $token
72
+ 	 */
66 73
  	function literal( $token ) {
67 74
  		/* Debugging: * / print( "Looking for token '$token' @ '" . substr( $this->string, $this->pos ) . "'\n" ) ; /* */
68 75
  		$toklen = strlen( $token ) ;
@@ -74,11 +81,17 @@  discard block
 block discarded – undo
74 81
 		return FALSE ;
75 82
 	}
76 83
 
84
+	/**
85
+	 * @param string $rx
86
+	 */
77 87
 	function rx( $rx ) {
78 88
 		if ( !isset( $this->regexps[$rx] ) ) $this->regexps[$rx] = new ParserRegexp( $this, $rx ) ;
79 89
 		return $this->regexps[$rx]->match() ;
80 90
 	}
81 91
 
92
+	/**
93
+	 * @param string $value
94
+	 */
82 95
 	function expression( $result, $stack, $value ) {
83 96
 		$stack[] = $result; $rv = false;
84 97
 		
@@ -100,14 +113,23 @@  discard block
 block discarded – undo
100 113
 		return is_array($rv) ? $rv['text'] : ($rv ? $rv : '');
101 114
 	}
102 115
 	
116
+	/**
117
+	 * @param string $key
118
+	 */
103 119
 	function packhas( $key, $pos ) {
104 120
 		return false ;
105 121
 	}
106 122
 
123
+	/**
124
+	 * @param string $key
125
+	 */
107 126
 	function packread( $key, $pos ) {
108 127
 		throw 'PackRead after PackHas=>false in Parser.php' ;
109 128
 	}
110 129
 
130
+	/**
131
+	 * @param string $key
132
+	 */
111 133
 	function packwrite( $key, $pos, $res ) {
112 134
 		return $res ;
113 135
 	}
@@ -144,6 +166,9 @@  discard block
 block discarded – undo
144 166
 		return $result ;
145 167
 	}
146 168
 
169
+	/**
170
+	 * @param string $storetag
171
+	 */
147 172
 	function store ( &$result, $subres, $storetag = NULL ) {
148 173
 		$result['text'] .= $subres['text'] ;
149 174
 
Please login to merge, or discard this patch.
thirdparty/simpletest/compatibility.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     
15 15
     /**
16 16
      *    Creates a copy whether in PHP5 or PHP4.
17
-     *    @param object $object     Thing to copy.
17
+     *    @param SimpleFormTag $object     Thing to copy.
18 18
      *    @return object            A copy.
19 19
      *    @access public
20 20
      *    @static
Please login to merge, or discard this patch.
thirdparty/simpletest/cookies.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -239,8 +239,6 @@
 block discarded – undo
239 239
     /**
240 240
      *    Removes expired and temporary cookies as if
241 241
      *    the browser was closed and re-opened.
242
-     *    @param string/integer $now   Time to test expiry against.
243
-     *    @access public
244 242
      */
245 243
     function restartSession($date = false) {
246 244
         $surviving_cookies = array();
Please login to merge, or discard this patch.