No longer mucking with base64_encode and decode.

Author: dcarbone

src/Event/EventClient.php

@@ -50,8 +50,6 @@ public function fire(UserEvent $event, WriteOptions $writeOptions = null)
         if ('' !== ($payload = $event->getPayload()))
             $r->setBody($payload);
 
-        var_dump($payload);exit;
-
         list($duration, $response, $err) = $this->requireOK($this->doRequest($r));
         $wm = $this->buildWriteMeta($duration);
 
@@ -62,6 +60,9 @@ public function fire(UserEvent $event, WriteOptions $writeOptions = null)
         if ($err !== null)
             return [null, $wm, $err];
 
+        if (isset($data['Payload']))
+            $data['Payload'] = base64_decode($data['Payload']);
+
         return [new UserEvent($data), $wm, null];
     }
 
@@ -95,6 +96,9 @@ public function eventList($name = '', QueryOptions $queryOptions = null)
         $events = array();
         foreach($data as $event)
         {
+            if (isset($event['Payload']))
+                $event['Payload'] = base64_decode($event['Payload']);
+
             $events[] = new UserEvent($event);
         }
 

src/Event/UserEvent.php

@@ -25,26 +25,6 @@
  */
 class UserEvent extends AbstractDefinedCollection
 {
-    /**
-     * UserEvent constructor.
-     * @param array $data
-     */
-    public function __construct(array $data = array())
-    {
-        parent::__construct();
-        foreach($data as $k=>$v)
-        {
-            switch($k)
-            {
-                case 'Payload':
-                    $this->setPayload($v);
-                    break;
-                default:
-                    $this[$k] = $v;
-            }
-        }
-    }
-
     /**
      * @return array
      */
@@ -105,7 +85,7 @@ public function setName($name)
      */
     public function getPayload()
     {
-        return $this->_storage['Payload'];
+        return (string)$this->_storage['Payload'];
     }
 
     /**
@@ -119,14 +99,6 @@ public function setPayload($payload)
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getDecodedPayload()
-    {
-        return base64_decode((string)$this->_storage['Payload']);
-    }
-
     /**
      * @return string
      */

src/KV/KVClient.php

@@ -64,7 +64,12 @@ public function get($key, QueryOptions $queryOptions = null)
         if (null !== $err)
             return [null, $qm, $err];
 
-        return [new KVPair(reset($data)), $qm, null];
+        $data = $data[0];
+
+        if (isset($data['Value']))
+            $data['Value'] = base64_decode($data['Value']);
+
+        return [new KVPair($data), $qm, null];
     }
 
     /**
@@ -105,6 +110,9 @@ public function valueList($prefix, QueryOptions $queryOptions = null)
         $kvPairs = array();
         foreach($data as $v)
         {
+            if (isset($v['Value']))
+                $v['Value'] = base64_decode($v['Value']);
+
             $kvp = new KVPair($v);
             $kvPairs[$kvp->getKey()] = $kvp;
         }

src/KV/KVPair.php

@@ -91,14 +91,6 @@ public function setValue($value)
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getDecodedValue()
-    {
-        return base64_decode((string)$this['Value']);
-    }
-
     /**
      * @return int
      */