sminnee / silverstripe-framework

dev/FunctionalTest.php

Doc Comments +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
 	/**
 	 * Returns the {@link Session} object for this test
 	 *
-	 * @return Session
+	 * @return Session|null
 	 */
 	public function session() {
 		return $this->mainSession->session();
@@ -217,7 +217,7 @@ 
 	 * Find an attribute in a SimpleXMLElement object by name.
 	 * @param SimpleXMLElement $object
 	 * @param string $attribute Name of attribute to find
-	 * @return SimpleXMLElement object of the attribute
+	 * @return boolean object of the attribute
 	 */
 	public function findAttribute($object, $attribute) {
 		$found = false;
@@ -247,7 +247,7 @@ 
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
 	 *
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
+	 * @param string[] $expectedMatches The content of at least one of the matched tags
 	 * @throws PHPUnit_Framework_AssertionFailedError
 	 * @return boolean
 	 */
@@ -344,7 +344,7 @@ 
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
 	 * @param array|string $expectedMatches The content of *all* matched tags as an array
 	 * @throws PHPUnit_Framework_AssertionFailedError
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function assertExactHTMLMatchBySelector($selector, $expectedMatches) {
 		$items = $this->cssParser()->getBySelector($selector);

filesystem/flysystem/FlysystemAssetStore.php

Unused Use Statements -2 removed lines

@@ -4,11 +4,9 @@
 
 use Deprecation;
 use SQLExpression;
-
 use InvalidArgumentException;
 use Config;
 use LogicException;
-
 use Injector;
 use SilverStripe\Model\Connect\Database;
 use SilverStripe\Control\Director;

forms/AssetField.php

Doc Comments +5 added lines, -2 removed lines

@@ -151,7 +151,6 @@ 
 	 *
 	 * @param string $name The internal field name, passed to forms.
 	 * @param string $title The field label.
-	 * @param Form $form Reference to the container form
 	 */
 	public function __construct($name, $title = null) {
 		$this->addExtraClass('ss-upload'); // class, used by js
@@ -263,6 +262,10 @@ 
 		return $this->record;
 	}
 
+	/**
+	 * @param null|DataObject $value
+	 * @param DataObject $record
+	 */
 	public function setValue($value, $record = null) {
 		// Extract value from underlying record
 		if(empty($value) && $this->getName() && $record instanceof DataObject) {
@@ -700,7 +703,7 @@ 
 	/**
 	 * Action to handle upload of a single file
 	 *
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 * @return HTTPResponse
 	 */
 	public function upload(HTTPRequest $request) {

forms/UploadField.php

Doc Comments +10 added lines, -11 removed lines

@@ -223,7 +223,6 @@ 
 	 * @param string $title The field label.
 	 * @param SS_List $items If no items are defined, the field will try to auto-detect an existing relation on
 	 *                       @link $record}, with the same name as the field name.
-	 * @param Form $form Reference to the container form
 	 */
 	public function __construct($name, $title = null, SS_List $items = null) {
 
@@ -1073,7 +1072,7 @@ 
 	}
 
 	/**
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 * @return UploadField_ItemHandler
 	 */
 	public function handleItem(HTTPRequest $request) {
@@ -1089,8 +1088,8 @@ 
 	}
 
 	/**
-	 * @param SS_HTTPRequest $request
-	 * @return UploadField_ItemHandler
+	 * @param HTTPRequest $request
+	 * @return UploadField_SelectHandler
 	 */
 	public function handleSelect(HTTPRequest $request) {
 		if(!$this->canAttachExisting()) return $this->httpError(403);
@@ -1212,7 +1211,7 @@ 
 	/**
 	 * Action to handle upload of a single file
 	 *
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 * @return HTTPResponse
 	 * @return HTTPResponse
 	 */
@@ -1255,7 +1254,7 @@ 
 	 * Retrieves details for files that this field wishes to attache to the
 	 * client-side form
 	 *
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 * @return HTTPResponse
 	 */
 	public function attach(HTTPRequest $request) {
@@ -1297,7 +1296,7 @@ 
 	/**
 	 * Determines if a specified file exists
 	 *
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 */
 	public function fileexists(HTTPRequest $request) {
 		// Assert that requested filename doesn't attempt to escape the directory
@@ -1425,7 +1424,7 @@ 
 	/**
 	 * Action to handle deleting of a single file
 	 *
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 * @return HTTPResponse
 	 */
 	public function delete(HTTPRequest $request) {
@@ -1451,8 +1450,8 @@ 
 	/**
 	 * Action to handle editing of a single file
 	 *
-	 * @param SS_HTTPRequest $request
-	 * @return ViewableData_Customised
+	 * @param HTTPRequest $request
+	 * @return DBField
 	 */
 	public function edit(HTTPRequest $request) {
 		// Check form field state
@@ -1500,7 +1499,7 @@ 
 	/**
 	 * @param array $data
 	 * @param Form $form
-	 * @param SS_HTTPRequest $request
+	 * @param HTTPRequest $request
 	 */
 	public function doEdit(array $data, Form $form, HTTPRequest $request) {
 		// Check form field state

model/versioning/VersionedGridFieldItemRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
      *
      * @param array $data
      * @param Form $form
-	 * @return HTTPResponse
+	 * @return SilverStripe\Control\HTTPResponse
      */
 	public function doArchive($data, $form) {
 		$record = $this->getRecord();