From a7308eddc1bf14caddfb708767a8d7e56007eb82 Mon Sep 17 00:00:00 2001
From: Lewis Phillips <lewis@vgd.uk.com>
Date: Thu, 15 Jun 2017 15:23:06 +0100
Subject: [PATCH 1/3] Adding restore commands

---
 readme.md                                    | 43 ++++++++++++++++++++
 src/Command/Content/File/RestoreFile.php     | 24 +++++++++++
 src/Command/Content/Folder/RestoreFolder.php | 22 ++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 src/Command/Content/File/RestoreFile.php
 create mode 100644 src/Command/Content/Folder/RestoreFolder.php

diff --git a/readme.md b/readme.md
index fccef3e..bdb29d6 100644
--- a/readme.md
+++ b/readme.md
@@ -302,6 +302,28 @@ if ($response instanceof SuccessResponse) {
 }
 ```
 
+
+#### Restore Folder Command
+
+✔ Extended Request
+
+```php
+<?php
+use AdammBalogh\Box\Command\Content;
+use AdammBalogh\Box\Factory\ResponseFactory;
+use AdammBalogh\Box\GuzzleHttp\Message\SuccessResponse;
+use AdammBalogh\Box\GuzzleHttp\Message\ErrorResponse;
+
+$command = new Content\Folder\RestoreFolder('folderId');
+$response = ResponseFactory::getResponse($contentClient, $command);
+
+if ($response instanceof SuccessResponse) {
+	# ...
+} elseif ($response instanceof ErrorResponse) {
+	# ...
+}
+```
+
 #### Get Folder Info Command
 
 ```php
@@ -449,6 +471,27 @@ if ($response instanceof SuccessResponse) {
 }
 ```
 
+#### Restore File Command
+
+✔ Extended Request
+
+```php
+<?php
+use AdammBalogh\Box\Command\Content;
+use AdammBalogh\Box\Factory\ResponseFactory;
+use AdammBalogh\Box\GuzzleHttp\Message\SuccessResponse;
+use AdammBalogh\Box\GuzzleHttp\Message\ErrorResponse;
+
+$command = new Content\File\RestoreFile('fileId');
+$response = ResponseFactory::getResponse($contentClient, $command);
+
+if ($response instanceof SuccessResponse) {
+	# ...
+} elseif ($response instanceof ErrorResponse) {
+	# ...
+}
+```
+
 #### Download File Command
 
 ✔ Extended Request
diff --git a/src/Command/Content/File/RestoreFile.php b/src/Command/Content/File/RestoreFile.php
new file mode 100644
index 0000000..190e5e8
--- /dev/null
+++ b/src/Command/Content/File/RestoreFile.php
@@ -0,0 +1,24 @@
+<?php namespace AdammBalogh\Box\Command\Content\File;
+
+use AdammBalogh\Box\Command\AbstractCommand;
+use AdammBalogh\Box\GuzzleHttp\Message\PostRequest;
+use AdammBalogh\Box\Request\ExtendedRequest;
+use GuzzleHttp\Post\PostBody;
+
+class RestoreFile extends AbstractCommand
+{
+
+    /**
+     * RestoreFile constructor.
+     * @param $fileId
+     * @param ExtendedRequest|null $extendedRequest
+     */
+    public function __construct($fileId, ExtendedRequest $extendedRequest = null)
+    {
+        $this->request = new PostRequest("files/{$fileId}");
+
+        if ($extendedRequest) {
+            $this->request->setRawJsonBody($extendedRequest->getPostBodyFields());
+        }
+    }
+}
diff --git a/src/Command/Content/Folder/RestoreFolder.php b/src/Command/Content/Folder/RestoreFolder.php
new file mode 100644
index 0000000..309b02c
--- /dev/null
+++ b/src/Command/Content/Folder/RestoreFolder.php
@@ -0,0 +1,22 @@
+<?php namespace AdammBalogh\Box\Command\Content\Folder;
+
+use AdammBalogh\Box\Command\AbstractCommand;
+use AdammBalogh\Box\GuzzleHttp\Message\PostRequest;
+use AdammBalogh\Box\Request\ExtendedRequest;
+use GuzzleHttp\Post\PostBody;
+
+class RestoreFolder extends AbstractCommand
+{
+    /**
+     * @param string $folderId
+     * @param ExtendedRequest|null $extendedRequest
+     */
+    public function __construct($folderId, ExtendedRequest $extendedRequest = null)
+    {
+        $this->request = new PostRequest("folders/{$folderId}");
+
+        if ($extendedRequest) {
+            $this->request->setRawJsonBody($extendedRequest->getPostBodyFields());
+        }
+    }
+}

From aa8941c48e67d7c45e25f12f4315b377feb73052 Mon Sep 17 00:00:00 2001
From: lewisvgd <lewis@vgd.uk.com>
Date: Fri, 13 Oct 2017 14:12:20 +0100
Subject: [PATCH 2/3] upping guzzle

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8614036..7208a71 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "guzzlehttp/guzzle": "~4.2.2",
+        "guzzlehttp/guzzle": "^5.3",
         "adammbalogh/key-value-store": "~0.5.1"
     },
     "require-dev": {

From da9335ee6d8ee793715ee831085018f5fdc07d3c Mon Sep 17 00:00:00 2001
From: lewisvgd <lewis@vgd.uk.com>
Date: Fri, 13 Oct 2017 14:15:50 +0100
Subject: [PATCH 3/3] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7208a71..c2dd36e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "guzzlehttp/guzzle": "^5.3",
+        "guzzlehttp/guzzle": "^5.3|^6.0",
         "adammbalogh/key-value-store": "~0.5.1"
     },
     "require-dev": {