Fix : MapAdapter to serialize Long keys as integer instead of string

src/main/java/com/marcospassos/phpserializer/Writer.java

@@ -3,6 +3,7 @@
 
 import java.lang.reflect.Modifier;
 import java.nio.charset.Charset;
+
 import com.marcospassos.phpserializer.state.FinishedState;
 import com.marcospassos.phpserializer.state.WritingValueState;
 
@@ -356,6 +357,20 @@ public void writeKey(int index)
         buffer.append(';');
     }
 
+    /**
+     * Writes the key of an array entry to the buffer.
+     *
+     * @param index The key of the array entry.
+     */
+    public void writeKey(long index)
+    {
+        setState(state.key());
+
+        buffer.append("i:");
+        buffer.append(index);
+        buffer.append(';');
+    }
+
     /**
      * Writes the key of an array entry to the buffer.
      *

src/main/java/com/marcospassos/phpserializer/adapter/MapAdapter.java

@@ -1,6 +1,7 @@
 package com.marcospassos.phpserializer.adapter;
 
 import java.util.Map;
+
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.TypeAdapter;
 import com.marcospassos.phpserializer.Writer;
@@ -27,7 +28,9 @@ public void write(Map<K, V> map, Writer writer, Context context)
             Object key = entry.getKey();
 
             if (key instanceof Integer) {
-                writer.writeKey((Integer) key);
+                writer.writeKey((int) key);
+            } else if (key instanceof Long) {
+                writer.writeKey((long) key);
             } else {
                 writer.writeKey(key.toString());
             }

src/test/java/com/marcospassos/phpserializer/adapter/MapAdapterTest.java

@@ -2,14 +2,15 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import com.marcospassos.phpserializer.Context;
-import com.marcospassos.phpserializer.Writer;
+
 import org.junit.Test;
 import org.mockito.InOrder;
-
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 
+import com.marcospassos.phpserializer.Context;
+import com.marcospassos.phpserializer.Writer;
+
 /**
  * @author Marcos Passos
  * @since 1.0
@@ -26,14 +27,15 @@ public void write() throws Exception
         map.put(1, "a");
         map.put("2", "b");
         map.put(3, "c");
+        map.put(4L, "d");
 
         // The verify check is split by entries once HashMap is an unordered map
 
         adapter.write(map, writer, context);
 
         InOrder order = inOrder(writer, context);
 
-        order.verify(writer).writeArrayStart(3);
+        order.verify(writer).writeArrayStart(4);
 
         InOrder first = inOrder(writer, context);
 
@@ -50,6 +52,11 @@ public void write() throws Exception
         third.verify(writer).writeKey(3);
         third.verify(context).write("c", writer);
 
+        InOrder fourth = inOrder(writer, context);
+
+        fourth.verify(writer).writeKey(4L);
+        fourth.verify(context).write("d", writer);
+
         order.verify(writer).writeArrayEnd();
 
         order.verifyNoMoreInteractions();