[mms] Horde_Stream#search() now supports multiple characters in searc…

…h string.
horde · Sep 25, 2013 · 5748a6d · 5748a6d
1 parent 20b3b43
commit 5748a6d
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 20 deletions.
diff --git a/framework/Stream/lib/Horde/Stream.php b/framework/Stream/lib/Horde/Stream.php
@@ -212,40 +212,55 @@ public function peek($length = 1)
     }
 
     /**
-     * Search for a character and return its position.
+     * Search for character(s) and return its position.
      *
-     * @param string $char      The character to search for.
+     * @param string $char      The character to search for. As of 1.4.0,
+     *                          $char can be a multi-character string.
      * @param boolean $reverse  Do a reverse search?
      * @param boolean $reset    Reset the pointer to the original position?
      *
-     * @return mixed  The position (integer), or null if character not found.
+     * @return mixed  The start position of the search string (integer), or
+     *                null if character not found.
      */
     public function search($char, $reverse = false, $reset = true)
     {
         $found_pos = null;
 
-        if (strlen($char)) {
-            $pos = $this->pos();
-
-            if ($reverse) {
-                for ($i = $pos - 1; $i >= 0; --$i) {
-                    $this->seek($i, false);
-                    if ($this->getChar() == $char) {
-                        $found_pos = $i;
-                        break;
+        if ($len = strlen($char)) {
+            do {
+                $pos = $this->pos();
+
+                if ($reverse) {
+                    for ($i = $pos - 1; $i >= 0; --$i) {
+                        $this->seek($i, false);
+                        $c = $this->peek();
+                        if ($c == substr($char, 0, strlen($c))) {
+                            $found_pos = $i;
+                            break;
+                        }
                     }
-                }
-            } else {
-                while (($c = $this->getChar()) !== false) {
-                    if ($c == $char) {
-                        $found_pos = $this->pos() - 1;
-                        break;
+                } else {
+                    while (($c = $this->getChar()) !== false) {
+                        if ($c == substr($char, 0, strlen($c))) {
+                            $found_pos = $this->pos() - strlen($c);
+                            break;
+                        }
                     }
                 }
-            }
+
+                if (is_null($found_pos) ||
+                    ($len == 1) ||
+                    ($this->getString($found_pos, $found_pos + $len - 1) == $char)) {
+                    break;
+                }
+
+                $this->seek($found_pos + ($reverse ? 0 : 1), false);
+                $found_pos = null;
+            } while (true);
 
             $this->seek(
-                ($reset || is_null($found_pos)) ? $pos : $found_pos, false
+                ($reset || is_null($found_pos)) ? $pos : $found_pos,
+                false
             );
         }
 

diff --git a/framework/Stream/package.xml b/framework/Stream/package.xml
@@ -22,6 +22,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Horde_Stream#search() now supports multiple characters in search string.
 * [mms] Add ability to get UTF-8 character length of stream from Horde_Stream#length().
 * [mms] Add length argument to peek().
 * [mms] Add Horde_Stream#close().
@@ -203,6 +204,7 @@
    <date>2013-08-05</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Horde_Stream#search() now supports multiple characters in search string.
 * [mms] Add ability to get UTF-8 character length of stream from Horde_Stream#length().
 * [mms] Add length argument to peek().
 * [mms] Add Horde_Stream#close().

diff --git a/framework/Stream/test/Horde/Stream/TempTest.php b/framework/Stream/test/Horde/Stream/TempTest.php
@@ -273,6 +273,15 @@ public function testSearch()
             3,
             $stream->pos()
         );
+
+        $stream->rewind();
+
+        $this->assertEquals(
+            3,
+            $stream->search('34')
+        );
+
+        $this->assertNull($stream->search('35'));
     }
 
     public function testAddMethod()
@@ -438,6 +447,20 @@ public function testUtf8Parsing()
             'A',
             $stream->getChar()
         );
+
+        $stream->rewind();
+
+        $this->assertEquals(
+            1,
+            $stream->search('ön')
+        );
+
+        $stream->end();
+
+        $this->assertEquals(
+            4,
+            $stream->search('ön', true)
+        );
     }
 
 }