Bump to CommonMark v1.0

Author: jbrooksuk

composer.json

@@ -13,11 +13,11 @@
         "php": "^7.1.3",
         "illuminate/contracts": "^5.5|^6.0",
         "illuminate/support": "^5.5|^6.0",
-        "league/commonmark": "^0.18"
+        "league/commonmark": "^1.0"
     },
     "require-dev": {
         "graham-campbell/analyzer": "^2.1",
-        "graham-campbell/markdown": "^10.2",
+        "graham-campbell/markdown": "^11.0",
         "graham-campbell/testbench": "^5.1",
         "phpunit/phpunit": "^6.5|^7.0|^8.0"
     },

src/TwitterExtension.php

@@ -13,14 +13,15 @@
 
 namespace CachetHQ\Twitter;
 
-use League\CommonMark\Extension\Extension;
+use League\CommonMark\ConfigurableEnvironmentInterface;
+use League\CommonMark\Extension\ExtensionInterface;
 
 /**
  * This is the twitter extension class.
  *
  * @author James Brooks <james@alt-three.com>
  */
-class TwitterExtension extends Extension
+class TwitterExtension implements ExtensionInterface
 {
     /**
      * The twitter parser.
@@ -42,12 +43,12 @@ public function __construct(TwitterParser $parser)
     }
 
     /**
-     * Returns a list of inline parsers to add to the existing list.
+     * Register extensions.
      *
-     * @return \League\CommonMark\Inline\Parser\InlineParserInterface[]
+     * @return void
      */
-    public function getInlineParsers()
+    public function register(ConfigurableEnvironmentInterface $environment)
     {
-        return [$this->parser];
+        $environment->addInlineParser($this->parser);
     }
 }

src/TwitterParser.php

@@ -13,23 +13,23 @@
 
 namespace CachetHQ\Twitter;
 
-use League\CommonMark\Inline\Element\Link;
-use League\CommonMark\Inline\Parser\AbstractInlineParser;
 use League\CommonMark\InlineParserContext;
+use League\CommonMark\Inline\Element\Link;
+use League\CommonMark\Inline\Parser\InlineParserInterface;
 
 /**
  * This is the twitter parser class.
  *
  * @author James Brooks <james@alt-three.com>
  */
-class TwitterParser extends AbstractInlineParser
+class TwitterParser implements InlineParserInterface
 {
     /**
      * Get the characters that must be matched.
      *
      * @return string[]
      */
-    public function getCharacters()
+    public function getCharacters(): array
     {
         return ['@'];
     }
@@ -43,7 +43,7 @@ public function getCharacters()
      *
      * @return bool
      */
-    public function parse(InlineParserContext $inlineContext)
+    public function parse(InlineParserContext $inlineContext): bool
     {
         $cursor = $inlineContext->getCursor();
 

tests/ServiceProviderTest.php

@@ -35,9 +35,4 @@ public function testTwitterExtensionIsInjectable()
     {
         $this->assertIsInjectable(TwitterExtension::class);
     }
-
-    public function testEnvironmentIsSetup()
-    {
-        $this->assertTrue(in_array($this->app->make(TwitterParser::class), $this->app->make('markdown.environment')->getInlineParsers(), true));
-    }
 }