Scalars return in array, and can be prefixed

Author: Alaa Sarhan

src/Flatten.php

@@ -1,14 +1,14 @@
 <?php
 namespace Sarhan;
 
+/**
+ * @author Alaa Sarhan <sarhan.alaa@gmail.com>
+ * @license LGPL
+ */
 class Flatten
 {
     public static function flatten($var, $separator = '.', $prefix = '')
     {
-        if (!self::canTraverse($var)) {
-            return $var;
-        }
-        
         $flattened = [];
         foreach (self::flattenGenerator($var, $separator, $prefix) as $key => $value) {
             $flattened[$key] = $value;

test/FlattenTest.php

@@ -8,12 +8,12 @@ class FlattenTest extends TestCase
     public function scalarProvider()
     {
         return [
-            [ null, null ],
-            [ '', '' ],
-            [ 0, 0 ],
-            [ 3.14, 3.14 ],
-            [ 'test', 'test' ],
-            [ false, false ]
+            [ null, ['' => null] ],
+            [ '', ['' => ''] ],
+            [ 0, ['' => 0] ],
+            [ 3.14, ['' => 3.14] ],
+            [ 'test', ['' => 'test'] ],
+            [ false, ['' => false] ]
         ];
     }
 
@@ -28,6 +28,29 @@ public function testFlattenScalar($input, $expectedOutput)
         $this->assertEquals($expectedOutput, $output);
     }
 
+    public function scalarSeparatorPrefixProvider()
+    {
+        return [
+            [ null, '-', ':', [':' => null] ],
+            [ '', '', '/', ['/' => ''] ],
+            [ 0, '.', 'global', ['global' => 0] ],
+            [ 3.14, '', 'local', ['local' => 3.14] ],
+            [ 'test', 'sep', '', ['' => 'test'] ],
+            [ false, '', '_', ['_' => false] ]
+        ];
+    }
+    
+    /**
+     * @covers Flatten::flatten
+     * @dataProvider scalarSeparatorPrefixProvider
+     */
+    public function testFlattenScalarWithSeparatorAndPrefix($var, $separator, $prefix, $expectedOutput)
+    {
+        $output = Flatten::flatten($var, $separator, $prefix);
+        
+        $this->assertEquals($expectedOutput, $output);
+    }
+    
     public function arraysProvider()
     {
         return [