Merge branch 'dev'

Author: AmitBu

src/EventManager.php

@@ -45,10 +45,7 @@ public function buildEvent(EventOptions $opts)
         $reqCtx = new RequestContext($cid, $vid, $fp, $ip, $remoteIp, $method, $url, $headers);
 
         $properties = $opts->properties;
-        $timestamp = null;
-        try {
-            $timestamp = $opts->timestamp ? $opts->timestamp : (new DateTime("now", new DateTimeZone("UTC")))->format(DateTime::ISO8601);
-        } catch (\Exception $e) {}
+        $timestamp =  $opts->timestamp ? $opts->timestamp : date('Y-m-d\TH:i:s.Z\Z', time());
 
         $event = new SecurenativeEvent($rid, $eventType, $userId, $userTraits, $reqCtx, $properties, $timestamp);
 

src/Models/EventOptions.php

@@ -43,7 +43,7 @@ private function set($data){
             $this->userTraits = new UserTraits(
                 isset($userTraits[self::EVENT_USER_TRAITS_NAME]) ? $userTraits[self::EVENT_USER_TRAITS_NAME] : '',
                 isset($userTraits[self::EVENT_USER_TRAITS_EMAIL]) ? $userTraits[self::EVENT_USER_TRAITS_EMAIL] : '',
-                isset($userTraits[self::EVENT_USER_TRAITS_CREATED_AT]) ? $userTraits[self::EVENT_USER_TRAITS_CREATED_AT] : ''
+                isset($userTraits[self::EVENT_USER_TRAITS_CREATED_AT]) ? $userTraits[self::EVENT_USER_TRAITS_CREATED_AT] : null
             );
         }
 
@@ -60,11 +60,11 @@ private function set($data){
         }
 
 
-        if (count($data[self::EVENT_PROPERTIES]) > self::MAX_EVENT_PROPERTIES_COUNT) {
+        if (isset($data[self::EVENT_PROPERTIES]) && count($data[self::EVENT_PROPERTIES]) > self::MAX_EVENT_PROPERTIES_COUNT) {
             throw new \Exception('You can only set up to ' . self::MAX_EVENT_PROPERTIES_COUNT . ' custom properties');
         }
 
-        $this->properties = isset($data[self::EVENT_PROPERTIES]) ? $data[self::EVENT_PROPERTIES] : null;
+        $this->properties = isset($data[self::EVENT_PROPERTIES]) && count($data[self::EVENT_PROPERTIES]) > 0 ? $data[self::EVENT_PROPERTIES] : null;
         $this->timestamp = isset($data[self::EVENT_TIMESTAMP]) ? $data[self::EVENT_TIMESTAMP] : null;
     }
 }

src/Models/SecurenativeEvent.php

@@ -9,7 +9,7 @@ class SecurenativeEvent
   public $userId;
   public $userTraits;
   public $request;
-  public $properties = array();
+  public $properties;
   public $timestamp;
 
     /**
@@ -22,7 +22,7 @@ class SecurenativeEvent
      * @param array $properties
      * @param $timestamp
      */
-    public function __construct($rid, $eventType, $userId, $userTraits, $request, array $properties, $timestamp)
+    public function __construct($rid, $eventType, $userId, $userTraits, $request, $properties, $timestamp)
     {
         $this->rid = $rid;
         $this->eventType = $eventType;