michelf / php-markdown

Michelf/MarkdownExtra.php

Doc Comments +2 added lines, -2 removed lines

@@ -414,7 +414,7 @@ 
 	 * @param  integer $indent
 	 * @param  string  $enclosing_tag_re
 	 * @param  boolean $span
-	 * @return array
+	 * @return string[]
 	 */
 	protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
 										$enclosing_tag_re = '', $span = false)
@@ -629,7 +629,7 @@ 
 	 * @param  string $text
 	 * @param  string $hash_method
 	 * @param  bool $md_attr Handle `markdown="1"` attribute
-	 * @return array
+	 * @return string[]
 	 */
 	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 		if ($text === '') return array('', '');

Braces +60 added lines, -42 removed lines

@@ -187,8 +187,9 @@ 
 		$this->footnotes_assembled = null;
 
 		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
+			if ($this->abbr_word_re) {
+							$this->abbr_word_re .= '|';
+			}
 			$this->abbr_word_re .= preg_quote($abbr_word);
 			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		}
@@ -205,8 +206,9 @@ 
 		$this->abbr_desciptions = array();
 		$this->abbr_word_re = '';
 
-		if ( ! $this->omit_footnotes )
-			$this->footnotes_assembled = null;
+		if ( ! $this->omit_footnotes ) {
+					$this->footnotes_assembled = null;
+		}
 
 		parent::teardown();
 	}
@@ -259,7 +261,9 @@ 
 			if ($element[0] === '.') {
 				$classes[] = substr($element, 1);
 			} else if ($element[0] === '#') {
-				if ($id === false) $id = substr($element, 1);
+				if ($id === false) {
+					$id = substr($element, 1);
+				}
 			} else if (strpos($element, '=') > 0) {
 				$parts = explode('=', $element, 2);
 				$attributes[] = $parts[0] . '="' . $parts[1] . '"';
@@ -435,7 +439,9 @@ 
 										$enclosing_tag_re = '', $span = false)
 	{
 
-		if ($text === '') return array('', '');
+		if ($text === '') {
+			return array('', '');
+		}
 
 		// Regex to check for the presense of newlines around a block tag.
 		$newline_before_re = '/(?:^\n?|\n\n)*$/';
@@ -546,8 +552,7 @@ 
 					// End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					// No end marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -569,8 +574,7 @@ 
 					// End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					// Unmatched marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -623,8 +627,7 @@ 
 				}
 
 				$parsed .= $tag;
-			}
-			else {
+			} else {
 				$parsed .= $tag;
 			}
 		} while ($depth >= 0);
@@ -647,7 +650,9 @@ 
 	 * @return array
 	 */
 	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-		if ($text === '') return array('', '');
+		if ($text === '') {
+			return array('', '');
+		}
 
 		// Regex to match `markdown` attribute inside of a tag.
 		$markdown_attr_re = '
@@ -697,8 +702,9 @@ 
 
 		// Get the name of the starting tag.
 		// (This pattern makes $base_tag_name_re safe without quoting.)
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
+					$base_tag_name_re = $matches[1];
+		}
 
 		// Loop through every tag until we find the corresponding closing tag.
 		do {
@@ -727,8 +733,7 @@ 
 			{
 				// Just add the tag to the block as if it was text.
 				$block_text .= $tag;
-			}
-			else {
+			} else {
 				// Increase/decrease nested tag count. Only do so if
 				// the tag's name match base tag's.
 				if (preg_match('{^</?' . $base_tag_name_re . '\b}', $tag)) {
@@ -789,8 +794,9 @@ 
 
 					// Start over with a new block.
 					$block_text = "";
+				} else {
+					$block_text .= $tag;
 				}
-				else $block_text .= $tag;
 			}
 
 		} while ($depth > 0);
@@ -911,14 +917,14 @@ 
 				$title = $this->encodeAttribute($title);
 				$result .=  " title=\"$title\"";
 			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
+			if (isset($this->ref_attr[$link_id])) {
+							$result .= $this->ref_attr[$link_id];
+			}
 
 			$link_text = $this->runSpanGamut($link_text);
 			$result .= ">$link_text</a>";
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			$result = $whole_match;
 		}
 		return $result;
@@ -939,8 +945,9 @@ 
 		// if the URL was of the form <s p a c e s> it got caught by the HTML
 		// tag parser and hashed. Need to reverse the process before using the URL.
 		$unhashed = $this->unhash($url);
-		if ($unhashed !== $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		if ($unhashed !== $url) {
+					$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		}
 
 		$url = $this->encodeURLAttribute($url);
 
@@ -1031,9 +1038,15 @@ 
 			$url = $this->encodeURLAttribute($this->urls[$link_id]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
 			list($width, $height, $type, $attr) = getimagesize($url);
-			if(isset($width)) $result .= " width=\"$width\"";
-			if(isset($height)) $result .= " height=\"$height\"";
-			if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+			if(isset($width)) {
+				$result .= " width=\"$width\"";
+			}
+			if(isset($height)) {
+				$result .= " height=\"$height\"";
+			}
+			if(isset($width) && isset($height)) {
+				$result .= " loading=\"lazy\"";
+			}
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
@@ -1044,8 +1057,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			// If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -1069,9 +1081,15 @@ 
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		list($width, $height, $type, $attr) = getimagesize($url);
-		if(isset($width)) $result .= " width=\"$width\"";
-		if(isset($height)) $result .= " height=\"$height\"";
-		if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+		if(isset($width)) {
+			$result .= " width=\"$width\"";
+		}
+		if(isset($height)) {
+			$result .= " height=\"$height\"";
+		}
+		if(isset($width) && isset($height)) {
+			$result .= " loading=\"lazy\"";
+		}
 		if (isset($title) && $title_quote) {
 			$title = $this->encodeAttribute($title);
 			$result .=  " title=\"$title\""; // $title already quoted
@@ -1265,14 +1283,15 @@ 
 		// Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('right');
-			else if (preg_match('/^ *:-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('center');
-			else if (preg_match('/^ *:-+ *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('left');
-			else
-				$attr[$n] = '';
+			if (preg_match('/^ *-+: *$/', $s)) {
+							$attr[$n] = $this->_doTable_makeAlignAttr('right');
+			} else if (preg_match('/^ *:-+: *$/', $s)) {
+							$attr[$n] = $this->_doTable_makeAlignAttr('center');
+			} else if (preg_match('/^ *:-+ *$/', $s)) {
+							$attr[$n] = $this->_doTable_makeAlignAttr('left');
+			} else {
+							$attr[$n] = '';
+			}
 		}
 
 		// Parsing span elements, including code spans, character escapes,
@@ -1455,8 +1474,7 @@ 
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
 			$def = "\n". $def ."\n";
-		}
-		else {
+		} else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}

Michelf/Markdown.php

Braces +21 added lines, -8 removed lines

@@ -775,8 +775,9 @@ 
 		// tag parser and hashed. Need to reverse the process before using
 		// the URL.
 		$unhashed = $this->unhash($url);
-		if ($unhashed !== $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		if ($unhashed !== $url) {
+					$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		}
 
 		$url = $this->encodeURLAttribute($url);
 
@@ -865,9 +866,15 @@ 
 			$url = $this->encodeURLAttribute($this->urls[$link_id]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
 			list($width, $height, $type, $attr) = getimagesize($url);
-			if(isset($width)) $result .= " width=\"$width\"";
-			if(isset($height)) $result .= " height=\"$height\"";
-			if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+			if(isset($width)) {
+				$result .= " width=\"$width\"";
+			}
+			if(isset($height)) {
+				$result .= " height=\"$height\"";
+			}
+			if(isset($width) && isset($height)) {
+				$result .= " loading=\"lazy\"";
+			}
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
@@ -898,9 +905,15 @@ 
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		list($width, $height, $type, $attr) = getimagesize($url);
-		if(isset($width)) $result .= " width=\"$width\"";
-		if(isset($height)) $result .= " height=\"$height\"";
-		if(isset($width) && isset($height)) $result .= " loading=\"lazy\"";
+		if(isset($width)) {
+			$result .= " width=\"$width\"";
+		}
+		if(isset($height)) {
+			$result .= " height=\"$height\"";
+		}
+		if(isset($width) && isset($height)) {
+			$result .= " loading=\"lazy\"";
+		}
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
 			$result .=  " title=\"$title\""; // $title already quoted