fix tests for php 5.5.35/5.6.21/7.0.6

remicollet · remicollet · commit a06e40ae4912 · 2016-04-28T10:04:54.000+02:00
diff --git a/src/Patchwork/Utf8.php b/src/Patchwork/Utf8.php
@@ -235,7 +235,9 @@ public static function strlen($s)
     }
     public static function strpos($s, $needle, $offset = 0)
     {
-        return grapheme_strpos($s, $needle, $offset);
+        // ignore invalid negative offset to keep compatility
+        // with php < 5.5.35, < 5.6.21, < 7.0.6
+        return grapheme_strpos($s, $needle, $offset > 0 ? $offset : 0);
     }
     public static function strrpos($s, $needle, $offset = 0)
     {
diff --git a/tests/PHP/Shim/IntlTest.php b/tests/PHP/Shim/IntlTest.php
@@ -122,7 +122,7 @@ 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', -1));
+        $this->assertSame(0, grapheme_strpos('abc', 'a', 0));
         $this->assertSame(1, grapheme_strpos('한국어', '국'));
         $this->assertSame(3, grapheme_stripos('DÉJÀ', 'à'));
         $this->assertSame(false, grapheme_strrpos('한국어', ''));
diff --git a/tests/Utf8/HhvmTest.php b/tests/Utf8/HhvmTest.php
@@ -12,7 +12,8 @@ public function test1()
     public function test2()
     {
         // Negative offset are not allowed but native PHP silently casts them to zero
-        $this->assertSame(0, grapheme_strpos('abc', 'a', -1));
+        // Starting with 5.5.35, 5.6.21, 7.0.6, PHP refuse them
+        $this->assertSame(0, grapheme_strpos('abc', 'a', 0));
     }
 
     public function test3()

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,9 @@ public static function strlen($s)`
`235`	`235`	`}`
`236`	`236`	`public static function strpos($s, $needle, $offset = 0)`
`237`	`237`	`{`
`238`		`- return grapheme_strpos($s, $needle, $offset);`
	`238`	`+ // ignore invalid negative offset to keep compatility`
	`239`	`+ // with php < 5.5.35, < 5.6.21, < 7.0.6`
	`240`	`+ return grapheme_strpos($s, $needle, $offset > 0 ? $offset : 0);`
`239`	`241`	`}`
`240`	`242`	`public static function strrpos($s, $needle, $offset = 0)`
`241`	`243`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ public function test1()`
`12`	`12`	`public function test2()`
`13`	`13`	`{`
`14`	`14`	`// Negative offset are not allowed but native PHP silently casts them to zero`
`15`		`- $this->assertSame(0, grapheme_strpos('abc', 'a', -1));`
	`15`	`+ // Starting with 5.5.35, 5.6.21, 7.0.6, PHP refuse them`
	`16`	`+ $this->assertSame(0, grapheme_strpos('abc', 'a', 0));`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`public function test3()`