sminnee / silverstripe-framework

tests/security/GroupTest.php

Doc Comments +4 added lines

@@ -175,6 +175,10 @@
 
 class GroupTest_MemberForm extends Form {
 
+	/**
+	 * @param GroupTest $controller
+	 * @param string $name
+	 */
 	public function __construct($controller, $name) {
 		$fields = singleton('GroupTest_Member')->getCMSFields();
 		$actions = new FieldList(

tests/security/MemberTest.php

Doc Comments +3 added lines

@@ -913,6 +913,9 @@
  */
 class MemberTest_ValidatorExtension extends DataExtension implements TestOnly {
 
+	/**
+	 * @param Member_Validator $validator
+	 */
 	public function updateValidator(&$validator) {
 		$validator->addRequiredField('Surname');
 		$validator->removeRequiredField('FirstName');

tests/security/SecurityTest.php

Doc Comments +4 added lines

@@ -580,6 +580,8 @@ 
 	/**
 	 * Execute a log-in form using Director::test().
 	 * Helper method for the tests above
+	 * @param string $email
+	 * @param string $password
 	 */
 	public function doTestLoginForm($email, $password, $backURL = 'test/link') {
 		$this->get(Config::inst()->get('Security', 'logout_url'));
@@ -600,6 +602,8 @@ 
 
 	/**
 	 * Helper method to execute a change password form
+	 * @param string $oldPassword
+	 * @param string $newPassword
 	 */
 	public function doTestChangepasswordForm($oldPassword, $newPassword) {
 		return $this->submitForm(

tests/view/ContentNegotiatorTest.php

Doc Comments +1 added lines

@@ -5,6 +5,7 @@
 	/**
 	 * Small helper to render templates from strings
 	 * Cloned from SSViewerTest
+	 * @param string $templateString
 	 */
 	private function render($templateString, $data = null) {
 		$t = SSViewer::fromString($templateString);

tests/view/SSViewerCacheBlockTest.php

Doc Comments +6 added lines

@@ -28,6 +28,9 @@ 
 		"Versioned('Stage', 'Live')"
 	);
 
+	/**
+	 * @param string $entropy
+	 */
 	public function setEntropy($entropy) {
 		$this->entropy = $entropy;
 	}
@@ -53,6 +56,9 @@ 
 		SS_Cache::set_cache_lifetime('cacheblock', $cacheOn ? 600 : -1);
 	}
 
+	/**
+	 * @param string $template
+	 */
 	protected function _runtemplate($template, $data = null) {
 		if ($data === null) $data = $this->data;
 		if (is_array($data)) $data = $this->data->customise($data);

view/ArrayData.php

Doc Comments +4 added lines, -10 removed lines

@@ -50,14 +50,7 @@ 
 	/**
 	 * Gets a field from this object.
 	 *
-	 * @param string $field
-	 *
-	 * If the value is an object but not an instance of
-	 * ViewableData, it will be converted recursively to an
-	 * ArrayData.
-	 *
-	 * If the value is an associative array, it will likewise be
-	 * converted recursively to an ArrayData.
+	 * @param string $f
 	 */
 	public function getField($f) {
 		$value = $this->array[$f];
@@ -73,7 +66,7 @@ 
 	* Add or set a field on this object.
 	*
 	* @param string $field
-	* @param mixed $value
+	* @param string $value
 	*/
 	public function setField($field, $value) {
 		$this->array[$field] = $value;
@@ -83,6 +76,7 @@ 
 	 * Check array to see if field isset
 	 *
 	 * @param string Field Key
+	 * @param string $f
 	 * @return bool
 	 */
 	public function hasField($f) {
@@ -93,7 +87,7 @@ 
 	 * Converts an associative array to a simple object
 	 *
 	 * @param array
-	 * @return obj $obj
+	 * @return stdClass $obj
 	 */
 	public static function array_to_object($arr = null) {
 		$obj = new stdClass();

view/SSTemplateParser.php

Doc Comments +9 added lines, -5 removed lines

@@ -111,6 +111,8 @@ 
 
 	/**
 	 * Override the function that constructs the result arrays to also prepare a 'php' item in the array
+	 * @param string $matchrule
+	 * @param string $name
 	 */
 	function construct($matchrule, $name, $arguments = null) {
 		$res = parent::construct($matchrule, $name, $arguments);
@@ -172,9 +174,9 @@ 
 
 	/**
 	 * Ensures that the arguments to addOpenBlock and addClosedBlock are valid
-	 * @param $name
-	 * @param $callable
-	 * @param $type
+	 * @param string $name
+	 * @param callable $callable
+	 * @param string $type
 	 * @throws InvalidArgumentException
 	 */
 	protected function validateExtensionBlock($name, $callable, $type) {
@@ -737,6 +739,7 @@ 
 	 * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to
 	 * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj)
 	 * depending on the context the lookup is used in.
+	 * @param string $method
 	 */
 	function Lookup_AddLookupStep(&$res, $sub, $method) {
 		$res['LookupSteps'][] = $sub;
@@ -4691,8 +4694,8 @@ 
 	 * Compiles some passed template source code into the php code that will execute as per the template source.
 	 *
 	 * @throws SSTemplateParseException
-	 * @param  $string The source of the template
-	 * @param string $templateName The name of the template, normally the filename the template source was loaded from
+	 * @param  string $string The source of the template
+	 * @param string string The name of the template, normally the filename the template source was loaded from
 	 * @param bool $includeDebuggingComments True is debugging comments should be included in the output
 	 * @param bool $topTemplate True if this is a top template, false if it's just a template
 	 * @return mixed|string The php that, when executed (via include or exec) will behave as per the template source
@@ -4732,6 +4735,7 @@ 
 
 	/**
 	 * @param string $code
+	 * @param string $templateName
 	 * @return string $code
 	 */
 	protected function includeDebuggingComments($code, $templateName) {

dev/SilverStripeListener.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 
 	protected $whitelist = false;
 
+	/**
+	 * @param string $name
+	 */
 	public function __construct($name = null, $options = array()) {
 		if(is_string($options)) {
 			$options = array('whitelist' => $options);

forms/DropdownField.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	/**
 	 * @param array $properties
 	 *
-	 * @return HTMLText
+	 * @return string
 	 */
 	public function FieldHolder($properties = array()) {
 		return $this->Field($properties);