Merge branch '4.1' into 4

src/Model/Blog.php

@@ -31,11 +31,11 @@ use SilverStripe\View\Requirements;
 /**
  * Blog Holder
  *
- * @method HasManyList Tags() List of tags in this blog
- * @method HasManyList Categories() List of categories in this blog
- * @method ManyManyList Editors() List of editors
- * @method ManyManyList Writers() List of writers
- * @method ManyManyList Contributors() List of contributors
+ * @method HasManyList<BlogCategory> Categories()
+ * @method ManyManyList<Member> Contributors()
+ * @method ManyManyList<Member> Editors()
+ * @method HasManyList<BlogTag> Tags()
+ * @method ManyManyList<Member> Writers()
  */
 class Blog extends Page implements PermissionProvider
 {

src/Model/BlogCategory.php

@@ -7,11 +7,11 @@ use SilverStripe\ORM\DataObject;
 /**
  * A blog category for generalising blog posts.
  *
- * @method Blog Blog()
- *
  * @property string $Title
  * @property string $URLSegment
  * @property int $BlogID
+ * @method Blog Blog()
+ * @method SilverStripe\ORM\ManyManyList<BlogPost> BlogPosts()
  */
 class BlogCategory extends DataObject implements CategorisationObject
 {

src/Model/BlogMemberExtension.php

@@ -17,6 +17,8 @@ use SilverStripe\View\Requirements;
 /**
  * This class is responsible for add Blog specific behaviour to Members.
  *
+ * @method SilverStripe\ORM\ManyManyList<BlogPost> BlogPosts()
+ * @method Image BlogProfileImage()
  */
 class BlogMemberExtension extends DataExtension
 {

src/Model/BlogPost.php

@@ -31,17 +31,15 @@ use SilverStripe\View\Requirements;
 /**
  * An individual blog post.
  *
- * @method ManyManyList Categories()
- * @method ManyManyList Tags()
- * @method ManyManyList Authors()
- * @method Blog Parent()
- * @method Image FeaturedImage()
- *
  * @property string $PublishDate
  * @property string $AuthorNames
  * @property string $Summary
  * @property int $ParentID
  * @property int $FeaturedImageID
+ * @method ManyManyList<Member> Authors()
+ * @method ManyManyList<BlogCategory> Categories()
+ * @method Image FeaturedImage()
+ * @method ManyManyList<BlogTag> Tags()
  */
 class BlogPost extends Page
 {

src/Model/BlogTag.php

@@ -7,12 +7,11 @@ use SilverStripe\ORM\DataObject;
 /**
  * A blog tag for keyword descriptions of a blog post.
  *
- *
- * @method Blog Blog()
- *
  * @property string $Title
  * @property string $URLSegment
  * @property int $BlogID
+ * @method Blog Blog()
+ * @method SilverStripe\ORM\ManyManyList<BlogPost> BlogPosts()
  */
 class BlogTag extends DataObject implements CategorisationObject
 {