move Constants to Helpers directory to reduce clutter in MsgApi direc…

…tory
pavarnos · Aug 14, 2018 · bb06ba8 · bb06ba8
1 parent 149200b
commit bb06ba8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/src/Threema/Console/Symfony/AbstractLocalCommand.php b/src/Threema/Console/Symfony/AbstractLocalCommand.php
@@ -14,9 +14,9 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Threema\MsgApi\ConnectionFactory;
-use Threema\MsgApi\Constants;
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Exceptions\InvalidArgumentException;
+use Threema\MsgApi\Helpers\Constants;
 
 abstract class AbstractLocalCommand extends Command
 {

diff --git a/src/Threema/Console/Symfony/AbstractNetworkedCommand.php b/src/Threema/Console/Symfony/AbstractNetworkedCommand.php
@@ -13,9 +13,9 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\Constants;
 use Threema\MsgApi\Exceptions\Exception;
 use Threema\MsgApi\Exceptions\InvalidArgumentException;
+use Threema\MsgApi\Helpers\Constants;
 use Threema\MsgApi\Response\Response;
 
 abstract class AbstractNetworkedCommand extends AbstractLocalCommand

diff --git a/src/Threema/Console/Symfony/VersionCommand.php b/src/Threema/Console/Symfony/VersionCommand.php
@@ -13,7 +13,7 @@
 use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Threema\MsgApi\Constants;
+use Threema\MsgApi\Helpers\Constants;
 
 class VersionCommand extends AbstractLocalCommand
 {

diff --git a/src/Threema/MsgApi/Constants.php → src/Threema/MsgApi/Helpers/Constants.php b/src/Threema/MsgApi/Constants.php → src/Threema/MsgApi/Helpers/Constants.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi;
+namespace Threema\MsgApi\Helpers;
 
 final class Constants
 {

diff --git a/src/Threema/MsgApi/Helpers/KeyPrefix.php b/src/Threema/MsgApi/Helpers/KeyPrefix.php
@@ -8,8 +8,6 @@
 
 namespace Threema\MsgApi\Helpers;
 
-use Threema\MsgApi\Constants;
-
 class KeyPrefix
 {
  /**

diff --git a/src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php b/src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php
@@ -8,12 +8,12 @@
 
 namespace Threema\MsgApi\HttpDriver;
 
-use Threema\MsgApi\Request\RequestInterface;
-use Threema\MsgApi\Request\JsonRequestInterface;
-use Threema\MsgApi\Request\MultiPartRequestInterface;
-use Threema\MsgApi\Constants;
 use Threema\MsgApi\Exceptions\HttpException;
+use Threema\MsgApi\Helpers\Constants;
 use Threema\MsgApi\Helpers\Url;
+use Threema\MsgApi\Request\JsonRequestInterface;
+use Threema\MsgApi\Request\MultiPartRequestInterface;
+use Threema\MsgApi\Request\RequestInterface;
 use Threema\MsgApi\Response\Response;
 
 /**

diff --git a/tests/Threema/Console/Symfony/DerivePublicKeyCommandTest.php b/tests/Threema/Console/Symfony/DerivePublicKeyCommandTest.php
@@ -12,7 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Threema\MsgApi\ConnectionFactory;
-use Threema\MsgApi\Constants;
+use Threema\MsgApi\Helpers\Constants;
 
 class DerivePublicKeyCommandTest extends TestCase
 {

diff --git a/tests/Threema/Console/Symfony/EncryptDecryptTest.php b/tests/Threema/Console/Symfony/EncryptDecryptTest.php
@@ -12,7 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Threema\MsgApi\ConnectionFactory;
-use Threema\MsgApi\Constants;
+use Threema\MsgApi\Helpers\Constants;
 use Threema\MsgApi\Helpers\KeyPair;
 
 class EncryptDecryptTest extends TestCase