UPGRADE minimum CommonMark version to v2

Author: AymDev

README.md

@@ -1,5 +1,5 @@
 # CommonMarkBundle
-A **Symfony 4 / 5** bundle to easily configure [league/commonmark](https://github.com/thephpleague/commonmark), 
+A **Symfony 4 / 5** bundle to easily configure [league/commonmark](https://github.com/thephpleague/commonmark) **v2**, 
 allowing you to set multiple **MarkDown** converters.
 
 ![Unit Test Suite](https://github.com/AymDev/CommonMarkBundle/workflows/Unit%20Test%20Suite/badge.svg)
@@ -55,27 +55,27 @@ The `type` key can be used to choose between a *CommonMark* or a *GitHub* conver
 ### Converter options
 
 The `options` key holds the configuration passed to the converter, as an array.
->For more information, see the [CommonMark documentation about Configuration](https://commonmark.thephpleague.com/1.5/configuration/).
+>For more information, see the [CommonMark documentation about Configuration](https://commonmark.thephpleague.com/2.0/configuration/).
 
 ### Converter extensions
 
 The `extensions` key allows to add any extension class to a converter.
->Check the complete list of extensions on the [CommonMark documentation](https://commonmark.thephpleague.com/1.5/extensions/overview/).
+>Check the complete list of extensions on the [CommonMark documentation](https://commonmark.thephpleague.com/2.0/extensions/overview/).
 
 ## Using the converters
 
 ### As services
 The bundle registers your converters as **services** with the converter name as the **service ID**.
 
 It also creates an alias, so you can get them by *autowiring* using the *converter name* as the *argument name*,
-type with the `League\CommonMark\CommonMarkConverter` class.
+type with the `League\CommonMark\MarkdownConverter` class.
 
 **Example YAML configuration**:
 ```yaml
 aymdev_commonmark:
     converters:
         # You can add an argument for this converter as:
-        #   CommonMarkConverter $myConverter
+        #   MarkdownConverter $myConverter
         my_converter:
 ```
 

composer.json

@@ -11,11 +11,11 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.1",
+        "php": "^7.1||^8.0",
         "symfony/http-kernel": "^4.4|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/config": "^4.4|^5.0",
-        "league/commonmark": "^1.5",
+        "league/commonmark": "^2.0",
         "symfony/framework-bundle": "^4.4|^5.0"
     },
     "autoload": {
@@ -25,7 +25,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\Aymdev\\CommonmarkBundle\\": "tests/"
+            "Tests\\AymDev\\CommonmarkBundle\\": "tests/"
         }
     },
     "require-dev": {

src/DependencyInjection/AymdevCommonmarkExtension.php

@@ -4,7 +4,7 @@
 
 use Aymdev\CommonmarkBundle\DependencyInjection\Compiler\ConvertersPass;
 use Aymdev\CommonmarkBundle\Twig\CommonMarkExtension;
-use League\CommonMark\Environment;
+use League\CommonMark\Environment\Environment;
 use League\CommonMark\MarkdownConverter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;

src/Twig/CommonMarkExtension.php

@@ -50,6 +50,6 @@ public function convertMarkdown(?string $markdown, ?string $converterName = null
 
         /** @var MarkdownConverter $converter */
         $converter = $this->serviceLocator->get($converterName);
-        return $converter->convertToHtml($markdown);
+        return $converter->convertToHtml($markdown)->getContent();
     }
 }

tests/DependencyInjection/AymDevCommonmarkExtensionTest.php

@@ -4,7 +4,7 @@
 
 use Aymdev\CommonmarkBundle\DependencyInjection\AymdevCommonMarkExtension;
 use Aymdev\CommonmarkBundle\DependencyInjection\Compiler\ConvertersPass;
-use League\CommonMark\Environment;
+use League\CommonMark\Environment\Environment;
 use League\CommonMark\MarkdownConverter;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

tests/DependencyInjection/Compiler/ConvertersPassTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\AymDev\CommonMarkBundle\DependencyInjection\Compiler;
+namespace Tests\Aymdev\CommonmarkBundle\DependencyInjection\Compiler;
 
 use Aymdev\CommonmarkBundle\AymdevCommonmarkBundle;
 use Aymdev\CommonmarkBundle\DependencyInjection\AymdevCommonMarkExtension;

tests/Twig/CommonMarkExtensionTest.php

@@ -4,6 +4,8 @@
 
 use Aymdev\CommonmarkBundle\Twig\CommonMarkExtension;
 use League\CommonMark\MarkdownConverter;
+use League\CommonMark\Node\Block\Document;
+use League\CommonMark\Output\RenderedContent;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
@@ -16,20 +18,25 @@ public function testFilterBasicUsage()
                 $converterMockA = $this->getMockBuilder(MarkdownConverter::class)
                     ->disableOriginalConstructor()
                     ->getMock();
-                $converterMockA->method('convertToHtml')->willReturn('a');
+                $converterMockA->method('convertToHtml')
+                    ->willReturn(new RenderedContent(new Document(), 'a'));
                 return $converterMockA;
             },
             'b_conv' => function() {
                 $converterMockB = $this->getMockBuilder(MarkdownConverter::class)
                     ->disableOriginalConstructor()
                     ->getMock();
-                $converterMockB->method('convertToHtml')->willReturn('b');
+                $converterMockB->method('convertToHtml')
+                    ->willReturn(new RenderedContent(new Document(), 'b'));
                 return $converterMockB;
             },
         ]);
 
         $extension = new CommonMarkExtension($serviceLocator);
 
+        $output = $extension->convertMarkdown('', 'a_conv');
+        self::assertSame('a', $output);
+
         $output = $extension->convertMarkdown('', 'b_conv');
         self::assertSame('b', $output);
     }
@@ -44,16 +51,15 @@ public function testFilterConverterNameIsOptional()
                 $converterMock = $this->getMockBuilder(MarkdownConverter::class)
                     ->disableOriginalConstructor()
                     ->getMock();
-                $converterMock->expects(self::once())->method('convertToHtml')->willReturnArgument(0);
+                $converterMock->expects(self::once())->method('convertToHtml')
+                    ->willReturn(new RenderedContent(new Document(), 'some markdown content'));
                 return $converterMock;
             },
         ]);
         $extension = new CommonMarkExtension($serviceLocator);
 
-        $expectedOutput = 'some markdown content';
-        $actualOutput = $extension->convertMarkdown($expectedOutput);
-
-        self::assertSame($expectedOutput, $actualOutput);
+        $actualOutput = $extension->convertMarkdown('');
+        self::assertSame('some markdown content', $actualOutput);
     }
 
     /**