Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-22 18:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactoring-of-app-class

Browse source
This commit is contained in:
Art4 2024-11-17 07:37:58 +00:00
commit 5696a5249f
4 changed files with 48 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.woodpecker/.phpunit.yml
View file

@ -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:

2
src/Core/Cache/Type/APCuCache.php
View file

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

9
src/Module/Debug/Babel.php
View file

@ -234,9 +234,6 @@ 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);
$results[] = [
@ -262,12 +259,6 @@ class Babel extends BaseModule
'title' => DI::l10n()->t('Post array before expand entities'),
'content' => $visible_whitespace(var_export($postarray, true)),
];
} else {
$results[] = [
'title' => DI::l10n()->tt('Error', 'Errors', 1),
'content' => DI::l10n()->t('Twitter addon is absent from the addon/ folder.'),
];
}
break;
}

46
view/lang/C/messages.po
View file

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""