Merge pull request #17 from XetaIO/fix-start-sentence

Fix @mention at start of sentence

.gitignore

@@ -4,3 +4,4 @@ composer.phar
 composer.lock
 tests/vendor/coverage
 tests/vendor/temp/database.sqlite
+.phpunit.result.cache

src/Parser/MentionParser.php

@@ -25,7 +25,7 @@ class MentionParser extends Configurator
         'mention' => true,
         'notify' => true,
         'character' => '@',
-        'regex' => '/\s({character}{pattern}{rules})/',
+        'regex' => '/({character}{pattern}{rules})/',
         'regex_replacement' => [
             '{character}' => '@',
             '{pattern}' => '[A-Za-z0-9]',
@@ -91,7 +91,7 @@ protected function replace(array $match): string
 
         $link = $route . $mention;
 
-        return " [{$character}{$mention}]($link)";
+        return "[{$character}{$mention}]($link)";
     }
 
     /**

tests/Parser/MentionParserTest.php

@@ -98,6 +98,21 @@ public function testParseWithLargestMentions()
         $this->assertSame($output, $result);
     }
 
+    /**
+     * testParseWithMentionsAtStart method
+     *
+     * @return void
+     */
+    public function testParseWithMentionsAtStart()
+    {
+        $input = '@Admin crepu rhoncus id velit @adm sit amet @administrator.';
+        $output = '[@Admin](/users/profile/@Admin) crepu rhoncus id velit @adm sit amet @administrator.';
+
+        $this->parser->setOption('regex', '/({character}{pattern}{rules})/');
+        $result = $this->parser->parse($input);
+        $this->assertSame($output, $result);
+    }
+
     /**
      * testParseWithoutMention method
      *
@@ -121,7 +136,7 @@ public function testParseWithoutMention()
     public function testParseWithFakeMentionsAndWithoutMentions()
     {
         $input = 'Lorem ipsu @admin crepu @thisuserdoesntexist but this one @member yes. Also this blabla@admin is a non-normal mention.';
-        $output = 'Lorem ipsu [@Admin](/users/profile/@Admin) crepu @thisuserdoesntexist but this one [@Member](/users/profile/@Member) yes. Also this blabla@admin is a non-normal mention.';
+        $output = 'Lorem ipsu [@Admin](/users/profile/@Admin) crepu @thisuserdoesntexist but this one [@Member](/users/profile/@Member) yes. Also this blabla[@Admin](/users/profile/@Admin) is a non-normal mention.';
 
         $this->parser->setOption('mention', false);
         $result = $this->parser->parse($input);

tests/vendor/Parser/CustomParser.php

@@ -16,6 +16,6 @@ protected function replace(array $match): string
 
         $link = $route . $mention;
 
-        return " <a class=\"link\" href=\"{$link}\">{$character}{$mention}</a>";
+        return "<a class=\"link\" href=\"{$link}\">{$character}{$mention}</a>";
     }
 }