merge master in develop

Author: jhoudan

src/Conversation.php

@@ -14,12 +14,15 @@ public function __construct($json)
         //  var_dump($json);
         $response = json_decode($json->body);
 
-	$this->raw = $response->results;
+        $this->raw = $response->results;
         $this->replies = $response->results->replies;
         $this->action = $response->results->action;
         $this->nextActions = $response->results->next_actions;
+        $this->sentiment = $response->results->sentiment;
         $this->memory = $response->results->memory;
         $this->conversationToken = $response->results->conversation_token;
+        $this->language = $response->results->language;
+        $this->processing_language = $response->results->processing_language;
     }
 
     /**
@@ -92,6 +95,49 @@ public function memory($name = null)
         }
     }
 
+    /**
+     * SENTIMENT HELPERS
+     * Returns whether or not the response sentiment corresponds to the checked one
+     * @return {boolean}: true or false
+     */
+
+    public function isPositive()
+    {
+        return ($this->sentiment === Constants::SENTIMENT_POSITIVE);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isNeutral()
+    {
+        return ($this->sentiment === Constants::SENTIMENT_NEUTRAL);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isNegative()
+    {
+        return ($this->sentiment === Constants::SENTIMENT_NEGATIVE);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isVPositive()
+    {
+        return ($this->sentiment === Constants::SENTIMENT_VPOSITIVE);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isVNegative()
+    {
+        return ($this->sentiment === Constants::SENTIMENT_VNEGATIVE);
+    }
+
     /**
      * Merge the conversation memory with the one in parameter
      * Returns the memory updated

src/Response.php

@@ -15,11 +15,10 @@ class Response
      */
     public function __construct($json)
     {
-      var_dump($json);
         $response = json_decode($json->body);
         $this->entities = [];
 
-	$this->raw = $response->results;
+        $this->raw = $response->results;
         $this->act = $response->results->act;
         $this->type = $response->results->type;
         $this->source = $response->results->source;
@@ -34,6 +33,7 @@ public function __construct($json)
 
         $this->uuid = $response->results->uuid;
         $this->language = $response->results->language;
+        $this->processing_language = $response->results->processing_language;
         $this->version = $response->results->version;
         $this->timestamp = $response->results->timestamp;
         $this->status = $response->results->status;
@@ -82,11 +82,7 @@ public function all($name)
      */
     public function intent()
     {
-        if ($this->intents[0]) {
-            return ($this->intents[0]);
-        }
-
-        return (null);
+      return ($this->intents[0] || null);
     }
 
     /**