aboutsummaryrefslogtreecommitdiff
path: root/lib/activities
diff options
context:
space:
mode:
Diffstat (limited to 'lib/activities')
-rw-r--r--lib/activities/Activity.php4
-rw-r--r--lib/activities/Context.php2
-rw-r--r--lib/activities/DocumentsProvider.php3
-rw-r--r--lib/activities/ForumProvider.php4
-rw-r--r--lib/activities/MessageProvider.php4
-rw-r--r--lib/activities/NewsProvider.php2
-rw-r--r--lib/activities/ParticipantsProvider.php4
-rw-r--r--lib/activities/ScheduleProvider.php3
-rw-r--r--lib/activities/Stream.php30
-rw-r--r--lib/activities/WikiProvider.php6
10 files changed, 9 insertions, 53 deletions
diff --git a/lib/activities/Activity.php b/lib/activities/Activity.php
index 3508e5a..e1c918d 100644
--- a/lib/activities/Activity.php
+++ b/lib/activities/Activity.php
@@ -163,7 +163,7 @@ class Activity extends \SimpleORMap
);
//Expire Cache
- \StudipCacheFactory::getCache()->expire('activity/oldest_activity');
+ \Studip\Cache\Factory::getCache()->expire('activity/oldest_activity');
}
/**
@@ -173,7 +173,7 @@ class Activity extends \SimpleORMap
*/
public static function getOldestActivity()
{
- $cache = \StudipCacheFactory::getCache();
+ $cache = \Studip\Cache\Factory::getCache();
$cache_key = 'activity/oldest-activity';
if (!$activity = unserialize($cache->read($cache_key))) {
diff --git a/lib/activities/Context.php b/lib/activities/Context.php
index 1705528..dba0d0f 100644
--- a/lib/activities/Context.php
+++ b/lib/activities/Context.php
@@ -147,7 +147,7 @@ abstract class Context
} else {
foreach ($providers as $provider) {
$ctype = $this->getContextType();
- $filtered_classes = $filter->getType()->$ctype;
+ $filtered_classes = $filter->getType()->$ctype ?? null;
if (is_array($filtered_classes)) {
foreach ($filtered_classes as $class) {
diff --git a/lib/activities/DocumentsProvider.php b/lib/activities/DocumentsProvider.php
index 0a770de..fae5df2 100644
--- a/lib/activities/DocumentsProvider.php
+++ b/lib/activities/DocumentsProvider.php
@@ -29,7 +29,6 @@ class DocumentsProvider implements ActivityProvider
if ($activity->context == "course") {
$url = \URLHelper::getUrl("dispatch.php/course/files/flat?cid={$activity->context_id}");
- $route = \URLHelper::getURL('api.php/file/' . $activity->object_id, NULL, true);
$activity->object_url = [
$url => _('Zum Dateibereich der Veranstaltung')
@@ -43,8 +42,6 @@ class DocumentsProvider implements ActivityProvider
];
}
- $activity->object_route = $route;
-
return true;
}
diff --git a/lib/activities/ForumProvider.php b/lib/activities/ForumProvider.php
index f543947..6a958eb 100644
--- a/lib/activities/ForumProvider.php
+++ b/lib/activities/ForumProvider.php
@@ -30,14 +30,10 @@ class ForumProvider implements ActivityProvider
.'?cid='. $post['seminar_id'] .'&highlight_topic='. $post['topic_id']
.'#'. $post['topic_id']);
- $route = \URLHelper::getURL('api.php/forum_entry/' . $post['topic_id'], NULL, true);
-
$activity->object_url = [
$url => _('Zum Forum der Veranstaltung')
];
- $activity->object_route = $route;
-
return true;
}
diff --git a/lib/activities/MessageProvider.php b/lib/activities/MessageProvider.php
index 9d16831..0db2ad8 100644
--- a/lib/activities/MessageProvider.php
+++ b/lib/activities/MessageProvider.php
@@ -30,14 +30,10 @@ class MessageProvider implements ActivityProvider
$url = \URLHelper::getUrl("dispatch.php/messages/read/{$message->id}", ['cid' => null]);
- $route = \URLHelper::getURL('api.php/message/' . $message->id, NULL, true);
-
$activity->object_url = [
$url => _('Zur Nachricht')
];
- $activity->object_route = $route;
-
return true;
}
diff --git a/lib/activities/NewsProvider.php b/lib/activities/NewsProvider.php
index eed7fe7..8f1c5f4 100644
--- a/lib/activities/NewsProvider.php
+++ b/lib/activities/NewsProvider.php
@@ -116,10 +116,8 @@ class NewsProvider implements ActivityProvider
.'</b><br>'. formatReady((string) $news->body);
$url = self::getUrlForContext($news, $activity);
- $route = \URLHelper::getURL('api.php/news/' . $news->id, NULL, true);
$activity->object_url = $url;
- $activity->object_route = $route;
return true;
}
diff --git a/lib/activities/ParticipantsProvider.php b/lib/activities/ParticipantsProvider.php
index 50bad46..7dc71fd 100644
--- a/lib/activities/ParticipantsProvider.php
+++ b/lib/activities/ParticipantsProvider.php
@@ -62,14 +62,10 @@ class ParticipantsProvider implements ActivityProvider
$url = \URLHelper::getUrl("dispatch.php/course/members/index", ['cid' => $activity->context_id]);
- $route = \URLHelper::getURL('api.php/course/' . $activity->context_id, NULL, true);
-
$activity->object_url = [
$url => _('Zur Veranstaltung')
];
- $activity->object_route = $route;
-
return true;
}
diff --git a/lib/activities/ScheduleProvider.php b/lib/activities/ScheduleProvider.php
index 208b9b3..73ca7f5 100644
--- a/lib/activities/ScheduleProvider.php
+++ b/lib/activities/ScheduleProvider.php
@@ -20,14 +20,11 @@ class ScheduleProvider implements ActivityProvider
$activity->content = htmlReady($activity->content);
$url = \URLHelper::getUrl("dispatch.php/course/dates?cid={$activity->context_id}");
- $route = \URLHelper::getURL('api.php/course/' . $activity->context_id . '/events', NULL, true);
$activity->object_url = [
$url => _('Zum Ablaufplan der Veranstaltung')
];
- $activity->object_route = $route;
-
return true;
}
diff --git a/lib/activities/Stream.php b/lib/activities/Stream.php
index 6b64eff..b1472ef 100644
--- a/lib/activities/Stream.php
+++ b/lib/activities/Stream.php
@@ -79,66 +79,48 @@ class Stream implements \ArrayAccess, \Countable, \IteratorAggregate
/**
* ArrayAccess: Check whether the given offset exists.
- *
- * @todo Add bool return type when Stud.IP requires PHP8 minimal
*/
- #[\ReturnTypeWillChange]
- public function offsetExists($offset)
+ public function offsetExists($offset): bool
{
return isset($this->activities[$offset]);
}
/**
* ArrayAccess: Get the value at the given offset.
- *
- * @todo Add mixed return type when Stud.IP requires PHP8 minimal
*/
- #[\ReturnTypeWillChange]
- public function offsetGet($offset)
+ public function offsetGet($offset): mixed
{
return $this->activities[$offset];
}
/**
* ArrayAccess: Set the value at the given offset.
- *
- * @todo Add void return type when Stud.IP requires PHP8 minimal
*/
- #[\ReturnTypeWillChange]
- public function offsetSet($offset, $value)
+ public function offsetSet($offset, $value): void
{
$this->activities[$offset] = $value;
}
/**
* ArrayAccess: unset the value at the given offset (not applicable)
- *
- * @todo Add void return type when Stud.IP requires PHP8 minimal
*/
- #[\ReturnTypeWillChange]
- public function offsetUnset($offset)
+ public function offsetUnset($offset): void
{
unset($this->activities[$offset]);
}
/**
* IteratorAggregate
- *
- * @todo Add \Traversable return type when Stud.IP requires PHP8 minimal
*/
- #[\ReturnTypeWillChange]
- public function getIterator()
+ public function getIterator(): \Traversable
{
return new \ArrayIterator($this->activities);
}
/**
* Countable
- *
- * @todo Add int return type when Stud.IP requires PHP8 minimal
*/
- #[ReturnTypeWillChange]
- public function count()
+ public function count(): int
{
return count($this->activities);
}
diff --git a/lib/activities/WikiProvider.php b/lib/activities/WikiProvider.php
index f3a8bbf..7a5266f 100644
--- a/lib/activities/WikiProvider.php
+++ b/lib/activities/WikiProvider.php
@@ -27,23 +27,17 @@ class WikiProvider implements ActivityProvider
if ($activity->context === 'course') {
$url = \URLHelper::getURL('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $activity->context_id]);
- $route = \URLHelper::getURL("api.php/course/{$activity->context_id}/wiki/{$activity->object_id}", null, true);
$activity->object_url = [
$url => _('Zum Wiki der Veranstaltung'),
];
- $activity->object_route = $route;
-
} elseif ($activity->context === 'institute') {
$url = \URLHelper::getURL('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $activity->context_id]);
- $route= null;
$activity->object_url = [
$url => _('Zum Wiki der Einrichtung')
];
-
- $activity->object_route = $route;
}
return true;