Browse Source

Move Namespace of ActivityNamespace

tags/2019.12
Philipp Holzer 3 months ago
parent
commit
7343ee5108
No account linked to committer's email address
11 changed files with 15 additions and 12 deletions
  1. +1
    -1
      mod/salmon.php
  2. +1
    -1
      src/Module/Xrd.php
  3. +1
    -1
      src/Network/Probe.php
  4. +1
    -1
      src/Protocol/Activity.php
  5. +2
    -0
      src/Protocol/Activity/ObjectType.php
  6. +1
    -1
      src/Protocol/ActivityNamespace.php
  7. +1
    -1
      src/Protocol/DFRN.php
  8. +1
    -1
      src/Protocol/Diaspora.php
  9. +1
    -1
      src/Protocol/Feed.php
  10. +2
    -2
      src/Protocol/OStatus.php
  11. +3
    -2
      tests/src/Protocol/ActivityTest.php

+ 1
- 1
mod/salmon.php View File

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

+ 1
- 1
src/Module/Xrd.php View File

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


+ 1
- 1
src/Network/Probe.php View File

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

+ 1
- 1
src/Protocol/Activity.php View File

@@ -2,7 +2,7 @@

namespace Friendica\Protocol;

use Friendica\Protocol\Activity\ActivityNamespace;
use Friendica\Protocol\ActivityNamespace;

/**
* Base class for the Activity Verbs

+ 2
- 0
src/Protocol/Activity/ObjectType.php View File

@@ -2,6 +2,8 @@

namespace Friendica\Protocol\Activity;

use Friendica\Protocol\ActivityNamespace;

/**
* This class contains the different object types in activities
*/

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

@@ -1,6 +1,6 @@
<?php

namespace Friendica\Protocol\Activity;
namespace Friendica\Protocol;

/**
* Activity namespaces constants

+ 1
- 1
src/Protocol/DFRN.php View File

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

+ 1
- 1
src/Protocol/Diaspora.php View File

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

+ 1
- 1
src/Protocol/Feed.php View File

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


+ 2
- 2
src/Protocol/OStatus.php View File

@@ -25,7 +25,7 @@ use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\Activity\ActivityNamespace;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
@@ -1760,7 +1760,7 @@ class OStatus

$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);

$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);

+ 3
- 2
tests/src/Protocol/ActivityTest.php View File

@@ -3,6 +3,7 @@
namespace Friendica\Test\Protocol;

use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Test\MockedTest;

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

Loading…
Cancel
Save