Rename DBA::get_db to DBA::getConnection

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

diff --git a/src/Database/DBM.php b/src/Database/DBM.php
index 9495a264cc5708129918f1785e3414ec651dc9f0..62e5bee2e2c151d208a5780d503d7d237727954c 100644 (file)
--- a/src/Database/DBM.php
+++ b/src/Database/DBM.php
@@ -4,7 +4,9 @@
  */
 namespace Friendica\Database;
 
-use dba;
+use Friendica\Util\DateTimeFormat;
+
+require_once 'include/dba.php';
 
 /**
  * @brief This class contain functions for the database management
@@ -23,28 +25,28 @@ class DBM
        public static function processlist()
        {
                $r = q("SHOW PROCESSLIST");
-               $s = array();
+               $s = [];
 
                $processes = 0;
-               $states = array();
-               foreach ($r AS $process) {
+               $states = [];
+               foreach ($r as $process) {
                        $state = trim($process["State"]);
 
                        // Filter out all non blocking processes
-                       if (!in_array($state, array("", "init", "statistics", "updating"))) {
+                       if (!in_array($state, ["", "init", "statistics", "updating"])) {
                                ++$states[$state];
                                ++$processes;
                        }
                }
 
                $statelist = "";
-               foreach ($states AS $state => $usage) {
+               foreach ($states as $state => $usage) {
                        if ($statelist != "") {
                                $statelist .= ", ";
                        }
                        $statelist .= $state.": ".$usage;
                }
-               return(array("list" => $statelist, "amount" => $processes));
+               return(["list" => $statelist, "amount" => $processes]);
        }
 
        /**
@@ -62,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));
@@ -74,6 +76,7 @@ class DBM
         * @param mixed   $value         Array value
         * @param string  $key           Array key
         * @param boolean $add_quotation add quotation marks for string values
+        * @return void
         */
        private static function esc_array_callback(&$value, $key, $add_quotation)
        {
@@ -100,6 +103,7 @@ class DBM
         *
         * @param mixed   $arr           Array with values to be escaped
         * @param boolean $add_quotation add quotation marks for string values
+        * @return void
         */
        public static function esc_array(&$arr, $add_quotation = false)
        {
@@ -109,19 +113,13 @@ class DBM
        /**
         * Checks Converts any date string into a SQL compatible date string
         *
+        * @deprecated since version 3.6
         * @param string $date a date string in any format
         *
         * @return string SQL style date string
         */
        public static function date($date = 'now')
        {
-               $timestamp = strtotime($date);
-
-               // Don't allow lower date strings as '0001-01-01 00:00:00'
-               if ($timestamp < -62135596800) {
-                       $timestamp = -62135596800;
-               }
-
-               return date('Y-m-d H:i:s', (int)$timestamp);
+               return DateTimeFormat::utc($date);
        }
 }