From dac40286b56c6b80b7c6c965315f8c711f6eac31 Mon Sep 17 00:00:00 2001
From: Steve Pavarno <pavarnos@gmail.com>
Date: Tue, 14 Aug 2018 15:53:52 +1200
Subject: [PATCH] move remaining files from Core to Helpers folder

---
 src/Threema/MsgApi/Encryptor/AbstractEncryptor.php  | 2 +-
 src/Threema/{Core => MsgApi/Helpers}/AssocArray.php | 2 +-
 src/Threema/{Core => MsgApi/Helpers}/Url.php        | 2 +-
 src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/Threema/{Core => MsgApi/Helpers}/AssocArray.php (97%)
 rename src/Threema/{Core => MsgApi/Helpers}/Url.php (98%)

diff --git a/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php b/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
index a12a4c4..2eb0e52 100644
--- a/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
+++ b/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
@@ -6,11 +6,11 @@
 
 namespace Threema\MsgApi\Encryptor;
 
-use Threema\Core\AssocArray;
 use Threema\MsgApi\Commands\Results\UploadFileResult;
 use Threema\MsgApi\Exceptions\BadMessageException;
 use Threema\MsgApi\Exceptions\DecryptionFailedException;
 use Threema\MsgApi\Exceptions\UnsupportedMessageTypeException;
+use Threema\MsgApi\Helpers\AssocArray;
 use Threema\MsgApi\Helpers\EncryptResult;
 use Threema\MsgApi\Helpers\FileAnalysisResult;
 use Threema\MsgApi\Helpers\KeyPair;
diff --git a/src/Threema/Core/AssocArray.php b/src/Threema/MsgApi/Helpers/AssocArray.php
similarity index 97%
rename from src/Threema/Core/AssocArray.php
rename to src/Threema/MsgApi/Helpers/AssocArray.php
index b064fb1..e31d6a4 100644
--- a/src/Threema/Core/AssocArray.php
+++ b/src/Threema/MsgApi/Helpers/AssocArray.php
@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
-namespace Threema\Core;
+namespace Threema\MsgApi\Helpers;
 
 use Threema\MsgApi\Exceptions\Exception;
 
diff --git a/src/Threema/Core/Url.php b/src/Threema/MsgApi/Helpers/Url.php
similarity index 98%
rename from src/Threema/Core/Url.php
rename to src/Threema/MsgApi/Helpers/Url.php
index 1514c7b..337d77a 100644
--- a/src/Threema/Core/Url.php
+++ b/src/Threema/MsgApi/Helpers/Url.php
@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
-namespace Threema\Core;
+namespace Threema\MsgApi\Helpers;
 
 class Url
 {
diff --git a/src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php b/src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php
index a0582ed..ded0d54 100644
--- a/src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php
+++ b/src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php
@@ -8,13 +8,13 @@
 
 namespace Threema\MsgApi\HttpDriver;
 
-use Threema\Core\Url;
 use Threema\MsgApi\Commands\CommandInterface;
 use Threema\MsgApi\Commands\JsonCommandInterface;
 use Threema\MsgApi\Commands\MultiPartCommandInterface;
 use Threema\MsgApi\Commands\Results\Result;
 use Threema\MsgApi\Constants;
 use Threema\MsgApi\Exceptions\HttpException;
+use Threema\MsgApi\Helpers\Url;
 
 /**
  */