Merge pull request #46 from MrPetovan/release/2.3.1

Release 2.3.1
friendica · Jun 20, 2020 · 937fedc · 937fedc
2 parents b693378 + 0c20313
commit 937fedc
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "laminas/laminas-escaper": "^2.6",
         "masterminds/html5": "^2.3",
         "monolog/monolog": "^1.17",
-        "mrpetovan/net_ping": "^1.0",
+        "mrpetovan/net_ping": "^1.2",
         "sarahman/simple-filesystem-cache": "^1.0",
         "seld/cli-prompt": "^1.0",
         "slim/slim": "^3.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php
@@ -141,7 +141,7 @@ public function __invoke(string $profile_uri)
 		}
 
 		// Empty result is due to an offline site.
-		if (count($params) < 2) {
+		if (empty($params) || count($params) < 2) {
 			//But for sites that are already in bad status. Do a cleanup now.
 			if ($profile_id && $server['health_score'] < $this->settings['remove_profile_health_threshold']) {
 				$this->profileModel->deleteById($profile_id);

diff --git a/src/classes/Utils/Scrape.php b/src/classes/Utils/Scrape.php
@@ -23,7 +23,7 @@ public static function retrieveNoScrapeData(string $url)
 		}
 
 		$params = json_decode($data, true);
-		if (!$params || !count($params)) {
+		if (empty($params) || !is_array($params)) {
 			return false;
 		}