Merge branch 'master' of github.com:botman/botman

raaito · Feb 20, 2018 · d4ad18f · d4ad18f
2 parents 09e4a02 + 7486043
commit d4ad18f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/BotMan.php b/src/BotMan.php
@@ -2,7 +2,6 @@
 
 namespace BotMan\BotMan;
 
-use BotMan\BotMan\Interfaces\Middleware\Heard;
 use Closure;
 use Illuminate\Support\Collection;
 use BotMan\BotMan\Commands\Command;
@@ -22,6 +21,7 @@
 use BotMan\BotMan\Messages\Attachments\Video;
 use BotMan\BotMan\Messages\Outgoing\Question;
 use Psr\Container\NotFoundExceptionInterface;
+use BotMan\BotMan\Interfaces\Middleware\Heard;
 use BotMan\BotMan\Interfaces\StorageInterface;
 use BotMan\BotMan\Traits\HandlesConversations;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/BotManTest.php b/tests/BotManTest.php
@@ -2,7 +2,6 @@
 
 namespace BotMan\BotMan\tests;
 
-use BotMan\BotMan\Tests\Fixtures\Middleware\Matching;
 use Mockery as m;
 use BotMan\BotMan\BotMan;
 use Mockery\MockInterface;
@@ -29,6 +28,7 @@
 use BotMan\BotMan\Exceptions\Base\BotManException;
 use BotMan\BotMan\Tests\Fixtures\TestConversation;
 use BotMan\BotMan\Messages\Incoming\IncomingMessage;
+use BotMan\BotMan\Tests\Fixtures\Middleware\Matching;
 use BotMan\BotMan\Tests\Fixtures\TestMatchMiddleware;
 use BotMan\BotMan\Messages\Conversations\Conversation;
 use BotMan\BotMan\Tests\Fixtures\TestAdditionalDriver;

diff --git a/tests/Fixtures/Middleware/Matching.php b/tests/Fixtures/Middleware/Matching.php
@@ -7,7 +7,6 @@
 
 class Matching implements MatchingInterface
 {
-
     /**
      * @param IncomingMessage $message
      * @param string $pattern
@@ -18,4 +17,4 @@ public function matching(IncomingMessage $message, $pattern, $regexMatched)
     {
         return $message->getText()[0] === 'o';
     }
-}
+}