Changes:

[friendica.git] / src / Database / Database.php

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 590c3d83d04d3690c1915d6b252121cb3c524678..384e1d1a658dee0731c979fe0e254d1b4541dedd 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -26,6 +26,7 @@ use Friendica\Core\System;
 use Friendica\Network\HTTPException\ServiceUnavailableException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
+use InvalidArgumentException;
 use mysqli;
 use mysqli_result;
 use mysqli_stmt;
@@ -1512,7 +1513,7 @@ class Database
         * @param array        $condition Array of fields for condition
         * @param array        $params    Array of several parameters
         *
-        * @return int
+        * @return int Count of rows
         *
         * Example:
         * $table = "post";
@@ -1524,11 +1525,11 @@ class Database
         * $count = DBA::count($table, $condition);
         * @throws \Exception
         */
-       public function count($table, array $condition = [], array $params = [])
+       public function count($table, array $condition = [], array $params = []): int
        {
                // @TODO Can we dump this to have ": int" as returned type-hint?
                if (empty($table)) {
-                       return false;
+                       throw new InvalidArgumentException('Parameter "table" cannot be empty.');
                }
 
                $table_string = DBA::buildTableString($table);
@@ -1843,7 +1844,7 @@ class Database
 
                $upds = implode(', ', $upd);
 
-               $r = $this->e(sprintf("UPDATE %s SET %s;", $table_name, $upds));
+               $r = $this->e(sprintf("UPDATE %s SET %s;", DBA::quoteIdentifier($table_name), $upds));
                if (!$this->isResult($r)) {
                        throw new \RuntimeException("Failed updating `$table_name`: " . $this->errorMessage());
                }