Merge branch '5.1' into 5

silverstripe · Dec 17, 2023 · c32ab97 · c32ab97
2 parents 1ec2f0b + 8d24b75
commit c32ab97
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Extensions/ElementalPageExtension.php b/src/Extensions/ElementalPageExtension.php
@@ -10,8 +10,8 @@
 use SilverStripe\View\SSViewer;
 
 /**
- * @method ElementalArea ElementalArea()
  * @property int ElementalAreaID
+ * @method ElementalArea ElementalArea()
  */
 class ElementalPageExtension extends ElementalAreasExtension
 {

diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
@@ -47,9 +47,8 @@
  * @property string $Style
  * @property int $ParentID
  *
- * @method ElementalArea Parent()
- *
  * @mixin Versioned
+ * @method ElementalArea Parent()
  */
 class BaseElement extends DataObject implements CMSPreviewable
 {

diff --git a/src/Models/ElementalArea.php b/src/Models/ElementalArea.php
@@ -23,6 +23,7 @@
  * @property string $OwnerClassName
  *
  * @mixin Versioned
+ * @method HasManyList<BaseElement> Elements()
  */
 class ElementalArea extends DataObject
 {

diff --git a/src/TopPage/DataExtension.php b/src/TopPage/DataExtension.php
@@ -21,9 +21,9 @@
  * with deeply nested block structures. Apply to @see BaseElement and @see ElementalArea.
  *
  * @property int $TopPageID
- * @method SiteTree TopPage()
  * @property BaseElement|ElementalArea|$this $owner
  * @package DNADesign\Elemental\TopPage
+ * @method SiteTree TopPage()
  */
 class DataExtension extends BaseDataExtension
 {