Merge branch '2.6'

Author: colinodell

CHANGELOG.md

@@ -6,6 +6,12 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 ## [Unreleased][unreleased]
 
+## [2.6.2] - 2025-04-18
+
+### Fixed
+
+- Fixed Attributes extension parsing regression (#1071)
+
 ## [2.6.1] - 2024-12-29
 
 ### Fixed
@@ -683,7 +689,8 @@ No changes were introduced since the previous release.
     - Alternative 1: Use `CommonMarkConverter` or `GithubFlavoredMarkdownConverter` if you don't need to customize the environment
     - Alternative 2: Instantiate a new `Environment` and add the necessary extensions yourself
 
-[unreleased]: https://github.com/thephpleague/commonmark/compare/2.6.1...main
+[unreleased]: https://github.com/thephpleague/commonmark/compare/2.6.1...2.6.2
+[2.6.2]: https://github.com/thephpleague/commonmark/compare/2.6.1...2.6.2
 [2.6.1]: https://github.com/thephpleague/commonmark/compare/2.6.0...2.6.1
 [2.6.0]: https://github.com/thephpleague/commonmark/compare/2.5.3...2.6.0
 [2.5.3]: https://github.com/thephpleague/commonmark/compare/2.5.2...2.5.3

docs/2.6/customization/extensions.md

@@ -9,15 +9,15 @@ redirect_from: /customization/extensions/
 
 Extensions provide a way to group related parsers, renderers, etc. together with pre-defined priorities, configuration settings, etc.  They are perfect for distributing your customizations as reusable, open-source packages that others can plug into their own projects!
 
-To create an extension, simply create a new class implementing `ExtensionInterface`.  This has a single method where you're given a `ConfigurableEnvironmentInterface` to register whatever things you need to. For example:
+To create an extension, simply create a new class implementing `ExtensionInterface`.  This has a single method where you're given a `EnvironmentBuilderInterface` to register whatever things you need to. For example:
 
 ```php
 use League\CommonMark\Extension\ExtensionInterface;
-use League\CommonMark\Environment\ConfigurableEnvironmentInterface;
+use League\CommonMark\Environment\EnvironmentBuilderInterface;
 
 final class EmojiExtension implements ExtensionInterface
 {
-    public function register(ConfigurableEnvironmentInterface $environment): void
+    public function register(EnvironmentBuilderInterface $environment): void
     {
         $environment
             // TODO: Create the EmojiParser, Emoji, and EmojiRenderer classes

src/Extension/Attributes/Util/AttributesHelper.php

@@ -23,7 +23,7 @@
  */
 final class AttributesHelper
 {
-    private const SINGLE_ATTRIBUTE = '\s*([.]-?[_a-z][^\s}]*|[#][^\s}]+|' . RegexHelper::PARTIAL_ATTRIBUTENAME . RegexHelper::PARTIAL_ATTRIBUTEVALUESPEC . ')\s*';
+    private const SINGLE_ATTRIBUTE = '\s*([.]-?[_a-z][^\s.}]*|[#][^\s}]+|' . RegexHelper::PARTIAL_ATTRIBUTENAME . RegexHelper::PARTIAL_ATTRIBUTEVALUESPEC . ')\s*';
     private const ATTRIBUTE_LIST   = '/^{:?(' . self::SINGLE_ATTRIBUTE . ')+}/i';
 
     /**

tests/unit/Extension/Attributes/Util/AttributesHelperTest.php

@@ -108,6 +108,9 @@ public static function dataForTestParseAttributes(): iterable
         yield [new Cursor('{{ foo }}'), [], '{{ foo }}'];
         yield [new Cursor(' {{ foo }}'), [], ' {{ foo }}'];
         yield [new Cursor('{ foo }}'), [], '{ foo }}'];
+
+        // Issue 1071
+        yield [new Cursor('{.display-4.mt-5.mx-auto}'), ['class' => 'display-4 mt-5 mx-auto']];
     }
 
     /**