silverstripe / silverstripe-framework

admin/code/LeftAndMain.php

Doc Comments +4 added lines, -4 removed lines

@@ -252,7 +252,7 @@ 
     /**
      * Gets the combined configuration of all LeafAndMain subclasses required by the client app.
      *
-     * @return array
+     * @return string
      *
      * WARNING: Experimental API
      */
@@ -639,7 +639,7 @@ 
      *
      * @param string $url
      * @param int $code
-     * @return HTTPResponse|string
+     * @return string|null
      */
     public function redirect($url, $code=302) {
         if($this->getRequest()->isAjax()) {
@@ -917,7 +917,7 @@ 
      * {@link SSViewer::get_templates_by_class()}
      *
      * @param string $suffix
-     * @return array
+     * @return string
      */
     public function getTemplatesWithSuffix($suffix) {
         $templates = SSViewer::get_templates_by_class(get_class($this), $suffix, __CLASS__);
@@ -2000,7 +2000,7 @@ 
     }
 
     /**
-     * @return String
+     * @return DBField
      */
     public function Locale() {
         return DBField::create_field('Locale', i18n::get_locale());

View/Parsers/EmbedShortcodeProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	/**
 	 * Gets the list of shortcodes provided by this handler
 	 *
-	 * @return mixed
+	 * @return string[]
 	 */
 	public static function get_shortcodes()
 	{

Assets/FileShortcodeProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	/**
 	 * Gets the list of shortcodes provided by this handler
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public static function get_shortcodes()
 	{

Assets/ImageShortcodeProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	/**
 	 * Gets the list of shortcodes provided by this handler
 	 *
-	 * @return mixed
+	 * @return string[]
 	 */
 	public static function get_shortcodes()
 	{

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
      */