override _clearItems

cargomedia · Aug 22, 2016 · 3065a1a · 3065a1a
1 parent 4c5e916
commit 3065a1a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/library/CM/Paging/Abstract.php b/library/CM/Paging/Abstract.php
@@ -295,14 +295,21 @@ public function setFlattenItems($state) {
         $this->_flattenItems = (bool) $state;
     }
 
-
     /**
      * @return bool
      */
     protected function _canContainUnprocessableItems() {
         return ($this->_getStalenessChance() != 0);
     }
 
+    protected function _clearItems() {
+        $this->_items = array();
+        $this->_itemsRaw = null;
+        $this->_itemsRawTree = null;
+        $this->_iteratorPosition = 0;
+        $this->_iteratorItems = null;
+    }
+
     /**
      * @return int Multiple of items per page to load from CM_PagingSource_Abstract
      */
@@ -381,14 +388,6 @@ private function _getItemOffset() {
         return (int) $this->_pageOffset * $this->_pageSize;
     }
 
-    private function _clearItems() {
-        $this->_items = array();
-        $this->_itemsRaw = null;
-        $this->_itemsRawTree = null;
-        $this->_iteratorPosition = 0;
-        $this->_iteratorItems = null;
-    }
-
     private function _clearCount() {
         $this->_count = null;
     }

diff --git a/library/CM/Paging/ModelAbstract.php b/library/CM/Paging/ModelAbstract.php
@@ -10,14 +10,8 @@ public function _change() {
         $this->_modelList = null;
     }
 
-    public function setPage($page, $size) {
-        parent::setPage($page, $size);
-        $this->_modelList = null;
-        return $this;
-    }
-
-    public function filter(Closure $filter) {
-        parent::filter($filter);
+    protected function _clearItems() {
+        parent::_clearItems();
         $this->_modelList = null;
     }
 

diff --git a/tests/library/CM/Paging/ModelAbstractTest.php b/tests/library/CM/Paging/ModelAbstractTest.php
@@ -61,7 +61,7 @@ public function testPagingVariableType() {
         }
     }
 
-    public function testPagedPaging() {
+    public function testModelListInvalidation() {
         CM_Config::get()->CM_Model_Abstract->types[CM_Paging_ModelAbstractTest_ModelMock::getTypeStatic()] = 'CM_Paging_ModelAbstractTest_ModelMock';
         CM_Config::get()->CM_Model_Abstract->types[CM_Paging_ModelAbstractTest_ModelMock2::getTypeStatic()] = 'CM_Paging_ModelAbstractTest_ModelMock2';
         $model1 = CM_Paging_ModelAbstractTest_ModelMock::create('foo');