Merge branch 'master' into correct-docblock-param-type-for-json

Author: GabrielAnca

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+#### Why?
+Why are you making this change?
+
+#### How?
+Technical details on your change

.travis.yml

@@ -1,7 +1,6 @@
 
 [![Code
-Climate](https://codeclimate.com/repos/537da4a7e30ba062b101be9c/badges/2aa25d4736f09f40282e/gpa.svg)](https://codeclimate.com/repos/537da4a7e30ba062b101be9c/feed) [![Build
-Status](https://travis-ci.org/intercom/intercom-php.svg?branch=master)](https://travis-ci.org/intercom/intercom-php)
+Climate](https://codeclimate.com/repos/537da4a7e30ba062b101be9c/badges/2aa25d4736f09f40282e/gpa.svg)](https://codeclimate.com/repos/537da4a7e30ba062b101be9c/feed) [![Circle CI](https://circleci.com/gh/intercom/intercom-php.png?style=badge)](https://circleci.com/gh/intercom/intercom-php)
 
 ## intercom-php
 
@@ -225,8 +224,10 @@ $client->segments->getSegments();
 
 /** View a segment */
 $client->segments->getSegment("58a707924f6651b07b94376c");
-```
 
+/** View a segment with count */
+$client->segments->getSegment("59c124f770e00fd819b9ce81", ["include_count"=>"true"]);
+```
 ## Events
 
 ```php

README.md

@@ -2,7 +2,7 @@
     "name": "intercom/intercom-php",
     "description": "Intercom API client built on top of Guzzle 6",
     "keywords": ["intercom", "intercom.io", "api", "guzzle"],
-    "license": "Apache Version 2",
+    "license": "Apache-2.0",
     "authors": [
         {
             "name": "Intercom Platform Team",

composer.json

@@ -90,18 +90,47 @@ public function scrollUsers($options = [])
     /**
      * Deletes a single User based on the Intercom ID.
      *
-     * @see    https://developers.intercom.com/reference#delete-a-user
+     * @see    https://developers.intercom.com/reference#archive-a-user
      * @param  string $id
      * @param  array  $options
      * @return mixed
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function deleteUser($id, $options = [])
+    public function archiveUser($id, $options = [])
     {
         $path = $this->userPath($id);
         return $this->client->delete($path, $options);
     }
 
+    /**
+     * Deletes a single User based on the Intercom ID.
+     *
+     * @see    https://developers.intercom.com/reference#archive-a-user
+     * @param  string $id
+     * @param  array  $options
+     * @return mixed
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function deleteUser($id, $options = [])
+    {
+        return $this->archiveUser($id, $options);
+    }
+
+    /**
+     * Permanently deletes a single User based on the Intercom ID.
+     *
+     * @see   https://developers.intercom.com/reference#delete-users
+     * @param string $id
+     * @return mixed
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function permanentlyDeleteUser($id)
+    {
+        return $this->client->post('user_delete_requests', [
+            'intercom_user_id' => $id
+        ]);
+    }
+
     /**
      * @param string $id
      * @return string

src/IntercomUsers.php

@@ -36,4 +36,31 @@ public function testUserGet()
         $users = new IntercomUsers($stub);
         $this->assertEquals('foo', $users->getUsers([]));
     }
+
+    public function testArchiveUser()
+    {
+        $stub = $this->getMockBuilder('Intercom\IntercomClient')->disableOriginalConstructor()->getMock();
+        $stub->method('delete')->willReturn('foo');
+
+        $users = new IntercomUsers($stub);
+        $this->assertEquals('foo', $users->archiveUser(''));
+    }
+
+    public function testDeleteUser()
+    {
+        $stub = $this->getMockBuilder('Intercom\IntercomClient')->disableOriginalConstructor()->getMock();
+        $stub->method('delete')->willReturn('foo');
+
+        $users = new IntercomUsers($stub);
+        $this->assertEquals('foo', $users->deleteUser(''));
+    }
+
+    public function testPermanentlyDeleteUser()
+    {
+        $stub = $this->getMockBuilder('Intercom\IntercomClient')->disableOriginalConstructor()->getMock();
+        $stub->method('post')->willReturn('foo');
+
+        $users = new IntercomUsers($stub);
+        $this->assertEquals('foo', $users->permanentlyDeleteUser(''));
+    }
 }