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

Move Namespace of ActivityNamespace

This commit is contained in:
Philipp Holzer 2019-10-25 00:34:46 +02:00
parent dc2858938d
commit 7343ee5108
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
11 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/salmon.php
View File

@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon; use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;

2
src/Module/Xrd.php
View File

@ -8,7 +8,7 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Protocol\Salmon; use Friendica\Protocol\Salmon;
use Friendica\Util\Strings; use Friendica\Util\Strings;

2
src/Network/Probe.php
View File

@ -18,7 +18,7 @@ use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Email; use Friendica\Protocol\Email;
use Friendica\Protocol\Feed; use Friendica\Protocol\Feed;

2
src/Protocol/Activity.php
View File

@ -2,7 +2,7 @@
namespace Friendica\Protocol; namespace Friendica\Protocol;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
/** /**
* Base class for the Activity Verbs * Base class for the Activity Verbs

2
src/Protocol/Activity/ObjectType.php
View File

@ -2,6 +2,8 @@
namespace Friendica\Protocol\Activity; namespace Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace;
/** /**
* This class contains the different object types in activities * This class contains the different object types in activities
*/ */

2
src/Protocol/Activity/ActivityNamespace.php → src/Protocol/ActivityNamespace.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Friendica\Protocol\Activity; namespace Friendica\Protocol;
/** /**
* Activity namespaces constants * Activity namespaces constants

2
src/Protocol/DFRN.php
View File

@ -32,7 +32,7 @@ use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;

2
src/Protocol/Diaspora.php
View File

@ -32,7 +32,7 @@ use Friendica\Model\Mail;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map; use Friendica\Util\Map;

2
src/Protocol/Feed.php
View File

@ -14,7 +14,7 @@ use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\XML; use Friendica\Util\XML;

4
src/Protocol/OStatus.php
View File

@ -25,7 +25,7 @@ use Friendica\Model\Item;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\Activity\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
@ -1760,7 +1760,7 @@ class OStatus
$entry = self::entryHeader($doc, $owner, $item, $toplevel); $entry = self::entryHeader($doc, $owner, $item, $toplevel);
$verb = Activity\ActivityNamespace::ACTIVITY_SCHEMA . "favorite"; $verb = ActivityNamespace::ACTIVITY_SCHEMA . "favorite";
self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false); self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]); $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);

5
tests/src/Protocol/ActivityTest.php
View File

@ -3,6 +3,7 @@
namespace Friendica\Test\Protocol; namespace Friendica\Test\Protocol;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
class ActivityTest extends MockedTest class ActivityTest extends MockedTest
@ -22,7 +23,7 @@ class ActivityTest extends MockedTest
], ],
'withNamespace' => [ 'withNamespace' => [
'haystack' => 'tagterm', 'haystack' => 'tagterm',
'needle' => Activity\ActivityNamespace::ACTIVITY_SCHEMA . Activity\ObjectType::TAGTERM, 'needle' => ActivityNamespace::ACTIVITY_SCHEMA . Activity\ObjectType::TAGTERM,
'assert' => true, 'assert' => true,
], ],
'invalidSimple' => [ 'invalidSimple' => [
@ -37,7 +38,7 @@ class ActivityTest extends MockedTest
], ],
'withSubPath' => [ 'withSubPath' => [
'haystack' => 'tagterm', 'haystack' => 'tagterm',
'needle' => Activity\ActivityNamespace::ACTIVITY_SCHEMA . '/bla/' . Activity\ObjectType::TAGTERM, 'needle' => ActivityNamespace::ACTIVITY_SCHEMA . '/bla/' . Activity\ObjectType::TAGTERM,
'assert' => true, 'assert' => true,
], ],
]; ];