Skip to content

PHP 8 Compatibility #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bviktor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PHP 8 Compatibility #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion includes/class-ghf-markdown-parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ public function _doFencedCodeBlocks_callback( $matches ) {
$classname =& $matches[2];
$codeblock = preg_replace_callback('/^\n+/', array( $this, '_doFencedCodeBlocks_newlines' ), $matches[4] );

if ( $classname{0} == '.' )
if ( $classname[0] == '.' )
$classname = substr( $classname, 1 );

$codeblock = esc_html( $codeblock );
Expand Down
36 changes: 18 additions & 18 deletions includes/class-markdown-parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ function _doHeaders_callback_setext($matches) {
if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
return $matches[0];

$level = $matches[2]{0} == '=' ? 1 : 2;
$level = $matches[2][0] == '=' ? 1 : 2;
$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
return "\n" . $this->hashBlock($block) . "\n\n";
}
Expand Down Expand Up @@ -1093,7 +1093,7 @@ function doItalicsAndBold($text) {
} else {
# Other closing marker: close one em or strong and
# change current token state to match the other
$token_stack[0] = str_repeat($token{0}, 3-$token_len);
$token_stack[0] = str_repeat($token[0], 3-$token_len);
$tag = $token_len == 2 ? "strong" : "em";
$span = $text_stack[0];
$span = $this->runSpanGamut($span);
Expand All @@ -1118,7 +1118,7 @@ function doItalicsAndBold($text) {
} else {
# Reached opening three-char emphasis marker. Push on token
# stack; will be handled by the special condition above.
$em = $token{0};
$em = $token[0];
$strong = "$em$em";
array_unshift($token_stack, $token);
array_unshift($text_stack, '');
Expand Down Expand Up @@ -1458,9 +1458,9 @@ function handleSpanToken($token, &$str) {
# Handle $token provided by parseSpan by determining its nature and
# returning the corresponding value that should replace it.
#
switch ($token{0}) {
switch ($token[0]) {
case "\\":
return $this->hashPart("&#". ord($token{1}). ";");
return $this->hashPart("&#". ord($token[1]). ";");
case "`":
# Search for end marker in remaining text.
if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
Expand Down Expand Up @@ -1681,9 +1681,9 @@ function doExtraAttributes($tag_name, $attr) {
$classes = array();
$id = false;
foreach ($elements as $element) {
if ($element{0} == '.') {
if ($element[0] == '.') {
$classes[] = substr($element, 1);
} else if ($element{0} == '#') {
} else if ($element[0] == '#') {
if ($id === false) $id = substr($element, 1);
}
}
Expand Down Expand Up @@ -1946,7 +1946,7 @@ function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
#
# Check for: Indented code block.
#
else if ($tag{0} == "\n" || $tag{0} == " ") {
else if ($tag[0] == "\n" || $tag[0] == " ") {
# Indented code block: pass it unchanged, will be handled
# later.
$parsed .= $tag;
Expand All @@ -1955,7 +1955,7 @@ function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
# Check for: Code span marker
# Note: need to check this after backtick fenced code blocks
#
else if ($tag{0} == "`") {
else if ($tag[0] == "`") {
# Find corresponding end marker.
$tag_re = preg_quote($tag);
if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
Expand Down Expand Up @@ -1993,7 +1993,7 @@ function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
# HTML Comments, processing instructions.
#
else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
$tag{1} == '!' || $tag{1} == '?')
$tag[1] == '!' || $tag[1] == '?')
{
# Need to parse tag and following text using the HTML parser.
# (don't check for markdown attribute)
Expand All @@ -2012,8 +2012,8 @@ function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
#
# Increase/decrease nested tag count.
#
if ($tag{1} == '/') $depth--;
else if ($tag{strlen($tag)-2} != '/') $depth++;
if ($tag[1] == '/') $depth--;
else if ($tag[strlen($tag)-2] != '/') $depth++;

if ($depth < 0) {
#
Expand Down Expand Up @@ -2117,7 +2117,7 @@ function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
# first character as filtered to prevent an infinite loop in the
# parent function.
#
return array($original_text{0}, substr($original_text, 1));
return array($original_text[0], substr($original_text, 1));
}

$block_text .= $parts[0]; # Text before current tag.
Expand All @@ -2129,7 +2129,7 @@ function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
# Comments and Processing Instructions.
#
if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
$tag{1} == '!' || $tag{1} == '?')
$tag[1] == '!' || $tag[1] == '?')
{
# Just add the tag to the block as if it was text.
$block_text .= $tag;
Expand All @@ -2140,8 +2140,8 @@ function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
# the tag's name match base tag's.
#
if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
if ($tag{1} == '/') $depth--;
else if ($tag{strlen($tag)-2} != '/') $depth++;
if ($tag[1] == '/') $depth--;
else if ($tag[strlen($tag)-2] != '/') $depth++;
}

#
Expand Down Expand Up @@ -2499,7 +2499,7 @@ function doHeaders($text) {
function _doHeaders_callback_setext($matches) {
if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
return $matches[0];
$level = $matches[3]{0} == '=' ? 1 : 2;
$level = $matches[3][0] == '=' ? 1 : 2;
$attr = $this->doExtraAttributes("h$level", $dummy =& $matches[2]);
$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
return "\n" . $this->hashBlock($block) . "\n\n";
Expand Down Expand Up @@ -2817,7 +2817,7 @@ function _doFencedCodeBlocks_callback($matches) {
array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);

if ($classname != "") {
if ($classname{0} == '.')
if ($classname[0] == '.')
$classname = substr($classname, 1);
$attr_str = ' class="'.$this->code_class_prefix.$classname.'"';
} else {
Expand Down