Make preExecute more logical regarding MySQL requirement.

noplanman · noplanman · commit 1408ba11f283 · 2016-02-21T00:46:35.000+01:00
Fix missing namespace use.
diff --git a/src/Commands/Command.php b/src/Commands/Command.php
@@ -11,6 +11,7 @@
 namespace Longman\TelegramBot\Commands;
 
 use Longman\TelegramBot\DB;
+use Longman\TelegramBot\Request;
 use Longman\TelegramBot\Telegram;
 use Longman\TelegramBot\Entities\Chat;
 use Longman\TelegramBot\Entities\Update;
@@ -126,10 +127,10 @@ public function setUpdate(Update $update = null)
      */
     public function preExecute()
     {
-        if (!$this->need_mysql || ($this->telegram->isDbEnabled() && DB::isDbConnected())) {
-            return $this->execute();
+        if ($this->need_mysql && !($this->telegram->isDbEnabled() && DB::isDbConnected())) {
+            return $this->executeNoDB();
         }
-        return $this->executeNoDB();
+        return $this->execute();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`namespace Longman\TelegramBot\Commands;`
`12`	`12`
`13`	`13`	`use Longman\TelegramBot\DB;`
	`14`	`+use Longman\TelegramBot\Request;`
`14`	`15`	`use Longman\TelegramBot\Telegram;`
`15`	`16`	`use Longman\TelegramBot\Entities\Chat;`
`16`	`17`	`use Longman\TelegramBot\Entities\Update;`
`@@ -126,10 +127,10 @@ public function setUpdate(Update $update = null)`
`126`	`127`	`*/`
`127`	`128`	`public function preExecute()`
`128`	`129`	`{`
`129`		`- if (!$this->need_mysql \|\| ($this->telegram->isDbEnabled() && DB::isDbConnected())) {`
`130`		`- return $this->execute();`
	`130`	`+ if ($this->need_mysql && !($this->telegram->isDbEnabled() && DB::isDbConnected())) {`
	`131`	`+ return $this->executeNoDB();`
`131`	`132`	`}`
`132`		`- return $this->executeNoDB();`
	`133`	`+ return $this->execute();`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`/**`