Adjust grapheme_strpos behavior for PHP versions

nicolas-grekas · nicolas-grekas · commit 30ec6451aec7 · 2016-05-18T15:57:10.000+02:00
diff --git a/src/Patchwork/PHP/Shim/Intl.php b/src/Patchwork/PHP/Shim/Intl.php
@@ -213,7 +213,11 @@ private static function grapheme_position($s, $needle, $offset, $mode)
         if ($offset > 0) {
             $s = self::grapheme_substr($s, $offset);
         } elseif ($offset < 0) {
-            $offset = 0;
+            if (defined('HHVM_VERSION_ID') || PHP_VERSION_ID < 50535 || (50600 <= PHP_VERSION_ID && PHP_VERSION_ID < 50621) || (70000 <= PHP_VERSION_ID && PHP_VERSION_ID < 70006)) {
+                $offset = 0;
+            } else {
+                return false;
+            }
         }
 
         switch ($mode) {
diff --git a/tests/PHP/Shim/IntlTest.php b/tests/PHP/Shim/IntlTest.php
@@ -122,7 +122,11 @@ public function testGrapheme_strpos()
         $this->assertSame(false, grapheme_strpos('abc', ''));
         $this->assertSame(false, grapheme_strpos('abc', 'd'));
         $this->assertSame(false, grapheme_strpos('abc', 'a', 3));
-        $this->assertSame(0, grapheme_strpos('abc', 'a', 0));
+        if (defined('HHVM_VERSION_ID') || PHP_VERSION_ID < 50535 || (PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50621) || (PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70006)) {
+            $this->assertSame(0, grapheme_strpos('abc', 'a', -1));
+        } else {
+            $this->assertFalse(grapheme_strpos('abc', 'a', -1));
+        }
         $this->assertSame(1, grapheme_strpos('한국어', '국'));
         $this->assertSame(3, grapheme_stripos('DÉJÀ', 'à'));
         $this->assertSame(false, grapheme_strrpos('한국어', ''));
@@ -132,7 +136,11 @@ public function testGrapheme_strpos()
         $this->assertSame(false, p::grapheme_strpos('abc', ''));
         $this->assertSame(false, p::grapheme_strpos('abc', 'd'));
         $this->assertSame(false, p::grapheme_strpos('abc', 'a', 3));
-        $this->assertSame(0, p::grapheme_strpos('abc', 'a', -1));
+        if (defined('HHVM_VERSION_ID') || PHP_VERSION_ID < 50535 || (50600 <= PHP_VERSION_ID && PHP_VERSION_ID < 50621) || (70000 <= PHP_VERSION_ID && PHP_VERSION_ID < 70006)) {
+            $this->assertSame(0, p::grapheme_strpos('abc', 'a', -1));
+        } else {
+            $this->assertFalse(p::grapheme_strpos('abc', 'a', -1));
+        }
         $this->assertSame(1, p::grapheme_strpos('한국어', '국'));
         $this->assertSame(3, p::grapheme_stripos('DÉJÀ', 'à'));
         $this->assertSame(false, p::grapheme_strrpos('한국어', ''));
