From 496890357adabc9db37e58c8302650fbf5e517a3 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 24 Sep 2021 11:37:33 +0300
Subject: [PATCH] renaming

---
 application/Espo/Classes/AppInfo/Binding.php              | 2 +-
 application/Espo/Classes/AppInfo/Container.php            | 2 +-
 application/Espo/Classes/AppInfo/Jobs.php                 | 2 +-
 application/Espo/Classes/ConsoleCommands/Import.php       | 2 +-
 application/Espo/Core/Console/Command.php                 | 2 ++
 application/Espo/Core/Console/{ => Command}/Params.php    | 2 +-
 application/Espo/Core/Console/CommandManager.php          | 1 +
 application/Espo/Core/Console/Commands/AclCheck.php       | 2 +-
 application/Espo/Core/Console/Commands/AppInfo.php        | 2 +-
 application/Espo/Core/Console/Commands/AuthTokenCheck.php | 2 +-
 application/Espo/Core/Console/Commands/ClearCache.php     | 4 ++--
 application/Espo/Core/Console/Commands/Extension.php      | 2 +-
 application/Espo/Core/Console/Commands/Help.php           | 2 +-
 application/Espo/Core/Console/Commands/Rebuild.php        | 2 +-
 application/Espo/Core/Console/Commands/RunJob.php         | 2 +-
 application/Espo/Core/Console/Commands/SetPassword.php    | 2 +-
 application/Espo/Core/Console/Commands/Upgrade.php        | 2 +-
 application/Espo/Core/Console/Commands/UpgradeStep.php    | 2 +-
 application/Espo/Core/Console/Commands/Version.php        | 2 +-
 tests/unit/Espo/Core/Console/CommandManagerTest.php       | 2 +-
 tests/unit/Espo/Core/Console/ParamsTest.php               | 2 +-
 21 files changed, 23 insertions(+), 20 deletions(-)
 rename application/Espo/Core/Console/{ => Command}/Params.php (99%)

diff --git a/application/Espo/Classes/AppInfo/Binding.php b/application/Espo/Classes/AppInfo/Binding.php
index 4edc9503c1..994c4f95ad 100644
--- a/application/Espo/Classes/AppInfo/Binding.php
+++ b/application/Espo/Classes/AppInfo/Binding.php
@@ -33,7 +33,7 @@ use Espo\Core\{
     Utils\Module,
     Binding\EspoBindingLoader,
     Binding\Binding as BindingItem,
-    Console\Params,
+    Console\Command\Params,
 };
 
 class Binding
diff --git a/application/Espo/Classes/AppInfo/Container.php b/application/Espo/Classes/AppInfo/Container.php
index ee2ee924fd..20332330d9 100644
--- a/application/Espo/Classes/AppInfo/Container.php
+++ b/application/Espo/Classes/AppInfo/Container.php
@@ -32,7 +32,7 @@ namespace Espo\Classes\AppInfo;
 use Espo\Core\{
     Container as ContainerService,
     Utils\Metadata,
-    Console\Params,
+    Console\Command\Params,
 };
 
 class Container
diff --git a/application/Espo/Classes/AppInfo/Jobs.php b/application/Espo/Classes/AppInfo/Jobs.php
index 4cdb93462b..46940f3c1f 100644
--- a/application/Espo/Classes/AppInfo/Jobs.php
+++ b/application/Espo/Classes/AppInfo/Jobs.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\AppInfo;
 
-use Espo\Core\Console\Params;
+use Espo\Core\Console\Command\Params;
 use Espo\Core\Utils\ClassFinder;
 use Espo\Core\Job\MetadataProvider;
 
diff --git a/application/Espo/Classes/ConsoleCommands/Import.php b/application/Espo/Classes/ConsoleCommands/Import.php
index a2c5d7efb9..9c7c2d2b18 100644
--- a/application/Espo/Classes/ConsoleCommands/Import.php
+++ b/application/Espo/Classes/ConsoleCommands/Import.php
@@ -33,7 +33,7 @@ use Espo\Tools\Import\Service;
 
 use Espo\Core\{
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Command.php b/application/Espo/Core/Console/Command.php
index ddc0084fa2..0aba0d3489 100644
--- a/application/Espo/Core/Console/Command.php
+++ b/application/Espo/Core/Console/Command.php
@@ -29,6 +29,8 @@
 
 namespace Espo\Core\Console;
 
+use Espo\Core\Console\Command\Params;
+
 /**
  * A command.
  */
diff --git a/application/Espo/Core/Console/Params.php b/application/Espo/Core/Console/Command/Params.php
similarity index 99%
rename from application/Espo/Core/Console/Params.php
rename to application/Espo/Core/Console/Command/Params.php
index dfef14cfde..210c39f895 100644
--- a/application/Espo/Core/Console/Params.php
+++ b/application/Espo/Core/Console/Command/Params.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Console;
+namespace Espo\Core\Console\Command;
 
 use Espo\Core\Utils\Util;
 
diff --git a/application/Espo/Core/Console/CommandManager.php b/application/Espo/Core/Console/CommandManager.php
index f1f7251f8f..4dd3ad05d9 100644
--- a/application/Espo/Core/Console/CommandManager.php
+++ b/application/Espo/Core/Console/CommandManager.php
@@ -34,6 +34,7 @@ use Espo\Core\Utils\Metadata;
 use Espo\Core\Utils\Util;
 use Espo\Core\Console\Exceptions\CommandNotSpecified;
 use Espo\Core\Console\Exceptions\CommandNotFound;
+use Espo\Core\Console\Command\Params;
 
 /**
  * Processes console commands.
diff --git a/application/Espo/Core/Console/Commands/AclCheck.php b/application/Espo/Core/Console/Commands/AclCheck.php
index 04d853f165..02c26fe3ad 100644
--- a/application/Espo/Core/Console/Commands/AclCheck.php
+++ b/application/Espo/Core/Console/Commands/AclCheck.php
@@ -33,7 +33,7 @@ use Espo\Core\{
     Portal\Application as PortalApplication,
     Container,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/AppInfo.php b/application/Espo/Core/Console/Commands/AppInfo.php
index 19ee41ed48..644e6a7f9d 100644
--- a/application/Espo/Core/Console/Commands/AppInfo.php
+++ b/application/Espo/Core/Console/Commands/AppInfo.php
@@ -33,7 +33,7 @@ use Espo\Core\{
     InjectableFactory,
     Utils\File\Manager as FileManager,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/AuthTokenCheck.php b/application/Espo/Core/Console/Commands/AuthTokenCheck.php
index 361f1007ec..0b8019e639 100644
--- a/application/Espo/Core/Console/Commands/AuthTokenCheck.php
+++ b/application/Espo/Core/Console/Commands/AuthTokenCheck.php
@@ -33,7 +33,7 @@ use Espo\Core\{
     ORM\EntityManager,
     Authentication\AuthToken\AuthTokenManager,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/ClearCache.php b/application/Espo/Core/Console/Commands/ClearCache.php
index 575170a9a7..b5617bd2bd 100644
--- a/application/Espo/Core/Console/Commands/ClearCache.php
+++ b/application/Espo/Core/Console/Commands/ClearCache.php
@@ -32,13 +32,13 @@ namespace Espo\Core\Console\Commands;
 use Espo\Core\{
     DataManager,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
 class ClearCache implements Command
 {
-    protected $dataManager;
+    private $dataManager;
 
     public function __construct(DataManager $dataManager)
     {
diff --git a/application/Espo/Core/Console/Commands/Extension.php b/application/Espo/Core/Console/Commands/Extension.php
index 027e10591f..9781047630 100644
--- a/application/Espo/Core/Console/Commands/Extension.php
+++ b/application/Espo/Core/Console/Commands/Extension.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Console\Commands;
 
 use Espo\Core\Console\Command;
-use Espo\Core\Console\Params;
+use Espo\Core\Console\Command\Params;
 use Espo\Core\Console\IO;
 
 use Espo\ORM\EntityManager;
diff --git a/application/Espo/Core/Console/Commands/Help.php b/application/Espo/Core/Console/Commands/Help.php
index 90dd0e4ecc..514d5637c7 100644
--- a/application/Espo/Core/Console/Commands/Help.php
+++ b/application/Espo/Core/Console/Commands/Help.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Console\Commands;
 
 use Espo\Core\Console\Command;
-use Espo\Core\Console\Params;
+use Espo\Core\Console\Command\Params;
 use Espo\Core\Console\IO;
 
 use Espo\Core\Utils\Metadata;
diff --git a/application/Espo/Core/Console/Commands/Rebuild.php b/application/Espo/Core/Console/Commands/Rebuild.php
index 7ffd7217eb..fbeccb1289 100644
--- a/application/Espo/Core/Console/Commands/Rebuild.php
+++ b/application/Espo/Core/Console/Commands/Rebuild.php
@@ -32,7 +32,7 @@ namespace Espo\Core\Console\Commands;
 use Espo\Core\{
     DataManager,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/RunJob.php b/application/Espo/Core/Console/Commands/RunJob.php
index b9e2b77b10..123fc2651f 100644
--- a/application/Espo/Core/Console/Commands/RunJob.php
+++ b/application/Espo/Core/Console/Commands/RunJob.php
@@ -31,7 +31,7 @@ namespace Espo\Core\Console\Commands;
 
 use Espo\Core\{
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/SetPassword.php b/application/Espo/Core/Console/Commands/SetPassword.php
index 65a41d6b08..d2d4858555 100644
--- a/application/Espo/Core/Console/Commands/SetPassword.php
+++ b/application/Espo/Core/Console/Commands/SetPassword.php
@@ -33,7 +33,7 @@ use Espo\Core\{
     ORM\EntityManager,
     Utils\PasswordHash,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/Upgrade.php b/application/Espo/Core/Console/Commands/Upgrade.php
index 254332c823..dc17f6ee89 100644
--- a/application/Espo/Core/Console/Commands/Upgrade.php
+++ b/application/Espo/Core/Console/Commands/Upgrade.php
@@ -38,7 +38,7 @@ use Espo\Core\{
     Utils\Config,
     Utils\Log,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/UpgradeStep.php b/application/Espo/Core/Console/Commands/UpgradeStep.php
index 203af03252..428f7f6a2c 100644
--- a/application/Espo/Core/Console/Commands/UpgradeStep.php
+++ b/application/Espo/Core/Console/Commands/UpgradeStep.php
@@ -34,7 +34,7 @@ use Espo\Core\{
     Application,
     Upgrades\UpgradeManager,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/application/Espo/Core/Console/Commands/Version.php b/application/Espo/Core/Console/Commands/Version.php
index 4e212ff28f..27357c9f51 100644
--- a/application/Espo/Core/Console/Commands/Version.php
+++ b/application/Espo/Core/Console/Commands/Version.php
@@ -32,7 +32,7 @@ namespace Espo\Core\Console\Commands;
 use Espo\Core\{
     Utils\Config,
     Console\Command,
-    Console\Params,
+    Console\Command\Params,
     Console\IO,
 };
 
diff --git a/tests/unit/Espo/Core/Console/CommandManagerTest.php b/tests/unit/Espo/Core/Console/CommandManagerTest.php
index bd6314bf3a..453b53ec7e 100644
--- a/tests/unit/Espo/Core/Console/CommandManagerTest.php
+++ b/tests/unit/Espo/Core/Console/CommandManagerTest.php
@@ -33,7 +33,7 @@ use Espo\Core\InjectableFactory;
 use Espo\Core\Utils\Metadata;
 use Espo\Core\Console\CommandManager;
 use Espo\Core\Console\Command;
-use Espo\Core\Console\Params;
+use Espo\Core\Console\Command\Params;
 use Espo\Core\Console\IO;
 
 class CommandManagerTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/Core/Console/ParamsTest.php b/tests/unit/Espo/Core/Console/ParamsTest.php
index 119e530466..a5a7fa3acb 100644
--- a/tests/unit/Espo/Core/Console/ParamsTest.php
+++ b/tests/unit/Espo/Core/Console/ParamsTest.php
@@ -29,7 +29,7 @@
 
 namespace tests\unit\Espo\Core\Console;
 
-use Espo\Core\Console\Params;
+use Espo\Core\Console\Command\Params;
 
 class ParamsTest extends \PHPUnit\Framework\TestCase
 {