Merge branch '3.6' into 4.0

README.md

@@ -8,29 +8,28 @@
 [![License](https://poser.pugx.org/silverstripe/framework/license.svg)](https://github.com/silverstripe/silverstripe-framework#license)
 [![Dependency Status](https://www.versioneye.com/php/silverstripe:framework/badge.svg)](https://www.versioneye.com/php/silverstripe:framework)
 [![Reference Status](https://www.versioneye.com/php/silverstripe:framework/reference_badge.svg?style=flat)](https://www.versioneye.com/php/silverstripe:framework/references)
-![helpfulrobot](https://helpfulrobot.io/silverstripe/framework/badge)
 
-PHP5 framework forming the base for the SilverStripe CMS ([http://silverstripe.org](http://silverstripe.org)).
-Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](http://github.com/silverstripe/silverstripe-cms) module.
+PHP framework forming the base for the SilverStripe CMS ([https://silverstripe.org](https://silverstripe.org)). 
+Requires a [`silverstripe-installer`](https://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](https://github.com/silverstripe/silverstripe-cms) module.
 
 ## Installation ##
 
-See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
-and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
+See [installation on different platforms](https://doc.silverstripe.org/framework/en/installation/),
+and [installation from source](https://doc.silverstripe.org/framework/en/installation/from-source).
 
 ## Bugtracker ##
 
 Bugs are tracked on [github.com](https://github.com/silverstripe/silverstripe-framework/issues). 
-Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
+Please read our [issue reporting guidelines](https://doc.silverstripe.org/framework/en/misc/contributing/issues).
 
 ## Development and Contribution ##
 
-If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code).
+If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/contributing/code/).
 
 ## Links ##
 
- * [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
- * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
+ * [Server Requirements](https://doc.silverstripe.org/framework/en/installation/server-requirements)
+ * [Changelogs](https://doc.silverstripe.org/framework/en/changelogs/)
  * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
  * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
  * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)

src/Forms/FieldList.php

@@ -154,8 +154,7 @@ class FieldList extends ArrayList
      * This is most commonly used when overloading getCMSFields()
      *
      * @param string $tabName The name of the tab or tabset.  Subtabs can be referred to as TabSet.Tab
-     *                        or TabSet.Tab.Subtab.
-     * This function will create any missing tabs.
+     *                        or TabSet.Tab.Subtab. This function will create any missing tabs.
      * @param array $fields An array of {@link FormField} objects.
      * @param string $insertBefore Name of field to insert before
      */

src/Forms/GridField/GridFieldFooter.php

@@ -38,7 +38,7 @@ class GridFieldFooter implements GridField_HTMLProvider
     /**
      *
      * @param string $message A message to display in the footer
-     * @param bool $showrecordcount
+     * @param boolt $showrecordcount
      */
     public function __construct($message = null, $showrecordcount = true)
     {

src/Forms/GridField/GridState.php

@@ -29,7 +29,7 @@ class GridState extends HiddenField
 
     /**
      * @param GridField $grid
-     * @param string $value json encoded string
+     * @param string $value JSON encoded string
      */
     public function __construct($grid, $value = null)
     {

src/Forms/HTMLEditor/HTMLEditorSanitiser.php

@@ -190,7 +190,7 @@ class HTMLEditorSanitiser
     /**
      * Given an attribute name, return the rule structure for that attribute
      *
-     * @param stdClass $elementRule
+     * @param object $elementRule
      * @param string $name The attribute name
      * @return stdClass The attribute rule
      */
@@ -211,7 +211,7 @@ class HTMLEditorSanitiser
      * Given a DOMElement and an element rule, check if that element passes the rule
      * @param DOMElement $element The element to check
      * @param stdClass $rule The rule to check against
-     * @return bool true if the element passes (and so can be kept), false if it fails (and so needs stripping)
+     * @return bool True if the element passes (and so can be kept), false if it fails (and so needs stripping)
      */
     protected function elementMatchesRule($element, $rule = null)
     {

src/Forms/TreeDropdownField.php

@@ -654,7 +654,7 @@ class TreeDropdownField extends FormField
     }
 
     /**
-     * @return String
+     * @return string
      */
     public function getKeyField()
     {

src/Forms/UploadReceiver.php

@@ -131,7 +131,7 @@ trait UploadReceiver
      * Set custom validator for this field
      *
      * @param Upload_Validator $validator
-     * @return $this Self reference
+     * @return $this
      */
     public function setValidator(Upload_Validator $validator)
     {
@@ -143,7 +143,7 @@ trait UploadReceiver
      * Sets the upload folder name
      *
      * @param string $folderName
-     * @return $this Self reference
+     * @return $this
      */
     public function setFolderName($folderName)
     {

src/ORM/ArrayLib.php

@@ -247,6 +247,7 @@ class ArrayLib
      * @param array $array
      * @param boolean $preserveKeys
      * @param array $out
+     *
      * @return array
      */
     public static function flatten($array, $preserveKeys = true, &$out = array())

src/Security/Group.php

@@ -305,7 +305,7 @@ class Group extends DataObject
      * including all members which are "inherited" from children groups of this record.
      * See {@link DirectMembers()} for retrieving members without any inheritance.
      *
-     * @param String $filter
+     * @param string $filter
      * @return ManyManyList
      */
     public function Members($filter = '')