Merge branch 'dev' into 'dev'

Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.

See merge request hubzilla/core!1332

(cherry picked from commit c39de966df2ff28674697be77a527b2214afef42)

b77acb3e add gitlab-ci.yml and phpunit.xml
22275f30 fix dba_pdoTest
0db047e5 fix phpunit error with html2markdown test and temporary disable failing markdown…

1 files changed, 4 insertions, 3 deletions

diff --git a/include/markdown.php b/include/markdown.php
index 6af055366..d2148811c 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -251,9 +251,6 @@ function bb_to_markdown($Text, $options = []) {
 	// Markdownify does not preserve previously escaped html entities such as <> and &.
 	//$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
 
-	// This might fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity
-	$Text = str_replace("&", "&amp;", $Text);
-
 	// Now convert HTML to Markdown
 
 	$Text = html2markdown($Text);
@@ -299,6 +296,8 @@ function bb_to_markdown($Text, $options = []) {
 function html2markdown($html,$options = []) {
 	$markdown = '';
 
+	$internal_errors = libxml_use_internal_errors(true);
+
 	$environment = Environment::createDefaultEnvironment($options);
 	$environment->addConverter(new TableConverter());
 	$converter = new HtmlConverter($environment);
@@ -309,6 +308,8 @@ function html2markdown($html,$options = []) {
 		logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
 	}
 
+	libxml_use_internal_errors($internal_errors);
+
 	return $markdown;
 }