Merge pull request #5314 from MrPetovan/task/4889-fix-tests

Fix tests after enabling PHP Notices

src/App.php

@@ -181,7 +181,10 @@ class App
 
 		$this->process_id = uniqid('log', true);
 
-		startup();
+		set_time_limit(0);
+
+		// This has to be quite large to deal with embedded private photos
+		ini_set('pcre.backtrack_limit', 500000);
 
 		$this->scheme = 'http';
 
@@ -290,7 +293,7 @@ class App
 		$this->is_tablet = $mobile_detect->isTablet();
 
 		// Friendica-Client
-		$this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)');
+		$this->is_friendica_app = isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)';
 
 		// Register template engines
 		$this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
@@ -863,7 +866,7 @@ class App
 			return;
 		}
 
-		array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
+		array_unshift($args, $this->getConfigValue('config', 'php_path', 'php'));
 
 		for ($x = 0; $x < count($args); $x ++) {
 			$args[$x] = escapeshellarg($args[$x]);
@@ -875,7 +878,7 @@ class App
 			return;
 		}
 
-		if (Config::get('system', 'proc_windows')) {
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 			$resource = proc_open('cmd /c start /b ' . $cmdline, [], $foo, $this->get_basepath());
 		} else {
 			$resource = proc_open($cmdline . ' &', [], $foo, $this->get_basepath());

src/Core/System.php

@@ -72,6 +72,7 @@ class System extends BaseObject
 				}
 			} elseif (!in_array($func['function'], $ignore)) {
 				$callstack[] = $func['function'];
+				$func['class'] = '';
 				$previous = $func;
 			}
 		}

src/Database/DBStructure.php

@@ -412,7 +412,7 @@ class DBStructure
 					$field_definition = $database[$name]["fields"][$fieldname];
 
 					// Define the default collation if not given
-					if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) {
+					if (!isset($parameters['Collation']) && !empty($field_definition['Collation'])) {
 						$parameters['Collation'] = 'utf8mb4_general_ci';
 					} else {
 						$parameters['Collation'] = null;
@@ -536,26 +536,26 @@ class DBStructure
 	private static function FieldCommand($parameters, $create = true) {
 		$fieldstruct = $parameters["type"];
 
-		if (!is_null($parameters["Collation"])) {
+		if (!empty($parameters["Collation"])) {
 			$fieldstruct .= " COLLATE ".$parameters["Collation"];
 		}
 
-		if ($parameters["not null"]) {
+		if (!empty($parameters["not null"])) {
 			$fieldstruct .= " NOT NULL";
 		}
 
-		if (isset($parameters["default"])) {
+		if (!empty($parameters["default"])) {
 			if (strpos(strtolower($parameters["type"]),"int")!==false) {
 				$fieldstruct .= " DEFAULT ".$parameters["default"];
 			} else {
 				$fieldstruct .= " DEFAULT '".$parameters["default"]."'";
 			}
 		}
-		if ($parameters["extra"] != "") {
+		if (!empty($parameters["extra"])) {
 			$fieldstruct .= " ".$parameters["extra"];
 		}
 
-		if (!is_null($parameters["comment"])) {
+		if (!empty($parameters["comment"])) {
 			$fieldstruct .= " COMMENT '".dbesc($parameters["comment"])."'";
 		}
 
@@ -579,7 +579,7 @@ class DBStructure
 			}
 		}
 
-		if (!is_null($structure["indexes"])) {
+		if (!empty($structure["indexes"])) {
 			foreach ($structure["indexes"] AS $indexname => $fieldnames) {
 				$sql_index = self::createIndex($indexname, $fieldnames, "");
 				if (!is_null($sql_index)) {
@@ -588,11 +588,11 @@ class DBStructure
 			}
 		}
 
-		if (!is_null($structure["engine"])) {
+		if (!empty($structure["engine"])) {
 			$engine = " ENGINE=" . $structure["engine"];
 		}
 
-		if (!is_null($structure["comment"])) {
+		if (!empty($structure["comment"])) {
 			$comment = " COMMENT='" . dbesc($structure["comment"]) . "'";
 		}
 

src/Model/Conversation.php

@@ -61,7 +61,7 @@ class Conversation
 					unset($old_conv['source']);
 				}
 				// Update structure data all the time but the source only when its from a better protocol.
-				if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+				if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
 					unset($conversation['protocol']);
 					unset($conversation['source']);
 				}

src/Model/Item.php

@@ -809,7 +809,9 @@ class Item extends BaseObject
 		// If item has attachments, drop them
 		foreach (explode(", ", $item['attach']) as $attach) {
 			preg_match("|attach/(\d+)|", $attach, $matches);
-			dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+			if (is_array($matches) && count($matches) > 1) {
+				dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+			}
 		}
 
 		// Delete tags that had been attached to other items
@@ -1997,7 +1999,7 @@ class Item extends BaseObject
 			Contact::unmarkForArchival($contact);
 		}
 
-		$update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
+		$update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
 
 		// Is it a forum? Then we don't care about the rules from above
 		if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {

src/Network/Probe.php

@@ -109,6 +109,7 @@ class Probe
 		$redirects = 0;
 
 		logger("Probing for ".$host, LOGGER_DEBUG);
+		$xrd = null;
 
 		$ret = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 		if ($ret['success']) {
@@ -1510,6 +1511,7 @@ class Probe
 			return false;
 		}
 		$feed = $ret['body'];
+		$dummy1 = $dummy2 = $dummy3 = null;
 		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 
 		if (!$feed_data) {