BugFix EOL command text separator

src/Entities/Message.php

@@ -199,7 +199,15 @@ class Message extends Entity
     public function getFullCommand()
     {
         if (substr($this->text, 0, 1) === '/') {
-            return strtok($this->text, ' ');
+            $no_EOL =  strtok($this->text, PHP_EOL);
+            $no_space = strtok($this->text, ' ');
+
+            //try to understand which separator \n or space divide /command from text
+            if (strlen($no_space) < strlen($no_EOL)) {
+                return $no_space;
+            } else {
+                return $no_EOL;
+            }
         } else {
             return;
         }
@@ -273,7 +281,8 @@ class Message extends Entity
         if ($without_cmd) {
             $command = $this->getFullCommand();
             if (!empty($command)) {
-                $text = substr($text, strlen($command.' '), strlen($text));
+                //$text = substr($text, strlen($command.' '), strlen($text));
+                $text = substr($text, strlen($command) + 1, strlen($text));
             }
         }
 

tests/Unit/Entities/MessageTest.php

@@ -82,5 +82,26 @@ class MessageTest extends TestCase
         $this->assertEquals('help', $this->message->getCommand());
         $this->assertEquals('/help@testbot some text', $this->message->getText());
         $this->assertEquals('some text', $this->message->getText(true));
+
+        // /commmad\n text
+        $this->message = new Message($this->generateMessage("/help\n some text"), 'testbot');
+        $this->assertEquals('/help', $this->message->getFullCommand());
+        $this->assertEquals('help', $this->message->getCommand());
+        $this->assertEquals("/help\n some text", $this->message->getText());
+        $this->assertEquals(' some text', $this->message->getText(true));
+
+        // /command@bot\nsome text
+        $this->message = new Message($this->generateMessage("/help@testbot\nsome text"), 'testbot');
+        $this->assertEquals('/help@testbot', $this->message->getFullCommand());
+        $this->assertEquals('help', $this->message->getCommand());
+        $this->assertEquals("/help@testbot\nsome text", $this->message->getText());
+        $this->assertEquals('some text', $this->message->getText(true));
+
+        // /command@bot \nsome text
+        $this->message = new Message($this->generateMessage("/help@testbot \nsome text"), 'testbot');
+        $this->assertEquals('/help@testbot', $this->message->getFullCommand());
+        $this->assertEquals('help', $this->message->getCommand());
+        $this->assertEquals("/help@testbot \nsome text", $this->message->getText());
+        $this->assertEquals("\nsome text", $this->message->getText(true));
      }
 }