UPGRADE minimum PHP version to 7.4

Follows CommonMark v2 minimum PHP version. Drops support in code
and CI for previous versions.

Author: AymDev

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.3', '7.4', '8.0']
+                php: ['7.4', '8.0']
 
         steps:
             # Setup

.github/workflows/installation.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0']
+                php: ['7.4', '8.0']
                 symfony: ['4.4', '5.0', '5.1', '5.2', '5.3']
                 exclude:
                     - php: '8.0'

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0] - 2021-11-14
+### Changed
+ - minimal **league/commonmark** supported version is v2.0
+ - minimal **PHP** supported version is 7.4
+
+### Removed
+ - converter service IDs as `aymdev_commonmark.converter.CONVERTER_NAME`
+
 ## [1.3.1] - 2020-11-08
 ### Fixed
  - definition deprecation for *old* service IDs has been corrected for Symfony < 5.1
@@ -36,7 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
  - Bundle base
 
-[Unreleased]: https://github.com/AymDev/CommonMarkBundle/compare/v1.3.1...HEAD
+[Unreleased]: https://github.com/AymDev/CommonMarkBundle/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/AymDev/CommonMarkBundle/compare/v1.3.1...v2.0.0
 [1.3.1]: https://github.com/AymDev/CommonMarkBundle/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/AymDev/CommonMarkBundle/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/AymDev/CommonMarkBundle/compare/v1.1.1...v1.2.0

composer.json

@@ -11,7 +11,7 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.1||^8.0",
+        "php": "^7.4||^8.0",
         "symfony/http-kernel": "^4.4|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/config": "^4.4|^5.0",

src/DependencyInjection/Compiler/ConvertersPass.php

@@ -9,7 +9,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * @internal
@@ -18,7 +17,7 @@ class ConvertersPass implements CompilerPassInterface
 {
     public const PARAMETER_CONVERTERS = 'aymdev_commonmark.converters';
     /** @var Reference[] converter service IDs */
-    private $converters = [];
+    private array $converters = [];
 
     public function process(ContainerBuilder $container)
     {
@@ -64,23 +63,6 @@ private function registerConverters(array $converterConfig, ContainerBuilder $co
         $container->setDefinition($converterConfig['name'], $converterDefinition);
         $container->registerAliasForArgument($converterConfig['name'], MarkdownConverter::class, $converterConfig['name']);
 
-        // Deprecated service ID
-        $deprecatedConverterDefinition = clone $converterDefinition;
-
-        $deprecationMessage = 'Using the %service_id% service ID is deprecated and will be removed in v2. ';
-        $deprecationMessage .= 'You should use the converter name instead.';
-
-        // Symfony <5.1
-        if (Kernel::MAJOR_VERSION <= 4 || (Kernel::MAJOR_VERSION === 5 && Kernel::MINOR_VERSION === 0)) {
-            $deprecatedConverterDefinition->setDeprecated(true, $deprecationMessage);
-        } else {
-            // Symfony >= 5.1
-            $deprecatedConverterDefinition->setDeprecated('aymdev/commonmark-bundle', '1.3.0', $deprecationMessage);
-        }
-
-        $converterId = 'aymdev_commonmark.converter.' . $converterConfig['name'];
-        $container->setDefinition($converterId, $deprecatedConverterDefinition);
-
         // Save converter for later twig extension arguments setup
         $this->converters[$converterConfig['name']] = new Reference($converterConfig['name']);
 

src/Twig/CommonMarkExtension.php

@@ -12,7 +12,7 @@
  */
 class CommonMarkExtension extends AbstractExtension
 {
-    private $serviceLocator;
+    private ServiceLocator $serviceLocator;
 
     public function __construct(ServiceLocator $serviceLocator)
     {

tests/DependencyInjection/Compiler/ConvertersPassTest.php

@@ -67,11 +67,6 @@ public function testContainerServicesRegistration()
                 self::assertTrue($container->has($extension));
             }
 
-            // Deprecated service ID
-            $converterId = 'aymdev_commonmark.converter.' . $converter['name'];
-            self::assertTrue($container->has($converterId));
-            self::assertTrue($container->getDefinition($converterId)->isDeprecated());
-
             // Current service ID
             self::assertTrue($container->has($converter['name']));
 
@@ -141,8 +136,7 @@ class AymdevCommonmarkTestKernel extends Kernel
 {
     public const KERNEL_CACHE_DIR = __DIR__ . '/../../cache';
 
-    /** @var array */
-    private $aymdevCommonmarkConfig;
+    private array $aymdevCommonmarkConfig;
 
     public function __construct(array $aymdevCommonmarkConfig = [])
     {

tests/Twig/CommonMarkExtensionTest.php

@@ -68,11 +68,9 @@ public function testFilterConverterNameIsOptional()
     public function testFilterWithInvalidConverterName()
     {
         $serviceLocator = new ServiceLocator([
-            'my_converter' => function() {
-                return $this->getMockBuilder(MarkdownConverter::class)
-                    ->disableOriginalConstructor()
-                    ->getMock();
-            },
+            'my_converter' => fn() => $this->getMockBuilder(MarkdownConverter::class)
+                ->disableOriginalConstructor()
+                ->getMock(),
         ]);
         $extension = new CommonMarkExtension($serviceLocator);
 
@@ -88,11 +86,9 @@ public function testFilterWithInvalidConverterName()
     public function testFilterWithNullContent()
     {
         $serviceLocator = new ServiceLocator([
-            'my_converter' => function() {
-                return $this->getMockBuilder(MarkdownConverter::class)
-                    ->disableOriginalConstructor()
-                    ->getMock();
-            },
+            'my_converter' => fn() => $this->getMockBuilder(MarkdownConverter::class)
+                ->disableOriginalConstructor()
+                ->getMock(),
         ]);
         $extension = new CommonMarkExtension($serviceLocator);