@@ -72,7 +72,7 @@  | 
                                                    ||
| 72 | 72 | * @param $objs The SS_List of objects to perform this batch action  | 
                                                        
| 73 | 73 | * on.  | 
                                                        
| 74 | 74 | * @param $helperMethod The method to call on each of those objects.  | 
                                                        
| 75 | - * @return JSON encoded map in the following format:  | 
                                                        |
| 75 | + * @return string encoded map in the following format:  | 
                                                        |
| 76 | 76 |  	 *  { | 
                                                        
| 77 | 77 |  	 *     'modified': { | 
                                                        
| 78 | 78 |  	 *       3: {'TreeTitle': 'Page3'}, | 
                                                        
@@ -33,7 +33,7 @@  | 
                                                    ||
| 33 | 33 | |
| 34 | 34 | /**  | 
                                                        
| 35 | 35 | * Sets the response negotiator  | 
                                                        
| 36 | - * @param ResponseNegotiator $negotiator The response negotiator to use  | 
                                                        |
| 36 | + * @param PjaxResponseNegotiator $negotiator The response negotiator to use  | 
                                                        |
| 37 | 37 | * @return Form The current form  | 
                                                        
| 38 | 38 | */  | 
                                                        
| 39 | 39 |  	public function setResponseNegotiator($negotiator) { | 
                                                        
@@ -86,7 +86,7 @@ discard block  | 
                                                    ||
| 86 | 86 | * left.  | 
                                                        
| 87 | 87 | * @param array $attributes an array of attributes to include on the link.  | 
                                                        
| 88 | 88 | *  | 
                                                        
| 89 | - * @return boolean The result of the operation.  | 
                                                        |
| 89 | + * @return boolean|null The result of the operation.  | 
                                                        |
| 90 | 90 | */  | 
                                                        
| 91 | 91 |  	public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null) { | 
                                                        
| 92 | 92 | return self::add_menu_item($code, $menuTitle, $url, null, $priority, $attributes);  | 
                                                        
@@ -106,7 +106,7 @@ discard block  | 
                                                    ||
| 106 | 106 | * have the rights to access some other part of the admin area.  | 
                                                        
| 107 | 107 | * @param array $attributes an array of attributes to include on the link.  | 
                                                        
| 108 | 108 | *  | 
                                                        
| 109 | - * @return boolean Success  | 
                                                        |
| 109 | + * @return boolean|null Success  | 
                                                        |
| 110 | 110 | */  | 
                                                        
| 111 | 111 | public static function add_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,  | 
                                                        
| 112 | 112 |  											$attributes = null) { | 
                                                        
@@ -237,7 +237,7 @@ discard block  | 
                                                    ||
| 237 | 237 | * have the rights to access some other part of the admin area.  | 
                                                        
| 238 | 238 | * @param array $attributes an array of attributes to include on the link.  | 
                                                        
| 239 | 239 | *  | 
                                                        
| 240 | - * @return boolean Success  | 
                                                        |
| 240 | + * @return boolean|null Success  | 
                                                        |
| 241 | 241 | */  | 
                                                        
| 242 | 242 | public static function replace_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,  | 
                                                        
| 243 | 243 |  												$attributes = null) { | 
                                                        
@@ -256,6 +256,8 @@ discard block  | 
                                                    ||
| 256 | 256 | |
| 257 | 257 | /**  | 
                                                        
| 258 | 258 | * Add a previously built menu item object to the menu  | 
                                                        
| 259 | + * @param string $code  | 
                                                        |
| 260 | + * @param CMSMenuItem $cmsMenuItem  | 
                                                        |
| 259 | 261 | */  | 
                                                        
| 260 | 262 |  	protected static function add_menu_item_obj($code, $cmsMenuItem) { | 
                                                        
| 261 | 263 | self::$menu_item_changes[] = array(  | 
                                                        
@@ -72,7 +72,7 @@  | 
                                                    ||
| 72 | 72 | /**  | 
                                                        
| 73 | 73 | * @param array  | 
                                                        
| 74 | 74 | *  | 
                                                        
| 75 | - * @return HTML  | 
                                                        |
| 75 | + * @return string  | 
                                                        |
| 76 | 76 | */  | 
                                                        
| 77 | 77 |  	public function getAttributesHTML($attrs = null) { | 
                                                        
| 78 | 78 | $exclude = (is_string($attrs)) ? func_get_args() : null;  | 
                                                        
@@ -14,6 +14,10 @@  | 
                                                    ||
| 14 | 14 | */  | 
                                                        
| 15 | 15 | protected $group;  | 
                                                        
| 16 | 16 | |
| 17 | + /**  | 
                                                        |
| 18 | + * @param SecurityAdmin $controller  | 
                                                        |
| 19 | + * @param string $name  | 
                                                        |
| 20 | + */  | 
                                                        |
| 17 | 21 |  	public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) { | 
                                                        
| 18 | 22 |  		if(!$fields) { | 
                                                        
| 19 | 23 | $helpHtml = _t(  | 
                                                        
@@ -550,6 +550,7 @@ discard block  | 
                                                    ||
| 550 | 550 | * Returns the menu title for the given LeftAndMain subclass.  | 
                                                        
| 551 | 551 | * Implemented static so that we can get this value without instantiating an object.  | 
                                                        
| 552 | 552 | * Menu title is *not* internationalised.  | 
                                                        
| 553 | + * @return string  | 
                                                        |
| 553 | 554 | */  | 
                                                        
| 554 | 555 |  	public static function menu_title_for_class($class) { | 
                                                        
| 555 | 556 | $title = Config::inst()->get($class, 'menu_title', Config::FIRST_SET);  | 
                                                        
@@ -715,6 +716,7 @@ discard block  | 
                                                    ||
| 715 | 716 | * Return a list of appropriate templates for this class, with the given suffix using  | 
                                                        
| 716 | 717 |  	 * {@link SSViewer::get_templates_by_class()} | 
                                                        
| 717 | 718 | *  | 
                                                        
| 719 | + * @param string $suffix  | 
                                                        |
| 718 | 720 | * @return array  | 
                                                        
| 719 | 721 | */  | 
                                                        
| 720 | 722 |  	public function getTemplatesWithSuffix($suffix) { | 
                                                        
@@ -1535,7 +1537,7 @@ discard block  | 
                                                    ||
| 1535 | 1537 | * The controller might not have any previewable content, in which case  | 
                                                        
| 1536 | 1538 | * this method returns FALSE.  | 
                                                        
| 1537 | 1539 | *  | 
                                                        
| 1538 | - * @return String|boolean  | 
                                                        |
| 1540 | + * @return boolean  | 
                                                        |
| 1539 | 1541 | */  | 
                                                        
| 1540 | 1542 |  	public function LinkPreview() { | 
                                                        
| 1541 | 1543 | return false;  | 
                                                        
@@ -1726,7 +1728,7 @@ discard block  | 
                                                    ||
| 1726 | 1728 | }  | 
                                                        
| 1727 | 1729 | |
| 1728 | 1730 | /**  | 
                                                        
| 1729 | - * @return String  | 
                                                        |
| 1731 | + * @return DBField  | 
                                                        |
| 1730 | 1732 | */  | 
                                                        
| 1731 | 1733 |  	public function Locale() { | 
                                                        
| 1732 | 1734 |  		return DBField::create_field('DBLocale', i18n::get_locale()); | 
                                                        
@@ -1892,6 +1894,9 @@ discard block  | 
                                                    ||
| 1892 | 1894 | return (parent::isFinished() || $this->isFinished);  | 
                                                        
| 1893 | 1895 | }  | 
                                                        
| 1894 | 1896 | |
| 1897 | + /**  | 
                                                        |
| 1898 | + * @param boolean $bool  | 
                                                        |
| 1899 | + */  | 
                                                        |
| 1895 | 1900 |  	public function setIsFinished($bool) { | 
                                                        
| 1896 | 1901 | $this->isFinished = $bool;  | 
                                                        
| 1897 | 1902 | }  | 
                                                        
@@ -14,6 +14,10 @@ discard block  | 
                                                    ||
| 14 | 14 | */  | 
                                                        
| 15 | 15 | protected $group;  | 
                                                        
| 16 | 16 | |
| 17 | + /**  | 
                                                        |
| 18 | + * @param SecurityAdmin $controller  | 
                                                        |
| 19 | + * @param string $name  | 
                                                        |
| 20 | + */  | 
                                                        |
| 17 | 21 |  	public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) { | 
                                                        
| 18 | 22 |  		if(!$fields) { | 
                                                        
| 19 | 23 | $helpHtml = _t(  | 
                                                        
@@ -100,7 +104,7 @@ discard block  | 
                                                    ||
| 100 | 104 | }  | 
                                                        
| 101 | 105 | |
| 102 | 106 | /**  | 
                                                        
| 103 | - * @param $group Group  | 
                                                        |
| 107 | + * @param DataObject $group Group  | 
                                                        |
| 104 | 108 | */  | 
                                                        
| 105 | 109 |  	public function setGroup($group) { | 
                                                        
| 106 | 110 | $this->group = $group;  | 
                                                        
@@ -336,8 +336,8 @@ discard block  | 
                                                    ||
| 336 | 336 | /**  | 
                                                        
| 337 | 337 | * Extracts the response body and headers from a full curl response  | 
                                                        
| 338 | 338 | *  | 
                                                        
| 339 | - * @param curl_handle $ch The curl handle for the request  | 
                                                        |
| 340 | - * @param string $rawResponse The raw response text  | 
                                                        |
| 339 | + * @param resource $ch The curl handle for the request  | 
                                                        |
| 340 | + * @param string $rawHeaders  | 
                                                        |
| 341 | 341 | *  | 
                                                        
| 342 | 342 | * @return RestfulService_Response The response object  | 
                                                        
| 343 | 343 | */  | 
                                                        
@@ -601,7 +601,7 @@ discard block  | 
                                                    ||
| 601 | 601 | * get the cached response object. This allows you to access the cached  | 
                                                        
| 602 | 602 | * eaders, not just the cached body.  | 
                                                        
| 603 | 603 | *  | 
                                                        
| 604 | - * @return RestfulSerivice_Response The cached response object  | 
                                                        |
| 604 | + * @return boolean The cached response object  | 
                                                        |
| 605 | 605 | */  | 
                                                        
| 606 | 606 |  	public function getCachedResponse() { | 
                                                        
| 607 | 607 | return $this->cachedResponse;  | 
                                                        
@@ -214,6 +214,7 @@ discard block  | 
                                                    ||
| 214 | 214 | * via the standard template inclusion process.  | 
                                                        
| 215 | 215 | *  | 
                                                        
| 216 | 216 | * @param string  | 
                                                        
| 217 | + * @param string $template  | 
                                                        |
| 217 | 218 | */  | 
                                                        
| 218 | 219 |  	public function setTemplate($template) { | 
                                                        
| 219 | 220 | $this->template = $template;  | 
                                                        
@@ -269,6 +270,9 @@ discard block  | 
                                                    ||
| 269 | 270 | |
| 270 | 271 | /**  | 
                                                        
| 271 | 272 | * Create a new RSSFeed entry.  | 
                                                        
| 273 | + * @param string $titleField  | 
                                                        |
| 274 | + * @param string $descriptionField  | 
                                                        |
| 275 | + * @param string $authorField  | 
                                                        |
| 272 | 276 | */  | 
                                                        
| 273 | 277 | public function __construct($entry, $titleField, $descriptionField,  | 
                                                        
| 274 | 278 |  											$authorField) { | 
                                                        
@@ -310,6 +314,7 @@ discard block  | 
                                                    ||
| 310 | 314 | /**  | 
                                                        
| 311 | 315 | * Return the named field as an obj() call from $this->failover.  | 
                                                        
| 312 | 316 | * Default to the given class if there's no casting information.  | 
                                                        
| 317 | + * @param string $fieldName  | 
                                                        |
| 313 | 318 | */  | 
                                                        
| 314 | 319 |  	public function rssField($fieldName, $defaultClass = 'Varchar') { | 
                                                        
| 315 | 320 |  		if($fieldName) { |