Min version of league/commonmark set to ^2.5.1 (where is block's …

…start/end was improved).
LastDragon-ru · Aug 5, 2024 · c8b98ea · c8b98ea
1 parent c528350
commit c8b98ea
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
  "illuminate/testing": "^10.34.0|^11.0.0",
  "illuminate/translation": "^10.34.0|^11.0.0",
  "illuminate/validation": "^10.34.0|^11.0.0",
- "league/commonmark": "^2.4",
+ "league/commonmark": "^2.5.1",
  "mockery/mockery": "^1.6.5",
  "nikic/php-parser": "^4.18|^5.0",
  "nuwave/lighthouse": "^6.5.0",

diff --git a/packages/documentator/composer.json b/packages/documentator/composer.json
@@ -25,7 +25,7 @@
  "illuminate/console": "^10.34.0|^11.0.0",
  "illuminate/process": "^10.34.0|^11.0.0",
  "illuminate/support": "^10.34.0|^11.0.0",
- "league/commonmark": "^2.4",
+ "league/commonmark": "^2.5.1",
  "nikic/php-parser": "^4.18|^5.0",
  "phpstan/phpdoc-parser": "^1.25",
  "symfony/console": "^6.3.0|^7.0.0",

diff --git a/packages/documentator/src/Markdown/Nodes/Locator/Listener.php b/packages/documentator/src/Markdown/Nodes/Locator/Listener.php
@@ -88,8 +88,7 @@ private function fixTableSection(Document $document, TableSection $section): voi
  $start = Cast::toNullable(Table::class, $section->parent())?->getStartLine();
 
  if ($start !== null) {
- $start = $start - 1; // Looks like `Table::getStartLine()` is incorrect...
- $end = $start + $rows - 1;
+ $end = $start + $rows - 1;
  }
  }
 

diff --git a/packages/documentator/src/Markdown/Nodes/Locator/ParserTest~expected.xml b/packages/documentator/src/Markdown/Nodes/Locator/ParserTest~expected.xml
@@ -46,7 +46,7 @@
  </emph>
  <text><![CDATA[ text.]]></text>
  </paragraph>
- <reference destination="https://example.com/" label="link" location="[{12,0,null},{13,0,null}]" title="reference"/>
+ <reference destination="https://example.com/" label="link" location="[{12,0,null}]" title="reference"/>
  <heading level="1">
  <text>Lists</text>
  </heading>

diff --git a/packages/documentator/src/Markdown/Nodes/Reference/ParserTest~expected.xml b/packages/documentator/src/Markdown/Nodes/Reference/ParserTest~expected.xml
@@ -8,7 +8,7 @@
  label="simple:a"
  destination="https://example.com/"
  title=""
- location="[{5,0,null},{6,0,null}]"
+ location="[{5,0,null}]"
  />
  <reference
  label="simple:b"
@@ -26,7 +26,7 @@
  label="simple:d"
  destination="file/b"
  title="title"
- location="[{9,0,null},{10,0,null}]"
+ location="[{9,0,null}]"
  />
  <reference
  label="simple:e"
@@ -38,7 +38,7 @@
  title=""
  label="simple:e"
  destination="file/b"
- location="[{12,0,null},{13,0,null}]"
+ location="[{12,0,null}]"
  />
  <heading level="1">
  <text>Multiline</text>
@@ -47,13 +47,13 @@
  label="multiline:a"
  destination="https://example.com/"
  title="\n1\n2\n3\n"
- location="[{16,0,null},{17,0,null},{18,0,null},{19,0,null},{20,0,null},{21,0,null}]"
+ location="[{16,0,null},{17,0,null},{18,0,null},{19,0,null},{20,0,null}]"
  />
  <reference
  label="multiline:b"
  destination="https://example.com/"
  title="\n example.com\n "
- location="[{22,0,null},{23,0,null},{24,0,null},{25,0,null},{26,0,null},{27,0,null}]"
+ location="[{22,0,null},{23,0,null},{24,0,null},{25,0,null},{26,0,null}]"
  />
  <heading level="1">
  <text>Inside Quote</text>
@@ -63,13 +63,13 @@
  label="quote:a"
  destination="https://example.com/"
  title="example.com"
- location="[{30,2,null},{31,2,null}]"
+ location="[{30,2,null}]"
  />
  <reference
  label="quote:b"
  destination="https://example.com/"
  title=""
- location="[{32,2,null},{33,2,null},{34,2,null}]"
+ location="[{32,2,null},{33,2,null}]"
  />
  </block_quote>
  <block_quote>
@@ -78,7 +78,7 @@
  label="quote:c"
  destination="https://example.com/"
  title="example.com"
- location="[{35,4,null},{36,4,null}]"
+ location="[{35,4,null}]"
  />
  <reference
  label="quote:d"