decoupling

2020-06-22 19:24:44 +03:00
parent 6b2fdf5400
commit 6f2fc808cd
2 changed files with 32 additions and 4 deletions
@@ -31,7 +31,9 @@ namespace Espo\Core\Console\Commands;

 use Espo\Core\Exceptions\Error;

-class Upgrade extends Base
+use Espo\Core\Container;
+
+class Upgrade implements Command
 {
    protected $upgradeManager;

@@ -48,7 +50,19 @@ class Upgrade extends Base
        'rebuild',
    ];

-    public function run($options, $flagList, $argumentList)
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function run(array $options, array $flagList, array $argumentList)
    {
        $params = $this->normalizeParams($options, $flagList, $argumentList);

@@ -29,9 +29,23 @@

 namespace Espo\Core\Console\Commands;

-class UpgradeStep extends Base
+use Espo\Core\Container;
+
+class UpgradeStep implements Command
 {
-    public function run($options, $flagList, $argumentList)
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function run(array $options)
    {
        if (empty($options['step'])) {
            echo "Step is not specified.\n";