Rewrite:

- moved constants GRAVITY_* from boot.php to Friendica\Model\Item
- also rewrote some array initialization:

From:
````
<?php
$arr = [];
$arr['foo'] = "FOO";
````

To:
````
<?php
$arr['foo'] = "FOO";
````
- added a few type-hints

diff --git a/src/Database/Database.php b/src/Database/Database.php
index ed27a802ffd5aa867f474eabc72542e14d0f4765..0a96ef528f6dd319222465352d1ac8b9ad8eb835 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -725,7 +725,6 @@ class Database
                                $duration  = round($duration, 3);
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-<<<<<<< HEAD
                                @file_put_contents(
                                        $this->config->get('system', 'db_log'),
                                        DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
@@ -734,12 +733,6 @@ class Database
                                        substr($this->replaceParameters($sql, $args), 0, 4000) . "\n",
                                        FILE_APPEND
                                );
-=======
-                               @file_put_contents($this->configCache->get('system', 'db_log'), DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
-                                                                                               basename($backtrace[1]['file']) . "\t" .
-                                                                                               $backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" .
-                                                                                               substr($this->replaceParameters($sql, $args), 0, 4000) . "\n", FILE_APPEND);
->>>>>>> 82391ca61 (Changes:)
                        }
                }
                return $retval;