From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 21 Jul 2018 02:05:12 +0000 (-0400)
Subject: Rename DBA::num_rows to DBA::numRows
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=415b982d39e4ac87e6ab4b39c7b2e74b349b7938;p=friendica.git

Rename DBA::num_rows to DBA::numRows
---

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index a8f35d4f3e..f5e704e272 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -498,7 +498,7 @@ class Worker
 		// The processlist only shows entries of the current user
 		if ($max != 0) {
 			$r = DBA::p('SHOW PROCESSLIST');
-			$used = DBA::num_rows($r);
+			$used = DBA::numRows($r);
 			DBA::close($r);
 
 			logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 7bf38c9b7b..fab07862a2 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -666,7 +666,7 @@ class DBA
 		if (is_bool($stmt)) {
 			$retval = $stmt;
 		} else {
-			$retval = (self::num_rows($stmt) > 0);
+			$retval = (self::numRows($stmt) > 0);
 		}
 
 		self::close($stmt);
@@ -732,7 +732,7 @@ class DBA
 	 * @param PDOStatement|mysqli_result|mysqli_stmt Statement object
 	 * @return int Number of rows
 	 */
-	public static function num_rows($stmt) {
+	public static function numRows($stmt) {
 		if (!is_object($stmt)) {
 			return 0;
 		}
diff --git a/src/Database/DBM.php b/src/Database/DBM.php
index ff57a065b8..62e5bee2e2 100644
--- a/src/Database/DBM.php
+++ b/src/Database/DBM.php
@@ -64,7 +64,7 @@ class DBM
 		}
 
 		if (is_object($array)) {
-			return DBA::num_rows($array) > 0;
+			return DBA::numRows($array) > 0;
 		}
 
 		return (is_array($array) && (count($array) > 0));
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index ac803761ac..cb2ba08a14 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -706,7 +706,7 @@ class DBStructure
 		if (is_bool($stmt)) {
 			$retval = $stmt;
 		} else {
-			$retval = (DBA::num_rows($stmt) > 0);
+			$retval = (DBA::numRows($stmt) > 0);
 		}
 
 		DBA::close($stmt);
@@ -741,7 +741,7 @@ class DBStructure
 			if (is_bool($stmt)) {
 				$retval = $stmt;
 			} else {
-				$retval = (DBA::num_rows($stmt) > 0);
+				$retval = (DBA::numRows($stmt) > 0);
 			}
 
 			DBA::close($stmt);
diff --git a/src/Model/Item.php b/src/Model/Item.php
index b9ba0d4c37..46d0187da9 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -272,7 +272,7 @@ class Item extends BaseObject
 		if (is_bool($stmt)) {
 			$retval = $stmt;
 		} else {
-			$retval = (DBA::num_rows($stmt) > 0);
+			$retval = (DBA::numRows($stmt) > 0);
 		}
 
 		DBA::close($stmt);
diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 7b4e0f3acf..c839bced19 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -85,7 +85,7 @@ class DBClean {
 						NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
 						`received` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `id` >= ?
 					ORDER BY `id` LIMIT ".intval($limit), $days_unclaimed, $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found global item orphans: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -107,7 +107,7 @@ class DBClean {
 			$r = DBA::p("SELECT `id` FROM `item`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`)
 					AND `id` >= ? ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found item orphans without parents: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -133,7 +133,7 @@ class DBClean {
 			$r = DBA::p("SELECT `iid` FROM `thread`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) AND `iid` >= ?
 					ORDER BY `iid` LIMIT ".intval($limit), $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found thread orphans: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -159,7 +159,7 @@ class DBClean {
 			$r = DBA::p("SELECT `iid`, `id` FROM `notify`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) AND `id` >= ?
 					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found notify orphans: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -185,7 +185,7 @@ class DBClean {
 			$r = DBA::p("SELECT `id` FROM `notify-threads`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) AND `id` >= ?
 					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found notify-threads orphans: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -211,7 +211,7 @@ class DBClean {
 			$r = DBA::p("SELECT `iid`, `id` FROM `sign`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) AND `id` >= ?
 					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found sign orphans: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -237,7 +237,7 @@ class DBClean {
 			$r = DBA::p("SELECT `oid`, `tid` FROM `term`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) AND `tid` >= ?
 					ORDER BY `tid` LIMIT ".intval($limit), $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found term orphans: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -276,7 +276,7 @@ class DBClean {
 	                                                                OR (`item`.`attach` != '') OR `item`.`wall` OR `item`.`origin`)
 	                                                                AND `item`.`parent` = `thread`.`iid`)
 	                                ORDER BY `thread`.`iid` LIMIT 1000", $days, $last_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found expired threads: ".$count);
 				while ($thread = DBA::fetch($r)) {
@@ -304,7 +304,7 @@ class DBClean {
 						NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
 						`received` < UTC_TIMESTAMP() - INTERVAL 90 DAY AND `id` >= ? AND `id` <= ?
 					ORDER BY `id` LIMIT ".intval($limit), $last_id, $till_id);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found global item entries from expired threads: ".$count);
 				while ($orphan = DBA::fetch($r)) {
@@ -327,7 +327,7 @@ class DBClean {
 			$r = DBA::p("SELECT `received`, `item-uri` FROM `conversation`
 					WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
 					ORDER BY `received` LIMIT ".intval($limit), $days);
-			$count = DBA::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found old conversations: ".$count);
 				while ($orphan = DBA::fetch($r)) {
diff --git a/src/Worker/TagUpdate.php b/src/Worker/TagUpdate.php
index bfef31e3fb..3dac20b6cf 100644
--- a/src/Worker/TagUpdate.php
+++ b/src/Worker/TagUpdate.php
@@ -10,7 +10,7 @@ class TagUpdate
 	{
 		$messages = DBA::p("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''");
 
-		logger('fetched messages: ' . DBA::num_rows($messages));
+		logger('fetched messages: ' . DBA::numRows($messages));
 		while ($message = DBA::fetch($messages)) {
 			if ($message['uid'] == 0) {
 				$global = true;
@@ -29,7 +29,7 @@ class TagUpdate
 
 		$messages = DBA::select('item', ['guid'], ['uid' => 0]);
 
-		logger('fetched messages: ' . DBA::num_rows($messages));
+		logger('fetched messages: ' . DBA::numRows($messages));
 		while ($message = DBA::fetch(messages)) {
 			DBA::update('item', ['global' => true], ['guid' => $message['guid']]);
 		}