diff --git a/src/Console/Typo.php b/src/Console/Typo.php
index 5f5fa0ba6..216d05723 100644
--- a/src/Console/Typo.php
+++ b/src/Console/Typo.php
@@ -43,7 +43,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- $php_path = BaseObject::getApp()->getConfigCache()->get('config', 'php_path', 'php');
+ $php_path = BaseObject::getApp()->getConfig()->get('config', 'php_path', 'php');
if ($this->getOption('v')) {
$this->out('Directory: src');
@@ -57,6 +57,18 @@ HELP;
}
}
+ if ($this->getOption('v')) {
+ $this->out('Directory: tests');
+ }
+
+ $Iterator = new \RecursiveDirectoryIterator('tests');
+
+ foreach (new \RecursiveIteratorIterator($Iterator) as $file) {
+ if (substr($file, -4) === '.php') {
+ $this->checkFile($php_path, $file);
+ }
+ }
+
if ($this->getOption('v')) {
$this->out('Directory: mod');
}
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 146dedf47..2113c6fa2 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -72,9 +72,7 @@ class BBCode extends BaseObject
$attacheddata = $data[2];
- $URLSearchString = "^\[\]";
-
- if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
+ if (preg_match("/\[img\](.*?)\[\/img\]/ism", $attacheddata, $matches)) {
$picturedata = Image::getInfoFromURL($matches[1]);
@@ -87,12 +85,12 @@ class BBCode extends BaseObject
}
}
- if (preg_match("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", $attacheddata, $matches)) {
+ if (preg_match("/\[bookmark\=(.*?)\](.*?)\[\/bookmark\]/ism", $attacheddata, $matches)) {
$post["url"] = $matches[1];
$post["title"] = $matches[2];
}
if (!empty($post["url"]) && (in_array($post["type"], ["link", "video"]))
- && preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
+ && preg_match("/\[url\=(.*?)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
$post["url"] = $matches[1];
}
@@ -245,11 +243,9 @@ class BBCode extends BaseObject
// Simplify image codes
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
- $URLSearchString = "^\[\]";
+ $body = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
- $body = preg_replace("/\[img\=([$URLSearchString]*)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
-
- if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) {
+ if (preg_match_all("(\[url=(.*?)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) {
if ((count($pictures) == 1) && !$has_title) {
if (!empty($item['object-type']) && ($item['object-type'] == ACTIVITY_OBJ_IMAGE)) {
// Replace the preview picture with the real picture
@@ -293,7 +289,7 @@ class BBCode extends BaseObject
$post["image"] = $pictures[0][2];
$post["text"] = $body;
}
- } elseif (preg_match_all("(\[img\]([$URLSearchString]*)\[\/img\])ism", $body, $pictures, PREG_SET_ORDER)) {
+ } elseif (preg_match_all("(\[img\](.*?)\[\/img\])ism", $body, $pictures, PREG_SET_ORDER)) {
if ((count($pictures) == 1) && !$has_title) {
$post["type"] = "photo";
$post["image"] = $pictures[0][1];
@@ -307,8 +303,8 @@ class BBCode extends BaseObject
}
// Test for the external links
- preg_match_all("(\[url\]([$URLSearchString]*)\[\/url\])ism", $body, $links1, PREG_SET_ORDER);
- preg_match_all("(\[url\=([$URLSearchString]*)\].*?\[\/url\])ism", $body, $links2, PREG_SET_ORDER);
+ preg_match_all("(\[url\](.*?)\[\/url\])ism", $body, $links1, PREG_SET_ORDER);
+ preg_match_all("(\[url\=(.*?)\].*?\[\/url\])ism", $body, $links2, PREG_SET_ORDER);
$links = array_merge($links1, $links2);
@@ -1281,131 +1277,11 @@ class BBCode extends BaseObject
} while ($oldtext != $text);
}
- // Set up the parameters for a URL search string
- $URLSearchString = "^\[\]";
- // Set up the parameters for a MAIL search string
- $MAILSearchString = $URLSearchString;
-
// Handle attached links or videos
$text = self::convertAttachment($text, $simple_html, $try_oembed);
- // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
- if (!$for_plaintext) {
- $text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
- if (in_array($simple_html, [7, 9])) {
- $text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
- $text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
- }
- } else {
- $text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $text);
- $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::removePictureLinksCallback', $text);
- }
-
- $text = str_replace(["\r","\n"], ['
', '
'], $text);
-
- // Remove all hashtag addresses
- if ((!$try_oembed || $simple_html) && !in_array($simple_html, [3, 7, 9])) {
- $text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $text);
- } elseif ($simple_html == 3) {
- // The ! is converted to @ since Diaspora only understands the @
- $text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
- '@$3',
- $text);
- } elseif (in_array($simple_html, [7, 9])) {
- $text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
- '$1$3',
- $text);
- } elseif (!$simple_html) {
- $text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
- '$1$3',
- $text);
- }
-
- // Bookmarks in red - will be converted to bookmarks in friendica
- $text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text);
- $text = preg_replace("/#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text);
- $text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
- "[bookmark=$1]$2[/bookmark]", $text);
-
- if (in_array($simple_html, [2, 6, 7, 8])) {
- $text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "self::expandLinksCallback", $text);
- //$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
- $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$text);
- }
-
- if ($simple_html == 5) {
- $text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $text);
- }
-
- // Perform URL Search
- if ($try_oembed) {
- $text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $try_oembed_callback, $text);
- }
-
- if ($simple_html == 5) {
- $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $text);
- } else {
- $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $text);
- }
-
- // Handle Diaspora posts
- $text = preg_replace_callback(
- "&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
- function ($match) {
- return "[url=" . System::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]";
- }, $text
- );
-
- $text = preg_replace_callback(
- "&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
- function ($match) {
- return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
- }, $text
- );
-
- // Server independent link to posts and comments
- // See issue: https://github.com/diaspora/diaspora_federation/issues/75
- $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
- $text = preg_replace($expression, System::baseUrl()."/display/$1", $text);
-
- /* Tag conversion
- * Supports:
- * - #[url=][/url]
- * - [url=]#[/url]
- */
- $text = preg_replace_callback("/(?:#\[url\=[$URLSearchString]*\]|\[url\=[$URLSearchString]*\]#)(.*?)\[\/url\]/ism", function($matches) {
- return '#'
- . XML::escape($matches[1])
- . '';
- }, $text);
-
- // We need no target="_blank" for local links
- // convert links start with System::baseUrl() as local link without the target="_blank" attribute
- $escapedBaseUrl = preg_quote(System::baseUrl(), '/');
- $text = preg_replace("/\[url\](".$escapedBaseUrl."[$URLSearchString]*)\[\/url\]/ism", '$1', $text);
- $text = preg_replace("/\[url\=(".$escapedBaseUrl."[$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $text);
-
- $text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $text);
- $text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $text);
-
- // Red compatibility, though the link can't be authenticated on Friendica
- $text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $text);
-
-
- // we may need to restrict this further if it picks up too many strays
- // link acct:user@host to a webfinger profile redirector
-
- $text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $text);
-
- // Perform MAIL Search
- $text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '$1', $text);
- $text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '$2', $text);
-
// leave open the posibility of [map=something]
// this is replaced in Item::prepareBody() which has knowledge of the item location
-
if (strpos($text, '[/map]') !== false) {
$text = preg_replace_callback(
"/\[map\](.*?)\[\/map\]/ism",
@@ -1415,6 +1291,7 @@ class BBCode extends BaseObject
$text
);
}
+
if (strpos($text, '[map=') !== false) {
$text = preg_replace_callback(
"/\[map=(.*?)\]/ism",
@@ -1424,6 +1301,7 @@ class BBCode extends BaseObject
$text
);
}
+
if (strpos($text, '[map]') !== false) {
$text = preg_replace("/\[map\]/", '', $text);
}
@@ -1490,9 +1368,9 @@ class BBCode extends BaseObject
$endlessloop = 0;
while ((((strpos($text, "[/list]") !== false) && (strpos($text, "[list") !== false)) ||
- ((strpos($text, "[/ol]") !== false) && (strpos($text, "[ol]") !== false)) ||
- ((strpos($text, "[/ul]") !== false) && (strpos($text, "[ul]") !== false)) ||
- ((strpos($text, "[/li]") !== false) && (strpos($text, "[li]") !== false))) && (++$endlessloop < 20)) {
+ ((strpos($text, "[/ol]") !== false) && (strpos($text, "[ol]") !== false)) ||
+ ((strpos($text, "[/ul]") !== false) && (strpos($text, "[ul]") !== false)) ||
+ ((strpos($text, "[/li]") !== false) && (strpos($text, "[li]") !== false))) && (++$endlessloop < 20)) {
$text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '', $text);
$text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '', $text);
$text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '', $text);
@@ -1540,8 +1418,8 @@ class BBCode extends BaseObject
$endlessloop = 0;
while ((strpos($text, "[/spoiler]")!== false) && (strpos($text, "[spoiler=") !== false) && (++$endlessloop < 20)) {
$text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
- "
" . $t_wrote . "$2
",
- $text);
+ "
" . $t_wrote . "$2
",
+ $text);
}
// Declare the format for [quote] layout
@@ -1562,8 +1440,8 @@ class BBCode extends BaseObject
$endlessloop = 0;
while ((strpos($text, "[/quote]")!== false) && (strpos($text, "[quote=") !== false) && (++$endlessloop < 20)) {
$text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
- "" . $t_wrote . "
$2
",
- $text);
+ "" . $t_wrote . "
$2
",
+ $text);
}
@@ -1584,7 +1462,7 @@ class BBCode extends BaseObject
$text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $text);
$text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '', $text);
- $text = preg_replace_callback("/\[img\=([$URLSearchString]*)\](.*?)\[\/img\]/ism",
+ $text = preg_replace_callback("/\[img\=(.*?)\](.*?)\[\/img\]/ism",
function ($matches) use ($simple_html) {
$matches[1] = self::proxyUrl($matches[1], $simple_html);
$matches[2] = htmlspecialchars($matches[2], ENT_COMPAT);
@@ -1631,9 +1509,9 @@ class BBCode extends BaseObject
$text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", $try_oembed_callback, $text);
} else {
$text = preg_replace("/\[video\](.*?)\[\/video\]/ism",
- '$1', $text);
+ '$1', $text);
$text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism",
- '$1', $text);
+ '$1', $text);
}
// html5 video and audio
@@ -1660,7 +1538,7 @@ class BBCode extends BaseObject
$text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $text);
} else {
$text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
- 'https://www.youtube.com/watch?v=$1', $text);
+ 'https://www.youtube.com/watch?v=$1', $text);
}
if ($try_oembed) {
@@ -1675,7 +1553,7 @@ class BBCode extends BaseObject
$text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $text);
} else {
$text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
- 'https://vimeo.com/$1', $text);
+ 'https://vimeo.com/$1', $text);
}
// oembed tag
@@ -1706,6 +1584,120 @@ class BBCode extends BaseObject
$text = Smilies::replace($text);
}
+ // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
+ if (!$for_plaintext) {
+ $text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
+ if (in_array($simple_html, [7, 9])) {
+ $text = preg_replace_callback("/\[url\](.*?)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
+ $text = preg_replace_callback("/\[url\=(.*?)\](.*?)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
+ }
+ } else {
+ $text = preg_replace("(\[url\](.*?)\[\/url\])ism", " $1 ", $text);
+ $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::removePictureLinksCallback', $text);
+ }
+
+ $text = str_replace(["\r","\n"], ['
', '
'], $text);
+
+ // Remove all hashtag addresses
+ if ((!$try_oembed || $simple_html) && !in_array($simple_html, [3, 7, 9])) {
+ $text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text);
+ } elseif ($simple_html == 3) {
+ // The ! is converted to @ since Diaspora only understands the @
+ $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
+ '@$3',
+ $text);
+ } elseif (in_array($simple_html, [7, 9])) {
+ $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
+ '$1$3',
+ $text);
+ } elseif (!$simple_html) {
+ $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
+ '$1$3',
+ $text);
+ }
+
+ // Bookmarks in red - will be converted to bookmarks in friendica
+ $text = preg_replace("/#\^\[url\](.*?)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text);
+ $text = preg_replace("/#\^\[url\=(.*?)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text);
+ $text = preg_replace("/#\[url\=.*?\]\^\[\/url\]\[url\=(.*?)\](.*?)\[\/url\]/i",
+ "[bookmark=$1]$2[/bookmark]", $text);
+
+ if (in_array($simple_html, [2, 6, 7, 8])) {
+ $text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "self::expandLinksCallback", $text);
+ //$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
+ $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$text);
+ }
+
+ if ($simple_html == 5) {
+ $text = preg_replace("/[^#@!]\[url\=(.*?)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $text);
+ }
+
+ // Perform URL Search
+ if ($try_oembed) {
+ $text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $try_oembed_callback, $text);
+ }
+
+ if ($simple_html == 5) {
+ $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $text);
+ } else {
+ $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $text);
+ }
+
+ // Handle Diaspora posts
+ $text = preg_replace_callback(
+ "&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
+ function ($match) {
+ return "[url=" . System::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]";
+ }, $text
+ );
+
+ $text = preg_replace_callback(
+ "&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
+ function ($match) {
+ return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
+ }, $text
+ );
+
+ // Server independent link to posts and comments
+ // See issue: https://github.com/diaspora/diaspora_federation/issues/75
+ $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
+ $text = preg_replace($expression, System::baseUrl()."/display/$1", $text);
+
+ /* Tag conversion
+ * Supports:
+ * - #[url=][/url]
+ * - [url=]#[/url]
+ */
+ $text = preg_replace_callback("/(?:#\[url\=.*?\]|\[url\=.*?\]#)(.*?)\[\/url\]/ism", function($matches) {
+ return '#'
+ . XML::escape($matches[1])
+ . '';
+ }, $text);
+
+ // We need no target="_blank" for local links
+ // convert links start with System::baseUrl() as local link without the target="_blank" attribute
+ $escapedBaseUrl = preg_quote(System::baseUrl(), '/');
+ $text = preg_replace("/\[url\](".$escapedBaseUrl.".*?)\[\/url\]/ism", '$1', $text);
+ $text = preg_replace("/\[url\=(".$escapedBaseUrl.".*?)\](.*?)\[\/url\]/ism", '$2', $text);
+
+ $text = preg_replace("/\[url\](.*?)\[\/url\]/ism", '$1', $text);
+ $text = preg_replace("/\[url\=(.*?)\](.*?)\[\/url\]/ism", '$2', $text);
+
+ // Red compatibility, though the link can't be authenticated on Friendica
+ $text = preg_replace("/\[zrl\=(.*?)\](.*?)\[\/zrl\]/ism", '$2', $text);
+
+
+ // we may need to restrict this further if it picks up too many strays
+ // link acct:user@host to a webfinger profile redirector
+
+ $text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $text);
+
+ // Perform MAIL Search
+ $text = preg_replace("/\[mail\](.*?)\[\/mail\]/", '$1', $text);
+ $text = preg_replace("/\[mail\=(.*?)\](.*?)\[\/mail\]/", '$2', $text);
+
// Unhide all [noparse] contained bbtags unspacefying them
// and triming the [noparse] tag.
diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 864a3794d..3efb40893 100644
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -113,6 +113,14 @@ class BBCodeTest extends MockedTest
'data' => html_entity_decode('http://example.com ', ENT_QUOTES, 'UTF-8'),
'assertHTML' => false
],
+ 'bug-7271-query-string-brackets' => [
+ 'data' => 'https://example.com/search?q=square+brackets+[url]',
+ 'assertHTML' => true
+ ],
+ 'bug-7271-path-brackets' => [
+ 'data' => 'http://example.com/path/to/file[3].html',
+ 'assertHTML' => true
+ ],
];
}
@@ -134,4 +142,47 @@ class BBCodeTest extends MockedTest
$this->assertNotEquals($assert, $output);
}
}
+
+ public function dataBBCodes()
+ {
+ return [
+ 'bug-7271-condensed-space' => [
+ 'expectedHtml' => '',
+ 'text' => '[ol][*] http://example.com/[/ol]',
+ ],
+ 'bug-7271-condensed-nospace' => [
+ 'expectedHtml' => '',
+ 'text' => '[ol][*]http://example.com/[/ol]',
+ ],
+ 'bug-7271-indented-space' => [
+ 'expectedHtml' => '',
+ 'text' => '[ul]
+[*] http://example.com/
+[/ul]',
+ ],
+ 'bug-7271-indented-nospace' => [
+ 'expectedHtml' => '',
+ 'text' => '[ul]
+[*]http://example.com/
+[/ul]',
+ ],
+ ];
+ }
+
+ /**
+ * Test convert bbcodes to HTML
+ * @dataProvider dataBBCodes
+ *
+ * @param string $expectedHtml Expected HTML output
+ * @param string $text BBCode text
+ * @param int $simpleHtml BBCode::convert method $simple_html parameter value, optional.
+ * @param bool $forPlaintext BBCode::convert method $for_plaintext parameter value, optional.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ public function testConvert($expectedHtml, $text, $simpleHtml = 0, $forPlaintext = false)
+ {
+ $actual = BBCode::convert($text, false, $simpleHtml, $forPlaintext);
+
+ $this->assertEquals($expectedHtml, $actual);
+ }
}