diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index 63309d0928..c3860e6f91 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -55,6 +55,13 @@ steps: - '.composer' volumes: - /tmp/drone-cache:/tmp/cache + phpstan: + image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION} + when: + matrix: + PHP_MAJOR_VERSION: 8.2 + commands: + - bin/composer.phar run phpstan; test: image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION} environment: diff --git a/src/Core/Cache/Type/APCuCache.php b/src/Core/Cache/Type/APCuCache.php index 5564a1e793..f1dde2462c 100644 --- a/src/Core/Cache/Type/APCuCache.php +++ b/src/Core/Cache/Type/APCuCache.php @@ -41,7 +41,6 @@ class APCuCache extends AbstractCache implements ICanCacheInMemory $ns = $this->getCacheKey($prefix ?? ''); $ns = preg_quote($ns, '/'); - /** @phpstan-ignore-next-line see https://github.com/friendica/friendica-addons/pull/1363 */ $iterator = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY); $keys = []; @@ -119,7 +118,6 @@ class APCuCache extends AbstractCache implements ICanCacheInMemory $prefix = $this->getPrefix(); $prefix = preg_quote($prefix, '/'); - /** @phpstan-ignore-next-line see https://github.com/friendica/friendica-addons/pull/1363 */ $iterator = new \APCUIterator('/^' . $prefix . '/', APC_ITER_KEY); return apcu_delete($iterator); diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php index e7852847f6..095ed38633 100644 --- a/src/Module/Debug/Babel.php +++ b/src/Module/Debug/Babel.php @@ -234,41 +234,32 @@ class Babel extends BaseModule case 'twitter': $json = trim($request['text']); - if (file_exists('addon/twitter/twitter.php')) { - require_once 'addon/twitter/twitter.php'; + $status = json_decode($json); - $status = json_decode($json); + $results[] = [ + 'title' => DI::l10n()->t('Decoded post'), + 'content' => $visible_whitespace(var_export($status, true)), + ]; - $results[] = [ - 'title' => DI::l10n()->t('Decoded post'), - 'content' => $visible_whitespace(var_export($status, true)), - ]; + $postarray = []; + $postarray['object-type'] = Activity\ObjectType::NOTE; - $postarray = []; - $postarray['object-type'] = Activity\ObjectType::NOTE; - - if (!empty($status->full_text)) { - $postarray['body'] = $status->full_text; - } else { - $postarray['body'] = $status->text; - } - - // When the post contains links then use the correct object type - if (count($status->entities->urls) > 0) { - $postarray['object-type'] = Activity\ObjectType::BOOKMARK; - } - - $results[] = [ - 'title' => DI::l10n()->t('Post array before expand entities'), - 'content' => $visible_whitespace(var_export($postarray, true)), - ]; + if (!empty($status->full_text)) { + $postarray['body'] = $status->full_text; } else { - $results[] = [ - 'title' => DI::l10n()->tt('Error', 'Errors', 1), - 'content' => DI::l10n()->t('Twitter addon is absent from the addon/ folder.'), - ]; + $postarray['body'] = $status->text; } + // When the post contains links then use the correct object type + if (count($status->entities->urls) > 0) { + $postarray['object-type'] = Activity\ObjectType::BOOKMARK; + } + + $results[] = [ + 'title' => DI::l10n()->t('Post array before expand entities'), + 'content' => $visible_whitespace(var_export($postarray, true)), + ]; + break; } } diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 5fcd435369..d68690a828 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2024.12-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-16 19:15+0000\n" +"POT-Creation-Date: 2024-11-17 07:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -293,7 +293,7 @@ msgstr "" #: src/Module/Calendar/Event/Form.php:236 src/Module/Contact/Advanced.php:118 #: src/Module/Contact/Profile.php:376 #: src/Module/Debug/ActivityPubConversion.php:128 -#: src/Module/Debug/Babel.php:288 src/Module/Debug/Localtime.php:50 +#: src/Module/Debug/Babel.php:279 src/Module/Debug/Localtime.php:50 #: src/Module/Debug/Probe.php:40 src/Module/Debug/WebFinger.php:37 #: src/Module/FriendSuggest.php:132 src/Module/Install.php:220 #: src/Module/Install.php:260 src/Module/Install.php:295 @@ -1065,7 +1065,7 @@ msgstr "" msgid "Email" msgstr "" -#: src/Content/ContactSelector.php:122 src/Module/Debug/Babel.php:282 +#: src/Content/ContactSelector.php:122 src/Module/Debug/Babel.php:273 msgid "Diaspora" msgstr "" @@ -3028,32 +3028,32 @@ msgstr "" msgid "Enter a valid existing folder" msgstr "" -#: src/Core/Update.php:102 +#: src/Core/Update.php:103 #, php-format msgid "Updates from version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383." msgstr "" -#: src/Core/Update.php:113 +#: src/Core/Update.php:114 #, php-format msgid "Updates from postupdate version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383." msgstr "" -#: src/Core/Update.php:205 +#: src/Core/Update.php:206 #, php-format msgid "%s: executing pre update %d" msgstr "" -#: src/Core/Update.php:247 +#: src/Core/Update.php:248 #, php-format msgid "%s: executing post update %d" msgstr "" -#: src/Core/Update.php:321 +#: src/Core/Update.php:322 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: src/Core/Update.php:361 +#: src/Core/Update.php:362 #, php-format msgid "" "\n" @@ -3063,16 +3063,16 @@ msgid "" "\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." msgstr "" -#: src/Core/Update.php:367 +#: src/Core/Update.php:368 #, php-format msgid "The error message is\\n[pre]%s[/pre]" msgstr "" -#: src/Core/Update.php:371 src/Core/Update.php:399 +#: src/Core/Update.php:372 src/Core/Update.php:400 msgid "[Friendica Notify] Database update" msgstr "" -#: src/Core/Update.php:393 +#: src/Core/Update.php:394 #, php-format msgid "" "\n" @@ -6741,7 +6741,7 @@ msgid "Result Item" msgstr "" #: src/Module/Debug/ActivityPubConversion.php:117 -#: src/Module/Debug/Babel.php:267 src/Module/Moderation/Item/Source.php:82 +#: src/Module/Moderation/Item/Source.php:82 #: src/Module/Security/TwoFactor/Verify.php:84 msgid "Error" msgid_plural "Errors" @@ -6884,39 +6884,35 @@ msgstr "" msgid "HTML::toPlaintext (compact)" msgstr "" -#: src/Module/Debug/Babel.php:243 +#: src/Module/Debug/Babel.php:240 msgid "Decoded post" msgstr "" -#: src/Module/Debug/Babel.php:262 +#: src/Module/Debug/Babel.php:259 msgid "Post array before expand entities" msgstr "" -#: src/Module/Debug/Babel.php:268 -msgid "Twitter addon is absent from the addon/ folder." -msgstr "" - -#: src/Module/Debug/Babel.php:278 +#: src/Module/Debug/Babel.php:269 msgid "Babel Diagnostic" msgstr "" -#: src/Module/Debug/Babel.php:280 +#: src/Module/Debug/Babel.php:271 msgid "Source text" msgstr "" -#: src/Module/Debug/Babel.php:281 +#: src/Module/Debug/Babel.php:272 msgid "BBCode" msgstr "" -#: src/Module/Debug/Babel.php:283 +#: src/Module/Debug/Babel.php:274 msgid "Markdown" msgstr "" -#: src/Module/Debug/Babel.php:284 +#: src/Module/Debug/Babel.php:275 msgid "HTML" msgstr "" -#: src/Module/Debug/Babel.php:286 +#: src/Module/Debug/Babel.php:277 msgid "Twitter Source / Tweet URL (requires API key)" msgstr ""