Browse Source

Merge pull request #3900 from mockey/php-stringmap

modified StringMap implementation for PHP
Simon Krajewski 10 years ago
parent
commit
672fb6d8a2
2 changed files with 1 additions and 5 deletions
  1. 1 1
      std/php/_std/haxe/ds/StringMap.hx
  2. 0 4
      tests/unit/src/unit/issues/Issue3462.hx

+ 1 - 1
std/php/_std/haxe/ds/StringMap.hx

@@ -53,7 +53,7 @@ package haxe.ds;
 	}
 
 	public function keys() : Iterator<String> {
-		return untyped __call__("new _hx_array_iterator", __call__("array_keys", h));
+		return untyped __call__("new _hx_array_iterator", __call__("array_map", "strval", __call__("array_keys", h)));
 	}
 
 	public function iterator() : Iterator<T> {

+ 0 - 4
tests/unit/src/unit/issues/Issue3462.hx

@@ -27,9 +27,7 @@ class Issue3462 extends Test
 
 		var keyCount:Int = 0;
 		for (k in d.keys()) {
-			#if !php // https://github.com/HaxeFoundation/haxe/issues/3898
 			f( keys.indexOf(k) == -1 ); // key missing from keys iterator
-			#end
 			keyCount++;
 		}
 		f(keyCount != keys.length); // keys missing
@@ -62,9 +60,7 @@ class Issue3462 extends Test
 		}
 		var keyCount:Int = 0;
 		for (k in d.keys()) {
-			#if !php // https://github.com/HaxeFoundation/haxe/issues/3898
 			f( keys.indexOf(k) == -1 ); // key missing from keys iterator
-			#end
 			keyCount++;
 		}
 		f( keyCount != keys.length ); // keys missing