Merge "Fix 'Tags' padding to keep it farther from the edge and document the source...

[lhc/web/wiklou.git] / includes / Storage / MutableRevisionSlots.php

diff --git a/includes/Storage/MutableRevisionSlots.php b/includes/Storage/MutableRevisionSlots.php
index 2e675c8..df94964 100644 (file)
--- a/includes/Storage/MutableRevisionSlots.php
+++ b/includes/Storage/MutableRevisionSlots.php
@@ -60,8 +60,6 @@ class MutableRevisionSlots extends RevisionSlots {
         * Sets the given slot.
         * If a slot with the same role is already present, it is replaced.
         *
-        * @note This may cause the slot meta-data for the revision to be lazy-loaded.
-        *
         * @param SlotRecord $slot
         */
        public function setSlot( SlotRecord $slot ) {
@@ -74,10 +72,18 @@ class MutableRevisionSlots extends RevisionSlots {
        }
 
        /**
-        * Sets the content for the slot with the given role.
+        * Sets the given slot to an inherited version of $slot.
         * If a slot with the same role is already present, it is replaced.
         *
-        * @note This may cause the slot meta-data for the revision to be lazy-loaded.
+        * @param SlotRecord $slot
+        */
+       public function inheritSlot( SlotRecord $slot ) {
+               $this->setSlot( SlotRecord::newInherited( $slot ) );
+       }
+
+       /**
+        * Sets the content for the slot with the given role.
+        * If a slot with the same role is already present, it is replaced.
         *
         * @param string $role
         * @param Content $content
@@ -90,8 +96,6 @@ class MutableRevisionSlots extends RevisionSlots {
        /**
         * Remove the slot for the given role, discontinue the corresponding stream.
         *
-        * @note This may cause the slot meta-data for the revision to be lazy-loaded.
-        *
         * @param string $role
         */
        public function removeSlot( $role ) {
@@ -102,36 +106,4 @@ class MutableRevisionSlots extends RevisionSlots {
                unset( $this->slots[$role] );
        }
 
-       /**
-        * Return all slots that are not inherited.
-        *
-        * @note This may cause the slot meta-data for the revision to be lazy-loaded.
-        *
-        * @return SlotRecord[]
-        */
-       public function getTouchedSlots() {
-               return array_filter(
-                       $this->getSlots(),
-                       function ( SlotRecord $slot ) {
-                               return !$slot->isInherited();
-                       }
-               );
-       }
-
-       /**
-        * Return all slots that are inherited.
-        *
-        * @note This may cause the slot meta-data for the revision to be lazy-loaded.
-        *
-        * @return SlotRecord[]
-        */
-       public function getInheritedSlots() {
-               return array_filter(
-                       $this->getSlots(),
-                       function ( SlotRecord $slot ) {
-                               return $slot->isInherited();
-                       }
-               );
-       }
-
 }