From 25b089c1a930e41e0d4029aad3fde531e21717e1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 17 Nov 2024 16:17:05 +0100 Subject: fix some errors detected by phpstan --- Zotlabs/Lib/Enotify.php | 2 +- Zotlabs/Module/Api.php | 3 +++ Zotlabs/Module/Photos.php | 4 +-- include/xchan.php | 6 +++-- util/precompile_smarty3.php | 50 ++++++++++++++++------------------- vendor/composer/autoload_classmap.php | 23 +++++++++++++++- vendor/composer/autoload_static.php | 23 +++++++++++++++- vendor/composer/installed.php | 4 +-- view/tpl/cover_photo.tpl | 2 +- 9 files changed, 80 insertions(+), 37 deletions(-) diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 245d137fb..9bffc53a0 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -595,7 +595,7 @@ class Enotify { // send email notification if notification preferences permit - require_once('bbcode.php'); + require_once('include/bbcode.php'); if ((intval($recip['channel_notifyflags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { logger('notification: sending notification email'); diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php index 8574ae1cd..c3337b501 100644 --- a/Zotlabs/Module/Api.php +++ b/Zotlabs/Module/Api.php @@ -108,6 +108,9 @@ class Api extends \Zotlabs\Web\Controller { echo api_call(); killme(); + + // not reached + return; } function oauth_get_client($request){ diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 870a2cb79..e31aa9dc1 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1122,7 +1122,7 @@ class Photos extends \Zotlabs\Web\Controller { if(is_array($like_list) && (count($like_list) > MAX_LIKERS)) { $like_list_part = array_slice($like_list, 0, MAX_LIKERS); - array_push($like_list_part, '' . t('View all') . ''); + array_push($like_list_part, '' . t('View all') . ''); } else { $like_list_part = ''; } @@ -1134,7 +1134,7 @@ class Photos extends \Zotlabs\Web\Controller { $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun'); if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) { $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); - array_push($dislike_list_part, '' . t('View all') . ''); + array_push($dislike_list_part, '' . t('View all') . ''); } else { $dislike_list_part = ''; } diff --git a/include/xchan.php b/include/xchan.php index b8677c8c4..c492a77dc 100644 --- a/include/xchan.php +++ b/include/xchan.php @@ -217,6 +217,10 @@ function xchan_keychange_acl($table,$column,$oldxchan,$newxchan) { function xchan_change_key($oldx,$newx,$data) { + // TODO: this will need a refactor to eliminate duplicate keys + // E.G. item => [author_xchan, owner_xchan, source_kchan] + // Also: add a test! + $tables = [ 'abook' => 'abook_xchan', 'abconfig' => 'xchan', @@ -227,8 +231,6 @@ function xchan_change_key($oldx,$newx,$data) { 'item' => 'owner_xchan', 'item' => 'author_xchan', 'item' => 'source_xchan', - 'mail' => 'from_xchan', - 'mail' => 'to_xchan', 'shares' => 'share_xchan', 'source' => 'src_channel_xchan', 'source' => 'src_xchan', diff --git a/util/precompile_smarty3.php b/util/precompile_smarty3.php index c977a9680..10b2eadb6 100755 --- a/util/precompile_smarty3.php +++ b/util/precompile_smarty3.php @@ -1,27 +1,23 @@ -setTemplateDir($folders); - -$s->setCompileDir(TEMPLATE_BUILD_PATH . '/compiled/'); -$s->setConfigDir(TEMPLATE_BUILD_PATH . '/config/'); -$s->setCacheDir(TEMPLATE_BUILD_PATH . '/cache/'); - -$s->left_delimiter = "{{"; -$s->right_delimiter = "}}"; - -$s->compileAllTemplates('.tpl',true); \ No newline at end of file +setTemplateDir($folders); + +$s->setCompileDir(TEMPLATE_BUILD_PATH . '/compiled/'); +$s->setConfigDir(TEMPLATE_BUILD_PATH . '/config/'); +$s->setCacheDir(TEMPLATE_BUILD_PATH . '/cache/'); + +$s->left_delimiter = '{{'; +$s->right_delimiter = '}}'; + +$s->compileAllTemplates('.tpl', true); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 680a7dbfa..b19cd0f42 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1269,6 +1269,24 @@ return array( 'Zotlabs\\Access\\PermissionLimits' => $baseDir . '/Zotlabs/Access/PermissionLimits.php', 'Zotlabs\\Access\\PermissionRoles' => $baseDir . '/Zotlabs/Access/PermissionRoles.php', 'Zotlabs\\Access\\Permissions' => $baseDir . '/Zotlabs/Access/Permissions.php', + 'Zotlabs\\ActivityStreams\\ASObject' => $baseDir . '/Zotlabs/ActivityStreams/ASObject.php', + 'Zotlabs\\ActivityStreams\\Activity' => $baseDir . '/Zotlabs/ActivityStreams/Activity.php', + 'Zotlabs\\ActivityStreams\\Actor' => $baseDir . '/Zotlabs/ActivityStreams/Actor.php', + 'Zotlabs\\ActivityStreams\\AssertionMethod' => $baseDir . '/Zotlabs/ActivityStreams/AssertionMethod.php', + 'Zotlabs\\ActivityStreams\\Collection' => $baseDir . '/Zotlabs/ActivityStreams/Collection.php', + 'Zotlabs\\ActivityStreams\\CollectionPage' => $baseDir . '/Zotlabs/ActivityStreams/CollectionPage.php', + 'Zotlabs\\ActivityStreams\\IntransitiveActivity' => $baseDir . '/Zotlabs/ActivityStreams/IntransitiveActivity.php', + 'Zotlabs\\ActivityStreams\\Link' => $baseDir . '/Zotlabs/ActivityStreams/Link.php', + 'Zotlabs\\ActivityStreams\\OrderedCollection' => $baseDir . '/Zotlabs/ActivityStreams/OrderedCollection.php', + 'Zotlabs\\ActivityStreams\\OrderedCollectionPage' => $baseDir . '/Zotlabs/ActivityStreams/OrderedCollectionPage.php', + 'Zotlabs\\ActivityStreams\\Place' => $baseDir . '/Zotlabs/ActivityStreams/Place.php', + 'Zotlabs\\ActivityStreams\\Profile' => $baseDir . '/Zotlabs/ActivityStreams/Profile.php', + 'Zotlabs\\ActivityStreams\\PublicKey' => $baseDir . '/Zotlabs/ActivityStreams/PublicKey.php', + 'Zotlabs\\ActivityStreams\\Question' => $baseDir . '/Zotlabs/ActivityStreams/Question.php', + 'Zotlabs\\ActivityStreams\\Relationship' => $baseDir . '/Zotlabs/ActivityStreams/Relationship.php', + 'Zotlabs\\ActivityStreams\\Signature' => $baseDir . '/Zotlabs/ActivityStreams/Signature.php', + 'Zotlabs\\ActivityStreams\\Tombstone' => $baseDir . '/Zotlabs/ActivityStreams/Tombstone.php', + 'Zotlabs\\ActivityStreams\\UnhandledElementException' => $baseDir . '/Zotlabs/ActivityStreams/UnhandledElementException.php', 'Zotlabs\\Daemon\\Addon' => $baseDir . '/Zotlabs/Daemon/Addon.php', 'Zotlabs\\Daemon\\Cache_embeds' => $baseDir . '/Zotlabs/Daemon/Cache_embeds.php', 'Zotlabs\\Daemon\\Cache_query' => $baseDir . '/Zotlabs/Daemon/Cache_query.php', @@ -1302,6 +1320,9 @@ return array( 'Zotlabs\\Daemon\\Thumbnail' => $baseDir . '/Zotlabs/Daemon/Thumbnail.php', 'Zotlabs\\Daemon\\Xchan_photo' => $baseDir . '/Zotlabs/Daemon/Xchan_photo.php', 'Zotlabs\\Daemon\\Zotconvo' => $baseDir . '/Zotlabs/Daemon/Zotconvo.php', + 'Zotlabs\\Entity\\Account' => $baseDir . '/Zotlabs/Entity/Account.php', + 'Zotlabs\\Entity\\Channel' => $baseDir . '/Zotlabs/Entity/Channel.php', + 'Zotlabs\\Entity\\Item' => $baseDir . '/Zotlabs/Entity/Item.php', 'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php', 'Zotlabs\\Extend\\Route' => $baseDir . '/Zotlabs/Extend/Route.php', 'Zotlabs\\Extend\\Widget' => $baseDir . '/Zotlabs/Extend/Widget.php', @@ -1318,6 +1339,7 @@ return array( 'Zotlabs\\Lib\\ActivityStreams' => $baseDir . '/Zotlabs/Lib/ActivityStreams.php', 'Zotlabs\\Lib\\Api_router' => $baseDir . '/Zotlabs/Lib/Api_router.php', 'Zotlabs\\Lib\\Apps' => $baseDir . '/Zotlabs/Lib/Apps.php', + 'Zotlabs\\Lib\\BaseObject' => $baseDir . '/Zotlabs/Lib/BaseObject.php', 'Zotlabs\\Lib\\Cache' => $baseDir . '/Zotlabs/Lib/Cache.php', 'Zotlabs\\Lib\\Chatroom' => $baseDir . '/Zotlabs/Lib/Chatroom.php', 'Zotlabs\\Lib\\Config' => $baseDir . '/Zotlabs/Lib/Config.php', @@ -1347,7 +1369,6 @@ return array( 'Zotlabs\\Lib\\QueueWorker' => $baseDir . '/Zotlabs/Lib/QueueWorker.php', 'Zotlabs\\Lib\\SConfig' => $baseDir . '/Zotlabs/Lib/SConfig.php', 'Zotlabs\\Lib\\Share' => $baseDir . '/Zotlabs/Lib/Share.php', - 'Zotlabs\\Lib\\SuperCurl' => $baseDir . '/Zotlabs/Lib/SuperCurl.php', 'Zotlabs\\Lib\\SvgSanitizer' => $baseDir . '/Zotlabs/Lib/SvgSanitizer.php', 'Zotlabs\\Lib\\System' => $baseDir . '/Zotlabs/Lib/System.php', 'Zotlabs\\Lib\\Techlevels' => $baseDir . '/Zotlabs/Lib/Techlevels.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 21078d9c0..54e4d8470 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1521,6 +1521,24 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Access\\PermissionLimits' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionLimits.php', 'Zotlabs\\Access\\PermissionRoles' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionRoles.php', 'Zotlabs\\Access\\Permissions' => __DIR__ . '/../..' . '/Zotlabs/Access/Permissions.php', + 'Zotlabs\\ActivityStreams\\ASObject' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/ASObject.php', + 'Zotlabs\\ActivityStreams\\Activity' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Activity.php', + 'Zotlabs\\ActivityStreams\\Actor' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Actor.php', + 'Zotlabs\\ActivityStreams\\AssertionMethod' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/AssertionMethod.php', + 'Zotlabs\\ActivityStreams\\Collection' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Collection.php', + 'Zotlabs\\ActivityStreams\\CollectionPage' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/CollectionPage.php', + 'Zotlabs\\ActivityStreams\\IntransitiveActivity' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/IntransitiveActivity.php', + 'Zotlabs\\ActivityStreams\\Link' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Link.php', + 'Zotlabs\\ActivityStreams\\OrderedCollection' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/OrderedCollection.php', + 'Zotlabs\\ActivityStreams\\OrderedCollectionPage' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/OrderedCollectionPage.php', + 'Zotlabs\\ActivityStreams\\Place' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Place.php', + 'Zotlabs\\ActivityStreams\\Profile' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Profile.php', + 'Zotlabs\\ActivityStreams\\PublicKey' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/PublicKey.php', + 'Zotlabs\\ActivityStreams\\Question' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Question.php', + 'Zotlabs\\ActivityStreams\\Relationship' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Relationship.php', + 'Zotlabs\\ActivityStreams\\Signature' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Signature.php', + 'Zotlabs\\ActivityStreams\\Tombstone' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/Tombstone.php', + 'Zotlabs\\ActivityStreams\\UnhandledElementException' => __DIR__ . '/../..' . '/Zotlabs/ActivityStreams/UnhandledElementException.php', 'Zotlabs\\Daemon\\Addon' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Addon.php', 'Zotlabs\\Daemon\\Cache_embeds' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Cache_embeds.php', 'Zotlabs\\Daemon\\Cache_query' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Cache_query.php', @@ -1554,6 +1572,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Daemon\\Thumbnail' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Thumbnail.php', 'Zotlabs\\Daemon\\Xchan_photo' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Xchan_photo.php', 'Zotlabs\\Daemon\\Zotconvo' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Zotconvo.php', + 'Zotlabs\\Entity\\Account' => __DIR__ . '/../..' . '/Zotlabs/Entity/Account.php', + 'Zotlabs\\Entity\\Channel' => __DIR__ . '/../..' . '/Zotlabs/Entity/Channel.php', + 'Zotlabs\\Entity\\Item' => __DIR__ . '/../..' . '/Zotlabs/Entity/Item.php', 'Zotlabs\\Extend\\Hook' => __DIR__ . '/../..' . '/Zotlabs/Extend/Hook.php', 'Zotlabs\\Extend\\Route' => __DIR__ . '/../..' . '/Zotlabs/Extend/Route.php', 'Zotlabs\\Extend\\Widget' => __DIR__ . '/../..' . '/Zotlabs/Extend/Widget.php', @@ -1570,6 +1591,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\ActivityStreams' => __DIR__ . '/../..' . '/Zotlabs/Lib/ActivityStreams.php', 'Zotlabs\\Lib\\Api_router' => __DIR__ . '/../..' . '/Zotlabs/Lib/Api_router.php', 'Zotlabs\\Lib\\Apps' => __DIR__ . '/../..' . '/Zotlabs/Lib/Apps.php', + 'Zotlabs\\Lib\\BaseObject' => __DIR__ . '/../..' . '/Zotlabs/Lib/BaseObject.php', 'Zotlabs\\Lib\\Cache' => __DIR__ . '/../..' . '/Zotlabs/Lib/Cache.php', 'Zotlabs\\Lib\\Chatroom' => __DIR__ . '/../..' . '/Zotlabs/Lib/Chatroom.php', 'Zotlabs\\Lib\\Config' => __DIR__ . '/../..' . '/Zotlabs/Lib/Config.php', @@ -1599,7 +1621,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\QueueWorker' => __DIR__ . '/../..' . '/Zotlabs/Lib/QueueWorker.php', 'Zotlabs\\Lib\\SConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/SConfig.php', 'Zotlabs\\Lib\\Share' => __DIR__ . '/../..' . '/Zotlabs/Lib/Share.php', - 'Zotlabs\\Lib\\SuperCurl' => __DIR__ . '/../..' . '/Zotlabs/Lib/SuperCurl.php', 'Zotlabs\\Lib\\SvgSanitizer' => __DIR__ . '/../..' . '/Zotlabs/Lib/SvgSanitizer.php', 'Zotlabs\\Lib\\System' => __DIR__ . '/../..' . '/Zotlabs/Lib/System.php', 'Zotlabs\\Lib\\Techlevels' => __DIR__ . '/../..' . '/Zotlabs/Lib/Techlevels.php', diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index a3167c12a..ab0b54ed5 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'zotlabs/hubzilla', 'pretty_version' => 'dev-9.4RC', 'version' => 'dev-9.4RC', - 'reference' => 'ce9d67f7b17a3b8c6dde40bce83e4329d1e7cdc2', + 'reference' => '67a9292aaa5246783b70ca3754b31924416d7f08', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -367,7 +367,7 @@ 'zotlabs/hubzilla' => array( 'pretty_version' => 'dev-9.4RC', 'version' => 'dev-9.4RC', - 'reference' => 'ce9d67f7b17a3b8c6dde40bce83e4329d1e7cdc2', + 'reference' => '67a9292aaa5246783b70ca3754b31924416d7f08', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index dd0d3dbee..d2069dcf6 100644 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -90,7 +90,7 @@
{{$info}}
{{/if}} {{if $existing}} - {{t('Cover Photo')}} + Cover Photo {{/if}}
-- cgit v1.2.3