bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #3659 from annando/more-static

Browse source 
And some more static warnings removed
This commit is contained in:
Tobias Diekershoff 2017-08-26 12:07:54 +02:00 committed by GitHub
commit 4788c924a0
8 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Contact.php
View file

@ -523,7 +523,7 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
* @return integer Contact ID
*/
function get_contact($url, $uid = 0, $no_update = false) {
logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);
logger("Get contact data for url ".$url." and user ".$uid." - ".System::callstack(), LOGGER_DEBUG);
$data = array();
$contact_id = 0;

12
include/dba.php
View file

@ -1,4 +1,6 @@
<?php
use \Friendica\Core\System;
require_once("dbm.php");
require_once('include/datetime.php');
@ -228,7 +230,7 @@ class dba {
$orig_sql = $sql;
if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) {
$sql = "/*".$a->callstack()." */ ".$sql;
$sql = "/*".System::callstack()." */ ".$sql;
}
$columns = 0;
@ -549,7 +551,7 @@ class dba {
$orig_sql = $sql;
if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) {
$sql = "/*".$a->callstack()." */ ".$sql;
$sql = "/*".System::callstack()." */ ".$sql;
}
self::$dbo->error = '';
@ -679,7 +681,7 @@ class dba {
$errorno = self::$dbo->errorno;
logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".
$a->callstack(8)."\n".self::replace_parameters($sql, $params));
System::callstack(8)."\n".self::replace_parameters($sql, $params));
self::$dbo->error = $error;
self::$dbo->errorno = $errorno;
@ -742,7 +744,7 @@ class dba {
$errorno = self::$dbo->errorno;
logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".
$a->callstack(8)."\n".self::replace_parameters($sql, $params));
System::callstack(8)."\n".self::replace_parameters($sql, $params));
self::$dbo->error = $error;
self::$dbo->errorno = $errorno;
@ -914,7 +916,7 @@ class dba {
*
* @return integer Last inserted id
*/
function lastInsertId() {
public static function lastInsertId() {
switch (self::$dbo->driver) {
case 'pdo':
$id = self::$dbo->db->lastInsertId();

2
include/dbm.php
View file

@ -107,6 +107,6 @@ class dbm {
$timestamp = -62135596800;
}
return date('Y-m-d H:i:s', $timestamp);
return date('Y-m-d H:i:s', (int)$timestamp);
}
}

2
include/items.php
View file

@ -666,7 +666,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
}
if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) {
logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG);
logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
}
if ($arr['plink'] == "") {

4
include/ostatus.php
View file

@ -1650,7 +1650,7 @@ class ostatus {
*
* @return string activity
*/
function construct_verb($item) {
private static function construct_verb($item) {
if ($item['verb'])
return $item['verb'];
return ACTIVITY_POST;
@ -1663,7 +1663,7 @@ class ostatus {
*
* @return string Object type
*/
function construct_objecttype($item) {
private static function construct_objecttype($item) {
if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT)))
return $item['object-type'];
return ACTIVITY_OBJ_NOTE;

8
include/socgraph.php
View file

@ -2013,7 +2013,7 @@ function clean_contact_url($url) {
}
if ($new_url != $url) {
logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".App::callstack(), LOGGER_DEBUG);
logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".System::callstack(), LOGGER_DEBUG);
}
return $new_url;
@ -2028,7 +2028,7 @@ function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
$data = probe_url($contact["url"]);
if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
$contact["url"] = $data["url"];
$contact["addr"] = $data["addr"];
$contact["alias"] = $data["alias"];
@ -2049,7 +2049,7 @@ function get_gcontact_id($contact) {
$doprobing = false;
if (in_array($contact["network"], array(NETWORK_PHANTOM))) {
logger("Invalid network for contact url ".$contact["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
return false;
}
@ -2290,7 +2290,7 @@ function update_gcontact_from_probe($url) {
$data = probe_url($url);
if (in_array($data["network"], array(NETWORK_PHANTOM))) {
logger("Invalid network for contact url ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
return;
}

27
src/App.php
View file

@ -2,6 +2,7 @@
namespace Friendica;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
@ -683,7 +684,7 @@ class App {
$this->performance[$value] += (float) $duration;
$this->performance['marktime'] += (float) $duration;
$callstack = $this->callstack();
$callstack = System::callstack();
if (!isset($this->callstack[$value][$callstack])) {
// Prevent ugly E_NOTICE
@ -736,30 +737,6 @@ class App {
q('DELETE FROM `process` WHERE `pid` = %d', intval(getmypid()));
}
/**
* @brief Returns a string with a callstack. Can be used for logging.
*
* @return string
*/
function callstack($depth = 4) {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $depth + 2);
// We remove the first two items from the list since they contain data that we don't need.
array_shift($trace);
array_shift($trace);
$callstack = array();
foreach ($trace AS $func) {
if (!empty($func['class'])) {
$callstack[] = $func['class'].'::'.$func['function'];
} else {
$callstack[] = $func['function'];
}
}
return implode(', ', $callstack);
}
function get_useragent() {
return
FRIENDICA_PLATFORM . " '" .

26
src/Core/System.php
View file

@ -46,11 +46,35 @@ class System {
*
* @return string The cleaned url
*/
function removedBaseUrl($orig_url) {
public static function removedBaseUrl($orig_url) {
self::init();
return self::$a->remove_baseurl($orig_url);
}
/**
* @brief Returns a string with a callstack. Can be used for logging.
*
* @return string
*/
public static function callstack($depth = 4) {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $depth + 2);
// We remove the first two items from the list since they contain data that we don't need.
array_shift($trace);
array_shift($trace);
$callstack = array();
foreach ($trace AS $func) {
if (!empty($func['class'])) {
$callstack[] = $func['class'].'::'.$func['function'];
} else {
$callstack[] = $func['function'];
}
}
return implode(', ', $callstack);
}
/// @todo Move the following functions from boot.php
/*
function get_guid($size = 16, $prefix = "")