Change to doclean before update that you could add it back in update

function
pmvc-plugin · Aug 16, 2018 · 3660f5c · 3660f5c
1 parent 511b32f
commit 3660f5c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/dispatcher.php b/dispatcher.php
@@ -43,13 +43,11 @@ public function notify($state,$clean=null)
         $this->_notify($state.POST, $clean);
     }
 
-    private function _notify($state,$clean=null)
+    private function _notify($state, $clean=null)
     {
-        if(isset($this->_subjects[$state])){
+        if (isset($this->_subjects[$state])) {
+            $this->_subjects[$state]->setDoClean($clean);
             $this->_subjects[$state]->notify();
-            if($clean){
-                $this->_subjects[$state]->removeAll();
-            }
         }
     }
 

diff --git a/src/Subject.php b/src/Subject.php
@@ -15,6 +15,8 @@ class Subject implements SplSubject
     }
 
     private $_name;
+    private $_doClean;
+
     public function __construct($name)
     {
        $this->_name = $name; 
@@ -29,6 +31,9 @@ public function notify()
         while ($store->valid()) {
             $obj = $store->current();
             $store->next();
+            if ($this->_doClean) {
+                $store->detach($obj);
+            }
             $obj->update($this);
             if ($store->contains($obj)) {
                 $tmp->attach($obj);
@@ -44,6 +49,11 @@ public function getName()
         return $this->_name;
     }
 
+    public function setDoClean($bool)
+    {
+        $this->_doClean = $bool;
+    }
+
     private function _getThis(SplObserver $observer)
     {
         return \PMVC\get($observer, \PMVC\THIS, function() use($observer) { return $observer; });

diff --git a/test.php b/test.php
@@ -36,6 +36,36 @@ function testFireEvent()
         $dispatcher->notify($event);
     }
 
+    public function testFireWithoutClean()
+    {
+        $event = 'Test';
+        $dispatcher = PMVC\plug($this->_plug);
+
+        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')
+            ->setMethods(['on'.$event])
+            ->getMock();
+        $mockObserver->expects($this->once())
+           ->method('on'.$event);
+        $dispatcher->attach($mockObserver, $event);
+        $dispatcher->notify($event);
+        $this->assertTrue($dispatcher->contains($mockObserver, $event));
+    }
+
+    public function testFireWithClean()
+    {
+        $event = 'Test';
+        $dispatcher = PMVC\plug($this->_plug);
+
+        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')
+            ->setMethods(['on'.$event])
+            ->getMock();
+        $mockObserver->expects($this->once())
+           ->method('on'.$event);
+        $dispatcher->attach($mockObserver, $event);
+        $dispatcher->notify($event, true);
+        $this->assertFalse($dispatcher->contains($mockObserver, $event));
+    }
+
     function testFireEventBySetOption()
     {
         $key = 'foo';