From 49d9093e4488b70955d20ef5b2dff0f6a7a9b45a Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Thu, 6 May 2021 11:00:52 +0300 Subject: [PATCH] Fix closure warnings (#2087) --- .../MailSo/Base/StreamWrappers/SubStreams.php | 2 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 46 ++++++------------- .../v/0.0.0/app/libraries/RainLoop/Api.php | 2 +- .../Providers/AddressBook/PdoAddressBook.php | 7 +-- 4 files changed, 19 insertions(+), 38 deletions(-) diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php index d82929bd0..28b80e097 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php @@ -67,7 +67,7 @@ class SubStreams $sHashName = \MailSo\Base\Utils::Md5Rand(); - self::$aStreams[$sHashName] = array_map(function($mItem) { + self::$aStreams[$sHashName] = \array_map(function ($mItem) { return \is_resource($mItem) ? $mItem : \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($mItem); }, $aSubStreams); diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index ae7fdf05b..7cfa02c53 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -5718,11 +5718,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aFlagsFilteredUids = array(); if (0 < strlen($sFlagsUids)) { - $aFlagsUids = explode(',', $sFlagsUids); - $aFlagsFilteredUids = array_filter($aFlagsUids, function (&$sUid) { - $sUid = (int) trim($sUid); - return 0 < (int) trim($sUid); - }); + $aFlagsUids = \explode(',', $sFlagsUids); + $aFlagsUids = \array_map('intval', $aFlagsUids); + $aFlagsFilteredUids = \array_filter($aFlagsUids); } $this->initMailClientConnection(); @@ -7067,11 +7065,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins { $oAccount = $this->getAccountFromToken(); $aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); - - $aFilteredUids = \array_filter($aUids, function (&$mUid) { - $mUid = (int) \trim($mUid); - return 0 < $mUid; - }); + $aUids = \array_map('intval', $aUids); + $aFilteredUids = \array_filter($aUids); $bResult = false; if (0 < \count($aFilteredUids) && $this->AddressBookProvider($oAccount)->IsActive()) @@ -7235,10 +7230,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sFolder = $this->GetActionParam('Folder', ''); $bSetAction = '1' === (string) $this->GetActionParam('SetAction', '0'); $aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); - $aFilteredUids = \array_filter($aUids, function (&$sUid) { - $sUid = (int) \trim($sUid); - return 0 < $sUid; - }); + $aUids = \array_map('intval', $aUids); + $aFilteredUids = \array_filter($aUids); try { @@ -7356,11 +7349,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sFolder = $this->GetActionParam('Folder', ''); $aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); - - $aFilteredUids = \array_filter($aUids, function (&$sUid) { - $sUid = (int) \trim($sUid); - return 0 < $sUid; - }); + $aUids = \array_map('intval', $aUids); + $aFilteredUids = \array_filter($aUids); try { @@ -7409,13 +7399,10 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sFromFolder = $this->GetActionParam('FromFolder', ''); $sToFolder = $this->GetActionParam('ToFolder', ''); - $aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); $bMarkAsRead = '1' === (string) $this->GetActionParam('MarkAsRead', '0'); - - $aFilteredUids = \array_filter($aUids, function (&$mUid) { - $mUid = (int) \trim($mUid); - return 0 < $mUid; - }); + $aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); + $aUids = \array_map('intval', $aUids); + $aFilteredUids = \array_filter($aUids); if ($bMarkAsRead) { @@ -7479,11 +7466,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sFromFolder = $this->GetActionParam('FromFolder', ''); $sToFolder = $this->GetActionParam('ToFolder', ''); $aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); - - $aFilteredUids = \array_filter($aUids, function (&$mUid) { - $mUid = (int) \trim($mUid); - return 0 < $mUid; - }); + $aUids = \array_map('intval', $aUids); + $aFilteredUids = \array_filter($aUids); try { @@ -8462,7 +8446,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $sResultHash = ''; - $mResult = $this->MailClient()->MessageMimeStream(function($rResource, $sContentType, $sFileName, $sMimeIndex = '') + $mResult = $this->MailClient()->MessageMimeStream(function ($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($oAccount, $oFileProvider, $sFileNameIn, $sContentTypeIn, &$sResultHash) { unset($sContentType, $sFileName, $sMimeIndex); diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php index 9013825df..c9a1d7ded 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php @@ -119,7 +119,7 @@ class Api if (!empty($sSslCafile) || !empty($sSslCapath)) { - \MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function (&$aStreamContextSettings) use ($sSslCafile, $sSslCapath) { + \MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function ($aStreamContextSettings) use ($sSslCafile, $sSslCapath) { if (isset($aStreamContextSettings['ssl']) && \is_array($aStreamContextSettings['ssl'])) { if (empty($aStreamContextSettings['ssl']['cafile']) && !empty($sSslCafile)) diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php index 25496255b..59af9d27c 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php @@ -996,11 +996,8 @@ class PdoAddressBook } $iUserID = $this->getUserId($sEmail); - - $aContactIds = \array_filter($aContactIds, function (&$mItem) { - $mItem = (int) \trim($mItem); - return 0 < $mItem; - }); + $aContactIds = \array_map('intval', $aContactIds); + $aContactIds = \array_filter($aContactIds); if (0 === \count($aContactIds)) {