silverstripe / silverstripe-framework

src/Assets/File.php

Doc Comments +5 added lines, -5 removed lines

@@ -423,7 +423,7 @@ 
      * Check if this file can be modified
      *
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canEdit($member = null)
     {
@@ -444,7 +444,7 @@ 
      *
      * @param Member $member
      * @param array $context
-     * @return boolean
+     * @return boolean|string
      */
     public function canCreate($member = null, $context = array())
     {
@@ -464,7 +464,7 @@ 
      * Check if this file can be deleted
      *
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canDelete($member = null)
     {
@@ -697,7 +697,7 @@ 
      *
      * @param string $condition The PHP condition to be evaluated.  The page will be called $item
      * @param array $collator An array, passed by reference, to collect all of the matching descendants.
-     * @return true|null
+     * @return boolean|null
      */
     public function collateDescendants($condition, &$collator)
     {
@@ -1089,6 +1089,7 @@ 
      *
      * @param String File extension, without dot prefix. Use an asterisk ('*')
      * to specify a generic fallback if no mapping is found for an extension.
+     * @param string $ext
      * @return String Classname for a subclass of {@link File}
      */
     public static function get_class_for_file_extension($ext)
@@ -1248,7 +1249,6 @@ 
      * Note that the result will not have a leading slash, and should not be used
      * with local file paths.
      *
-     * @param string $part,... Parts
      * @return string
      */
     public static function join_paths($part = null)

src/Assets/Flysystem/AssetAdapter.php

Doc Comments +3 added lines

@@ -41,6 +41,9 @@
         ]
     );
 
+    /**
+     * @param string $root
+     */
     public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS)
     {
         // Get root path

src/Assets/Folder.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      * Find the given folder or create it as a database record
      *
      * @param string $folderPath Directory path relative to assets root
-     * @return Folder|null
+     * @return null|\SilverStripe\ORM\DataObject
      */
     public static function find_or_make($folderPath)
     {

src/Assets/GDBackend.php

Doc Comments +3 added lines, -4 removed lines

@@ -198,7 +198,7 @@ 
      * Check if this image has previously crashed GD when attempting to open it - if it's opened
      * successfully, the manipulation's cache key is removed.
      *
-     * @param string $arg,... Any number of args that identify this image
+     * @param string $arg
      * @return bool True if failed
      */
     public function failedResample($arg = null)
@@ -210,7 +210,7 @@ 
     /**
      * Mark a file as failed
      *
-     * @param string $arg,... Any number of args that identify this image
+     * @param string $arg
      */
     protected function markFailed($arg = null)
     {
@@ -221,7 +221,6 @@ 
     /**
      * Mark a file as succeeded
      *
-     * @param string $arg,... Any number of args that identify this image
      */
     protected function markSucceeded($arg = null)
     {
@@ -378,7 +377,7 @@ 
      * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu)
      *
      * @param float $angle Angle in degrees
-     * @return static
+     * @return null|resource
      */
     public function rotatePixelByPixel($angle)
     {

src/Assets/ImageManipulation.php

Doc Comments -1 removed lines

@@ -804,7 +804,6 @@
      * Name a variant based on a format with arbitrary parameters
      *
      * @param string $format The format name.
-     * @param mixed $arg,... Additional arguments
      * @return string
      * @throws InvalidArgumentException
      */

src/Assets/Upload.php

Doc Comments +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
      * Set a different instance than {@link Upload_Validator}
      * for this upload session.
      *
-     * @param object $validator
+     * @param Upload_Validator $validator
      */
     public function setValidator($validator)
     {
@@ -393,7 +393,7 @@ 
     /**
      * Determines wether previous operations caused an error.
      *
-     * @return boolean
+     * @return integer
      */
     public function isError()
     {

src/Control/Controller.php

Doc Comments +3 added lines, -3 removed lines

@@ -147,6 +147,7 @@ 
      * {@inheritdoc}
      *
      * Also set the URLParams
+     * @param HTTPRequest $request
      */
     public function setRequest($request)
     {
@@ -523,7 +524,7 @@ 
      *
      * @param array $params
      *
-     * @return string
+     * @return DBHTMLText
      */
     public function render($params = null)
     {
@@ -702,7 +703,7 @@ 
      * Tests whether a redirection has been requested. If redirect() has been called, it will return
      * the URL redirected to. Otherwise, it will return null.
      *
-     * @return null|string
+     * @return boolean
      */
     public function redirectedTo()
     {
@@ -736,7 +737,6 @@ 
      *
      * Caution: All parameters are expected to be URI-encoded already.
      *
-     * @param string|array $arg,.. One or more link segments, or list of link segments as an array
      * @return string
      */
     public static function join_links($arg = null)

src/Control/CookieJar.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
      * @see http://uk3.php.net/manual/en/function.setcookie.php
      *
      * @param string $name The name of the cookie
-     * @param string|array $value The value for the cookie to hold
+     * @param false|string $value The value for the cookie to hold
      * @param int $expiry The number of days until expiry
      * @param string $path The path to save the cookie on (falls back to site base)
      * @param string $domain The domain to make the cookie available on

src/Control/Director.php

Doc Comments +3 added lines, -3 removed lines

@@ -555,7 +555,7 @@ 
      * Returns the domain part of the URL 'http://www.mysite.com'. Returns FALSE is this environment
      * variable isn't set.
      *
-     * @return bool|string
+     * @return string|false
      */
     public static function protocolAndHost()
     {
@@ -912,7 +912,7 @@ 
     /**
      * Returns true if the given file exists. Filename should be relative to the site root.
      *
-     * @param $file
+     * @param string $file
      *
      * @return bool
      */
@@ -1145,7 +1145,7 @@ 
      * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and
      * {@link Director::isLive()}.
      *
-     * @return bool|string
+     * @return string|false
      */
     public static function get_environment_type()
     {