Remove generator for php 5.4 compatibility

ericnorris · Mar 21, 2016 · 29ab229 · 29ab229
1 parent 66306f8
commit 29ab229
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tests/MultibyteStringStreamTest.php b/tests/MultibyteStringStreamTest.php
@@ -135,7 +135,7 @@ public function testCloseInvalidData() {
         $this->assertSame(
             $expected,
             $result,
-            'Did not handle partial multibyte character'
+            'Did not correctly flush remaining invalid data'
         );
     }
 
@@ -163,9 +163,12 @@ public function testCharsetConversion($unicode_string,
     }
 
     public function unicodeMappingProvider() {
-        foreach (glob(__DIR__ . '/data/*.ucm') as $ucm_filename) {
-            yield basename($ucm_filename) => $this->parseUcmFile($ucm_filename);
-        }
+        $ucm_files = glob(__DIR__ . '/data/*.ucm');
+
+        return array_combine($ucm_files, array_map(
+            array($this, 'parseUcmFile'),
+            $ucm_files
+        ));
     }
 
     public function parseUcmFile($charset_filepath) {