Change 'getAll' flash methods to less terse naming

auraphp · Apr 11, 2016 · cc0f489 · cc0f489
1 parent 480bb94
commit cc0f489
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Segment.php b/src/Segment.php
@@ -174,7 +174,7 @@ public function getFlash($key, $alt = null)
      * @return mixed The flash values themselves.
      *
      */
-    public function getFlashAll($alt = array())
+    public function getAllCurrentFlash($alt = array())
     {
         $this->resumeSession();
         return isset($_SESSION[Session::FLASH_NOW][$this->name])
@@ -224,7 +224,7 @@ public function getFlashNext($key, $alt = null)
      * @return mixed The flash values themselves.
      *
      */
-    public function getFlashNextAll($alt = array())
+    public function getAllNextFlash($alt = array())
     {
         $this->resumeSession();
         return isset($_SESSION[Session::FLASH_NEXT][$this->name])

diff --git a/src/SegmentInterface.php b/src/SegmentInterface.php
@@ -92,7 +92,7 @@ public function getFlash($key, $alt = null);
      * @return mixed The flash values themselves.
      *
      */
-    public function getFlashAll($alt = array());
+    public function getAllCurrentFlash($alt = array());
 
     /**
      *
@@ -125,7 +125,7 @@ public function getFlashNext($key, $alt = null);
      * @return mixed The flash values themselves.
      *
      */
-    public function getFlashNextAll($alt = array());
+    public function getAllNextFlash($alt = array());
 
     /**
      *

diff --git a/tests/SegmentTest.php b/tests/SegmentTest.php
@@ -86,16 +86,16 @@ public function testFlash()
         $expect = 'bar';
         $expectAll = ['foo' => 'bar'];
         $this->assertSame($expect, $this->segment->getFlashNext('foo'));
-        $this->assertSame($expectAll, $this->segment->getFlashNextAll());
+        $this->assertSame($expectAll, $this->segment->getAllNextFlash());
         $this->assertNull($this->segment->getFlash('foo'));
-        $this->assertSame(array(), $this->segment->getFlashAll());
+        $this->assertSame(array(), $this->segment->getAllCurrentFlash());
 
         // set a value and make it available now
         $this->segment->setFlashNow('baz', 'dib');
         $expect = 'dib';
         $expectAll = ['baz' => 'dib'];
         $this->assertSame($expect, $this->segment->getFlash('baz'));
-        $this->assertSame($expectAll, $this->segment->getFlashAll());
+        $this->assertSame($expectAll, $this->segment->getAllCurrentFlash());
         $this->assertSame($expect, $this->segment->getFlashNext('baz'));
 
         // clear the next values