clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
AndyHee 2018-11-11 10:25:42 +07:00
parent 53e9203d37 094e5becca
commit 80b781ecbf
15 changed files with 169 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -76,7 +76,8 @@
"phpdocumentor/reflection-docblock": "^3.0.2", "phpdocumentor/reflection-docblock": "^3.0.2",
"phpunit/php-token-stream": "^1.4.2", "phpunit/php-token-stream": "^1.4.2",
"mikey179/vfsStream": "^1.6", "mikey179/vfsStream": "^1.6",
"mockery/mockery": "^1.2" "mockery/mockery": "^1.2",
"johnkary/phpunit-speedtrap": "1.1"
}, },
"scripts": { "scripts": {
"test": "phpunit" "test": "phpunit"

50
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9f0dbeccbae197460a0ce74a940177cd", "content-hash": "ee7a6d8a1a9df21b46478dd91c1b73b7",
"packages": [ "packages": [
{ {
"name": "asika/simple-console", "name": "asika/simple-console",
@ -2059,6 +2059,54 @@
], ],
"time": "2016-01-20T08:20:44+00:00" "time": "2016-01-20T08:20:44+00:00"
}, },
{
"name": "johnkary/phpunit-speedtrap",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/johnkary/phpunit-speedtrap.git",
"reference": "f7cfe17c5a7076ed0ccca5450fe3bb981ec56361"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/f7cfe17c5a7076ed0ccca5450fe3bb981ec56361",
"reference": "f7cfe17c5a7076ed0ccca5450fe3bb981ec56361",
"shasum": ""
},
"require": {
"php": ">=5.6",
"phpunit/phpunit": ">=4.7,<6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-0": {
"JohnKary": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "John Kary",
"email": "john@johnkary.net"
}
],
"description": "Find slow tests in your PHPUnit test suite",
"homepage": "https://github.com/johnkary/phpunit-speedtrap",
"keywords": [
"phpunit",
"profile",
"slow"
],
"time": "2017-03-25T17:14:26+00:00"
},
{ {
"name": "mikey179/vfsStream", "name": "mikey179/vfsStream",
"version": "v1.6.5", "version": "v1.6.5",

3
doc/Addons.md
View File

@ -693,6 +693,9 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Addon::callHooks('logged_in', $a->user); Addon::callHooks('logged_in', $a->user);
### src/Core/Hook.php
self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
### src/Core/Worker.php ### src/Core/Worker.php

2
mod/follow.php
View File

@ -27,7 +27,7 @@ function follow_post(App $a)
$uid = local_user(); $uid = local_user();
$url = Strings::escapeTags(trim($_REQUEST['url'])); $url = Strings::escapeTags(trim($_REQUEST['url']));
$return_path = 'contacts'; $return_path = 'follow?url=' . urlencode($url);
// Makes the connection request for friendica contacts easier // Makes the connection request for friendica contacts easier
// This is just a precaution if maybe this page is called somewhere directly via POST // This is just a precaution if maybe this page is called somewhere directly via POST

1
mod/removeme.php
View File

@ -10,6 +10,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\Strings;
require_once 'include/enotify.php'; require_once 'include/enotify.php';

3
phpunit.xml
View File

@ -26,4 +26,7 @@
<logging> <logging>
<log type="coverage-clover" target="clover.xml" /> <log type="coverage-clover" target="clover.xml" />
</logging> </logging>
<listeners>
<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener" />
</listeners>
</phpunit> </phpunit>

4
src/App.php
View File

@ -787,9 +787,9 @@ class App
*/ */
if ($this->is_mobile || $this->is_tablet) { if ($this->is_mobile || $this->is_tablet) {
if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
$link = 'toggle_mobile?address=' . curPageURL(); $link = 'toggle_mobile?address=' . urlencode(curPageURL());
} else { } else {
$link = 'toggle_mobile?off=1&address=' . curPageURL(); $link = 'toggle_mobile?off=1&address=' . urlencode(curPageURL());
} }
$this->page['footer'] .= Core\Renderer::replaceMacros(Core\Renderer::getMarkupTemplate("toggle_mobile_footer.tpl"), [ $this->page['footer'] .= Core\Renderer::replaceMacros(Core\Renderer::getMarkupTemplate("toggle_mobile_footer.tpl"), [
'$toggle_link' => $link, '$toggle_link' => $link,

16
src/Core/Hook.php
View File

@ -136,6 +136,22 @@ class Hook extends BaseObject
{ {
if (array_key_exists($name, self::$hooks)) { if (array_key_exists($name, self::$hooks)) {
foreach (self::$hooks[$name] as $hook) { foreach (self::$hooks[$name] as $hook) {
// Call a hook to check if this hook call needs to be forked
if (array_key_exists('hook_fork', self::$hooks)) {
$hookdata = ['name' => $name, 'data' => $data, 'execute' => true];
foreach (self::$hooks['hook_fork'] as $fork_hook) {
if ($hook[0] != $fork_hook[0]) {
continue;
}
self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
}
if (!$hookdata['execute']) {
continue;
}
}
Worker::add($priority, 'ForkHook', $name, $hook, $data); Worker::add($priority, 'ForkHook', $name, $hook, $data);
} }
} }

4
src/Core/Logger.php
View File

@ -115,6 +115,10 @@ class Logger extends BaseObject
$processId = $a->process_id; $processId = $a->process_id;
} }
if (!is_string($msg)) {
$msg = var_export($msg, true);
}
$callers = debug_backtrace(); $callers = debug_backtrace();
$logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n", $logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n",
DateTimeFormat::utcNow(), DateTimeFormat::utcNow(),

4
src/Model/Contact.php
View File

@ -8,13 +8,13 @@ use Friendica\BaseObject;
use Friendica\Content\Pager; use Friendica\Content\Pager;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Profile;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
@ -1606,7 +1606,7 @@ class Contact extends BaseObject
$arr = ['url' => $url, 'contact' => []]; $arr = ['url' => $url, 'contact' => []];
Addon::callHooks('follow', $arr); Hook::callAll('follow', $arr);
if (empty($arr)) { if (empty($arr)) {
$result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.'); $result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');

2
src/Module/Objects.php
View File

@ -27,7 +27,7 @@ class Objects extends BaseModule
$a->internalRedirect(str_replace('objects/', 'display/', $a->query_string)); $a->internalRedirect(str_replace('objects/', 'display/', $a->query_string));
} }
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]); $item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
System::httpExit(404); System::httpExit(404);
} }

136
src/Network/Probe.php
View File

@ -318,10 +318,10 @@ class Probe
* *
* @return array uri data * @return array uri data
*/ */
public static function uri($uri, $network = "", $uid = -1, $cache = true) public static function uri($uri, $network = '', $uid = -1, $cache = true)
{ {
if ($cache) { if ($cache) {
$result = Cache::get("Probe::uri:".$network.":".$uri); $result = Cache::get('Probe::uri:' . $network . ':' . $uri);
if (!is_null($result)) { if (!is_null($result)) {
return $result; return $result;
} }
@ -343,28 +343,28 @@ class Probe
$data = $ap_profile; $data = $ap_profile;
} }
if (!isset($data["url"])) { if (!isset($data['url'])) {
$data["url"] = $uri; $data['url'] = $uri;
} }
if (x($data, "photo")) { if (x($data, 'photo')) {
$data["baseurl"] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, "baseurl", "")), Strings::normaliseLink($data["photo"])); $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
} else { } else {
$data["photo"] = System::baseUrl().'/images/person-300.jpg'; $data['photo'] = System::baseUrl() . '/images/person-300.jpg';
} }
if (empty($data["name"])) { if (empty($data['name'])) {
if (!empty($data["nick"])) { if (!empty($data['nick'])) {
$data["name"] = $data["nick"]; $data['name'] = $data['nick'];
} }
if (!x($data, "name")) { if (!x($data, 'name')) {
$data["name"] = $data["url"]; $data['name'] = $data['url'];
} }
} }
if (empty($data["nick"])) { if (empty($data['nick'])) {
$data["nick"] = strtolower($data["name"]); $data['nick'] = strtolower($data['name']);
if (strpos($data['nick'], ' ')) { if (strpos($data['nick'], ' ')) {
$data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' '))); $data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
@ -372,42 +372,44 @@ class Probe
} }
if (!empty(self::$baseurl)) { if (!empty(self::$baseurl)) {
$data["baseurl"] = self::$baseurl; $data['baseurl'] = self::$baseurl;
} }
if (empty($data["network"])) { if (empty($data['network'])) {
$data["network"] = Protocol::PHANTOM; $data['network'] = Protocol::PHANTOM;
} }
$data = self::rearrangeData($data); $data = self::rearrangeData($data);
// Only store into the cache if the value seems to be valid // Only store into the cache if the value seems to be valid
if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) { if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
Cache::set("Probe::uri:".$network.":".$uri, $data, Cache::DAY); Cache::set('Probe::uri:' . $network . ':' . $uri, $data, Cache::DAY);
/// @todo temporary fix - we need a real contact update function that updates only changing fields /// @todo temporary fix - we need a real contact update function that updates only changing fields
/// The biggest problem is the avatar picture that could have a reduced image size. /// The biggest problem is the avatar picture that could have a reduced image size.
/// It should only be updated if the existing picture isn't existing anymore. /// It should only be updated if the existing picture isn't existing anymore.
/// We only update the contact when it is no probing for a specific network. /// We only update the contact when it is no probing for a specific network.
if (($data['network'] != Protocol::FEED) if (($data['network'] != Protocol::FEED)
&& ($network == "") && ($network == '')
&& $data["name"] && $data['name']
&& $data["nick"] && $data['nick']
&& $data["url"] && $data['url']
&& $data["addr"] && $data['addr']
&& $data["poll"] && $data['poll']
) { ) {
$fields = ['name' => $data['name'], $fields = [
'nick' => $data['nick'], 'name' => $data['name'],
'url' => $data['url'], 'nick' => $data['nick'],
'addr' => $data['addr'], 'url' => $data['url'],
'photo' => $data['photo'], 'addr' => $data['addr'],
'keywords' => $data['keywords'], 'photo' => $data['photo'],
'location' => $data['location'], 'keywords' => $data['keywords'],
'about' => $data['about'], 'location' => $data['location'],
'notify' => $data['notify'], 'about' => $data['about'],
'network' => $data['network'], 'notify' => $data['notify'],
'server_url' => $data['baseurl']]; 'network' => $data['network'],
'server_url' => $data['baseurl']
];
// This doesn't cover the case when a community isn't a community anymore // This doesn't cover the case when a community isn't a community anymore
if (!empty($data['community']) && $data['community']) { if (!empty($data['community']) && $data['community']) {
@ -427,7 +429,7 @@ class Probe
$fields['updated'] = DateTimeFormat::utcNow(); $fields['updated'] = DateTimeFormat::utcNow();
$condition = ['nurl' => Strings::normaliseLink($data["url"])]; $condition = ['nurl' => Strings::normaliseLink($data['url'])];
$old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition); $old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition);
@ -444,25 +446,27 @@ class Probe
DBA::update('gcontact', $fields, $condition, $old_fields); DBA::update('gcontact', $fields, $condition, $old_fields);
$fields = ['name' => $data['name'], $fields = [
'nick' => $data['nick'], 'name' => $data['name'],
'url' => $data['url'], 'nick' => $data['nick'],
'addr' => $data['addr'], 'url' => $data['url'],
'alias' => $data['alias'], 'addr' => $data['addr'],
'keywords' => $data['keywords'], 'alias' => $data['alias'],
'location' => $data['location'], 'keywords' => $data['keywords'],
'about' => $data['about'], 'location' => $data['location'],
'batch' => $data['batch'], 'about' => $data['about'],
'notify' => $data['notify'], 'batch' => $data['batch'],
'poll' => $data['poll'], 'notify' => $data['notify'],
'request' => $data['request'], 'poll' => $data['poll'],
'confirm' => $data['confirm'], 'request' => $data['request'],
'poco' => $data['poco'], 'confirm' => $data['confirm'],
'network' => $data['network'], 'poco' => $data['poco'],
'pubkey' => $data['pubkey'], 'network' => $data['network'],
'priority' => $data['priority'], 'pubkey' => $data['pubkey'],
'writable' => true, 'priority' => $data['priority'],
'rel' => Contact::SHARING]; 'writable' => true,
'rel' => Contact::SHARING
];
$fieldnames = []; $fieldnames = [];
@ -474,7 +478,7 @@ class Probe
} }
} }
$condition = ['nurl' => Strings::normaliseLink($data["url"]), 'self' => false, 'uid' => 0]; $condition = ['nurl' => Strings::normaliseLink($data['url']), 'self' => false, 'uid' => 0];
// "$old_fields" will return a "false" when the contact doesn't exist. // "$old_fields" will return a "false" when the contact doesn't exist.
// This won't trigger an insert. This is intended, since we only need // This won't trigger an insert. This is intended, since we only need
@ -575,7 +579,7 @@ class Probe
{ {
$parts = parse_url($uri); $parts = parse_url($uri);
if (!empty($parts["scheme"]) && !empty($parts["host"]) && !empty($parts["path"])) { if (!empty($parts["scheme"]) && !empty($parts["host"])) {
$host = $parts["host"]; $host = $parts["host"];
if (!empty($parts["port"])) { if (!empty($parts["port"])) {
$host .= ':'.$parts["port"]; $host .= ':'.$parts["port"];
@ -590,7 +594,7 @@ class Probe
return []; return [];
} }
$path_parts = explode("/", trim($parts["path"], "/")); $path_parts = explode("/", trim(defaults($parts, 'path', ''), "/"));
while (!$lrdd && (sizeof($path_parts) > 1)) { while (!$lrdd && (sizeof($path_parts) > 1)) {
$host .= "/".array_shift($path_parts); $host .= "/".array_shift($path_parts);
@ -979,7 +983,9 @@ class Probe
{ {
$hcard_url = ""; $hcard_url = "";
$data = []; $data = [];
foreach ($webfinger["links"] as $link) { // The array is reversed to take into account the order of preference for same-rel links
// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
foreach (array_reverse($webfinger["links"]) as $link) {
if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) { if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) {
$data["network"] = Protocol::DFRN; $data["network"] = Protocol::DFRN;
} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) { } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
@ -1182,7 +1188,9 @@ class Probe
{ {
$hcard_url = ""; $hcard_url = "";
$data = []; $data = [];
foreach ($webfinger["links"] as $link) { // The array is reversed to take into account the order of preference for same-rel links
// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
foreach (array_reverse($webfinger["links"]) as $link) {
if (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) { if (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
$hcard_url = $link["href"]; $hcard_url = $link["href"];
} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) { } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) {
@ -1283,7 +1291,9 @@ class Probe
$pubkey = ""; $pubkey = "";
if (is_array($webfinger["links"])) { if (is_array($webfinger["links"])) {
foreach ($webfinger["links"] as $link) { // The array is reversed to take into account the order of preference for same-rel links
// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
foreach (array_reverse($webfinger["links"]) as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page") if (($link["rel"] == "http://webfinger.net/rel/profile-page")
&& (defaults($link, "type", "") == "text/html") && (defaults($link, "type", "") == "text/html")
&& ($link["href"] != "") && ($link["href"] != "")
@ -1447,7 +1457,9 @@ class Probe
private static function pumpio($webfinger, $addr) private static function pumpio($webfinger, $addr)
{ {
$data = []; $data = [];
foreach ($webfinger["links"] as $link) { // The array is reversed to take into account the order of preference for same-rel links
// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
foreach (array_reverse($webfinger["links"]) as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page") if (($link["rel"] == "http://webfinger.net/rel/profile-page")
&& (defaults($link, "type", "") == "text/html") && (defaults($link, "type", "") == "text/html")
&& ($link["href"] != "") && ($link["href"] != "")

8
src/Protocol/Feed.php
View File

@ -123,7 +123,13 @@ class Feed {
$author["author-name"] = $value; $author["author-name"] = $value;
} }
if ($simulate) { if ($simulate) {
$author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:uri/text()'); $author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:id/text()');
// See https://tools.ietf.org/html/rfc4287#section-3.2.2
$value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()');
if ($value != "") {
$author["author-link"] = $value;
}
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()'); $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
if ($value != "") { if ($value != "") {

2
tests/src/Core/Cache/CacheTest.php
View File

@ -123,6 +123,8 @@ abstract class CacheTest extends DatabaseTest
* @medium * @medium
*/ */
function testTTL() { function testTTL() {
$this->markTestSkipped('taking too much time without mocking');
$this->assertNull($this->instance->get('value1')); $this->assertNull($this->instance->get('value1'));
$value = 'foobar'; $value = 'foobar';

2
tests/src/Core/Lock/LockTest.php
View File

@ -116,6 +116,8 @@ abstract class LockTest extends DatabaseTest
* @medium * @medium
*/ */
function testLockTTL() { function testLockTTL() {
$this->markTestSkipped('taking too much time without mocking');
$this->assertFalse($this->instance->isLocked('foo')); $this->assertFalse($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); $this->assertFalse($this->instance->isLocked('bar'));