From 35abf33c0571a1ba444202fdaedb6d929adc6fdc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 18 Feb 2022 20:25:18 -0500 Subject: [PATCH 1/3] Check for array content before querying keys in Worker\Notifier - Address https://github.com/friendica/friendica/issues/11218#issuecomment-1045137358 --- src/Worker/Notifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 146bcce9f..488ade222 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -732,7 +732,7 @@ class Notifier // Update the locally stored follower list when we deliver to a forum foreach (Tag::getByURIId($target_item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]) as $tag) { $target_contact = Contact::getByURL(Strings::normaliseLink($tag['url']), null, [], $uid); - if (($target_contact['contact-type'] == Contact::TYPE_COMMUNITY) && $target_contact['manually-approve']) { + if ($target_contact && $target_contact['contact-type'] == Contact::TYPE_COMMUNITY && $target_contact['manually-approve']) { Group::updateMembersForForum($target_contact['id']); } } From 26c86e25c920978f2c39aef586e688b11d6afbd8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 18 Feb 2022 22:43:45 -0500 Subject: [PATCH 2/3] [Composer] Update smarty/smarty version mask to ^4 --- composer.json | 2 +- composer.lock | 108 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 99 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index d8d93b63f..cc3a0db5f 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "pragmarx/recovery": "^0.2", "psr/container": "^1.0", "seld/cli-prompt": "^1.0", - "smarty/smarty": "^3.1", + "smarty/smarty": "^4", "ua-parser/uap-php": "^3.9", "xemlock/htmlpurifier-html5": "^0.1.11", "fxp/composer-asset-plugin": "^1.4", diff --git a/composer.lock b/composer.lock index c0e14fe52..fa2018825 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3d221e30c9cb7e3f34d8d8141b6fea6c", + "content-hash": "f5922f03b367e68a5930df6ed80c5c2f", "packages": [ { "name": "asika/simple-console", @@ -1152,6 +1152,24 @@ "html", "markdown" ], + "funding": [ + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + }, + { + "url": "https://www.patreon.com/colinodell", + "type": "patreon" + } + ], "time": "2020-07-01T00:34:03+00:00" }, { @@ -1481,6 +1499,12 @@ "mobile detector", "php mobile detect" ], + "funding": [ + { + "url": "https://github.com/serbanghita", + "type": "github" + } + ], "time": "2021-02-19T21:22:57+00:00" }, { @@ -1553,6 +1577,16 @@ "logging", "psr-3" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], "time": "2021-05-28T08:32:12+00:00" }, { @@ -3647,29 +3681,29 @@ }, { "name": "smarty/smarty", - "version": "v3.1.43", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "273f7e00fec034f6d61112552e9caf08d19565b7" + "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/273f7e00fec034f6d61112552e9caf08d19565b7", - "reference": "273f7e00fec034f6d61112552e9caf08d19565b7", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/9e0536de18b53ba193364291ef0303b0ab9903e1", + "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8", + "phpunit/phpunit": "^8.5 || ^7.5", "smarty/smarty-lexer": "^3.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -3693,14 +3727,18 @@ { "name": "Rodney Rehm", "email": "rodney.rehm@medialize.de" + }, + { + "name": "Simon Wisselink", + "homepage": "https://www.iwink.nl/" } ], "description": "Smarty - the compiling PHP template engine", - "homepage": "http://www.smarty.net", + "homepage": "https://smarty-php.github.io/smarty/", "keywords": [ "templating" ], - "time": "2022-01-10T09:52:40+00:00" + "time": "2022-02-06T20:34:27+00:00" }, { "name": "spomky-labs/base64url", @@ -3751,6 +3789,16 @@ "safe", "url" ], + "funding": [ + { + "url": "https://github.com/Spomky", + "type": "github" + }, + { + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" + } + ], "time": "2020-11-03T09:10:25+00:00" }, { @@ -4613,6 +4661,20 @@ "constructor", "instantiate" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -4822,6 +4884,12 @@ "object", "object graph" ], + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], "time": "2020-11-13T09:40:50+00:00" }, { @@ -6547,6 +6615,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2021-02-19T12:13:01+00:00" }, { @@ -6587,6 +6669,12 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], "time": "2021-07-28T10:34:58+00:00" }, { From 4fe2257d8e4c663cbb17f2c38ad848ab5cd2c32a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 18 Feb 2022 22:44:11 -0500 Subject: [PATCH 3/3] Prevent warnings on undefined Smarty template variables --- src/Render/FriendicaSmarty.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php index 44a741d7c..50dda5eba 100644 --- a/src/Render/FriendicaSmarty.php +++ b/src/Render/FriendicaSmarty.php @@ -58,5 +58,7 @@ class FriendicaSmarty extends Smarty // Don't report errors so verbosely $this->error_reporting = E_ALL & ~E_NOTICE; + + $this->muteUndefinedOrNullWarnings(); } }