1
0
mirror of https://github.com/erusev/parsedown.git synced 2023-08-10 21:13:06 +03:00

Readability improvements, thanks @PhrozenByte

This commit is contained in:
Aidan Woods 2018-04-12 22:16:25 +01:00
parent 88a3f31dd7
commit 3e70819a20
No known key found for this signature in database
GPG Key ID: 9A6A8EFAA512BBB9

View File

@ -182,11 +182,8 @@ class Parsedown
continue; continue;
} }
for ( while (($beforeTab = strstr($line, "\t", true)) !== false)
$beforeTab = strstr($line, "\t", true); {
$beforeTab !== false;
$beforeTab = strstr($line, "\t", true)
) {
$shortage = 4 - mb_strlen($beforeTab, 'utf-8') % 4; $shortage = 4 - mb_strlen($beforeTab, 'utf-8') % 4;
$line = $beforeTab $line = $beforeTab
@ -207,7 +204,8 @@ class Parsedown
if (isset($CurrentBlock['continuable'])) if (isset($CurrentBlock['continuable']))
{ {
$Block = $this->{"block{$CurrentBlock['type']}Continue"}($Line, $CurrentBlock); $methodName = 'block' . $CurrentBlock['type'] . 'Continue';
$Block = $this->$methodName($Line, $CurrentBlock);
if (isset($Block)) if (isset($Block))
{ {
@ -219,7 +217,8 @@ class Parsedown
{ {
if ($this->isBlockCompletable($CurrentBlock['type'])) if ($this->isBlockCompletable($CurrentBlock['type']))
{ {
$CurrentBlock = $this->{"block{$CurrentBlock['type']}Complete"}($CurrentBlock); $methodName = 'block' . $CurrentBlock['type'] . 'Complete';
$CurrentBlock = $this->$methodName($CurrentBlock);
} }
} }
} }
@ -300,7 +299,8 @@ class Parsedown
if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type'])) if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
{ {
$CurrentBlock = $this->{"block{$CurrentBlock['type']}Complete"}($CurrentBlock); $methodName = 'block' . $CurrentBlock['type'] . 'Complete';
$CurrentBlock = $this->$methodName($CurrentBlock);
} }
# ~ # ~
@ -317,12 +317,12 @@ class Parsedown
protected function isBlockContinuable($Type) protected function isBlockContinuable($Type)
{ {
return method_exists($this, "block${Type}Continue"); return method_exists($this, 'block' . $Type . 'Continue');
} }
protected function isBlockCompletable($Type) protected function isBlockCompletable($Type)
{ {
return method_exists($this, "block${Type}Complete"); return method_exists($this, 'block' . $Type . 'Complete');
} }
# #
@ -1138,10 +1138,11 @@ class Parsedown
# cause the new element to 'inherit' our non nestables # cause the new element to 'inherit' our non nestables
foreach ($nonNestables as $nonNestable)
{ $Inline['element']['nonNestables'] = isset($Inline['element']['nonNestables'])
$Inline['element']['nonNestables'][] = $nonNestable; ? array_merge($Inline['element']['nonNestables'], $nonNestables)
} : $nonNestables
;
# the text that comes before the inline # the text that comes before the inline
$unmarkedText = substr($text, 0, $Inline['position']); $unmarkedText = substr($text, 0, $Inline['position']);