Merge remote-tracking branch 'origin/2.2'

.gitattributes

@@ -10,6 +10,8 @@
 /.nojekyll            export-ignore
 /.scrutinizer.yml     export-ignore
 /.styleci.yml         export-ignore
+/CHANGELOG-0.x.md     export-ignore
+/CHANGELOG-1.x.md     export-ignore
 /docker               export-ignore
 /docker-compose.yml   export-ignore
 /docs                 export-ignore

.github/workflows/backwards-compatibility.yml

@@ -11,7 +11,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: "actions/checkout@v2.4.0"
+              uses: "actions/checkout@v3"
               with:
                   fetch-depth: 0
 

.github/workflows/docs.yml

@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: ./.github/workflows/build-jekyll-site-action
               with:

.github/workflows/merge-dependabot-upgrades.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Auto-Merge
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
-        uses: ridedott/merge-me-action@v2.9.113
+        uses: ridedott/merge-me-action@v2.9.142
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PRESET: DEPENDABOT_MINOR

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:
@@ -41,7 +41,7 @@ jobs:
                       composer-flags: '--prefer-lowest'
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               with:
                 fetch-depth: 0
 
@@ -71,7 +71,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:
@@ -89,7 +89,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:
@@ -107,9 +107,9 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
-            - uses: github/super-linter/slim@v4.9.0
+            - uses: github/super-linter/slim@v4.9.2
               env:
                   DEFAULT_BRANCH: main
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/2.0/customization/block-parsing.md

@@ -97,10 +97,10 @@ If `canHaveLazyContinuationLines()` returned `true`, this method will be called
 public function tryContinue(Cursor $cursor, BlockContinueParserInterface $activeBlockParser): ?BlockContinue;
 ```
 
-### `closeBlock()`
-
 This method allows you to try and parse an additional line of Markdown.
 
+### `closeBlock()`
+
 ```php
 public function closeBlock(): void;
 ```

docs/2.1/customization/block-parsing.md

@@ -98,10 +98,10 @@ If `canHaveLazyContinuationLines()` returned `true`, this method will be called
 public function tryContinue(Cursor $cursor, BlockContinueParserInterface $activeBlockParser): ?BlockContinue;
 ```
 
-### `closeBlock()`
-
 This method allows you to try and parse an additional line of Markdown.
 
+### `closeBlock()`
+
 ```php
 public function closeBlock(): void;
 ```

docs/2.2/customization/block-parsing.md

@@ -97,10 +97,10 @@ If `canHaveLazyContinuationLines()` returned `true`, this method will be called
 public function tryContinue(Cursor $cursor, BlockContinueParserInterface $activeBlockParser): ?BlockContinue;
 ```
 
-### `closeBlock()`
-
 This method allows you to try and parse an additional line of Markdown.
 
+### `closeBlock()`
+
 ```php
 public function closeBlock(): void;
 ```

docs/Gemfile.lock

@@ -5,18 +5,18 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
     concurrent-ruby (1.1.9)
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.4)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    http_parser.rb (0.8.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.1)
+    jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -36,7 +36,7 @@ GEM
       octokit (~> 4.0, != 4.4.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.1.0)
+    jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
@@ -45,7 +45,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -56,11 +56,11 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.1)
+    rouge (3.28.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)