Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

there's not type hint 'resource' (bug in my converter)

Browse source 
https://wiki.php.net/rfc/scalar_type_hints#type_hint_choices
This commit is contained in:
djmaze 2020-03-11 15:42:46 +01:00
parent 69a33c0c25
commit 690190bb26
8 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
View file

@ -140,8 +140,8 @@ class HeaderCollection extends \MailSo\Base\Collection
$aResult = $this->FilterList(function ($oHeader) use ($sHeaderName) { $aResult = $this->FilterList(function ($oHeader) use ($sHeaderName) {
return $oHeader && \strtolower($oHeader->Name()) !== \strtolower($sHeaderName); return $oHeader && \strtolower($oHeader->Name()) !== \strtolower($sHeaderName);
}); });
$this->SetAsArray($aResult);
return $this->SetAsArray($aResult); return $this;
} }
/** /**

6
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -5376,7 +5376,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
* @throws \MailSo\Net\Exceptions\ConnectionException * @throws \MailSo\Net\Exceptions\ConnectionException
*/ */
private function smtpSendMessage(\RainLoop\Model\Account $oAccount, \MailSo\Mime\Message $oMessage, private function smtpSendMessage(\RainLoop\Model\Account $oAccount, \MailSo\Mime\Message $oMessage,
resource &$rMessageStream, int &$iMessageStreamSize, bool $bDsn = false, bool $bAddHiddenRcpt = true) /*resource*/ &$rMessageStream, int &$iMessageStreamSize, bool $bDsn = false, bool $bAddHiddenRcpt = true)
{ {
$oRcpt = $oMessage->GetRcpt(); $oRcpt = $oMessage->GetRcpt();
if ($oRcpt && 0 < $oRcpt->Count()) if ($oRcpt && 0 < $oRcpt->Count())
@ -6958,7 +6958,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
return $this->DefaultResponse(__FUNCTION__, $mResponse); return $this->DefaultResponse(__FUNCTION__, $mResponse);
} }
private function importContactsFromCsvFile(\RainLoop\Model\Account $oAccount, resource $rFile, string $sFileStart) : int private function importContactsFromCsvFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile, string $sFileStart) : int
{ {
$iCount = 0; $iCount = 0;
$aHeaders = null; $aHeaders = null;
@ -7011,7 +7011,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
return $iCount; return $iCount;
} }
private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, resource $rFile) : int private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile) : int
{ {
$iCount = 0; $iCount = 0;
if ($oAccount && \is_resource($rFile)) if ($oAccount && \is_resource($rFile))

2
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
View file

@ -14,7 +14,7 @@ class Files extends \RainLoop\Providers\AbstractProvider
$this->oDriver = $oDriver; $this->oDriver = $oDriver;
} }
public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, resource $rSource) : bool public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool
{ {
return $this->oDriver->PutFile($oAccount, $sKey, $rSource); return $this->oDriver->PutFile($oAccount, $sKey, $rSource);
} }

2
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
View file

@ -25,7 +25,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
return $this->generateFullFileName($oAccount, $sKey, true); return $this->generateFullFileName($oAccount, $sKey, true);
} }
public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, resource $rSource) : bool public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool
{ {
$bResult = false; $bResult = false;
if ($rSource) if ($rSource)

2
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
View file

@ -6,7 +6,7 @@ interface IFiles
{ {
public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey) : string; public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey) : string;
public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, resource $rSource) : bool; public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool;
public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource) : bool; public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource) : bool;

2
rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -172,7 +172,7 @@ class ServiceActions
{ {
error_log($oException->getMessage()); error_log($oException->getMessage());
if ($e = $oException->getPrevious()) { if ($e = $oException->getPrevious()) {
error_log("\t".$e->getMessage()); error_log("\t{$e->getMessage()} @ {$e->getFile()}#{$e->getLine()}");
} }
$aResponseItem = $this->oActions->ExceptionResponse( $aResponseItem = $this->oActions->ExceptionResponse(

2
rainloop/v/0.0.0/app/templates/Index.html
View file

@ -14,7 +14,9 @@
<meta name="google" content="notranslate" /> <meta name="google" content="notranslate" />
<meta name="robots" content="noindex,nofollow,noodp" /> <meta name="robots" content="noindex,nofollow,noodp" />
<meta name="AppBootData" content='{{RainloopBootData}}' id="app-boot-data" /> <meta name="AppBootData" content='{{RainloopBootData}}' id="app-boot-data" />
<!--
<script type="text/javascript" data-cfasync="false" src="{{BaseAppPolyfillsScriptLink}}"></script> <script type="text/javascript" data-cfasync="false" src="{{BaseAppPolyfillsScriptLink}}"></script>
-->
{{BaseContentSecurityPolicy}} {{BaseContentSecurityPolicy}}
<title></title> <title></title>
{{BaseAppHeadScriptLink}} {{BaseAppHeadScriptLink}}

3
rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
View file

@ -174,8 +174,7 @@
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<a class="btn first" data-tooltip-join="bottom" <a class="btn first" data-tooltip-join="bottom"
style="padding-left: 10px; padding-right: 10px;" style="padding-left: 10px; padding-right: 10px;"
data-bind="visible: addAttachmentEnabled(), initDom: composeUploaderButton, tooltip: 'COMPOSE/ATTACH_FILES', data-bind="visible: addAttachmentEnabled(), initDom: composeUploaderButton, tooltip: 'COMPOSE/ATTACH_FILES'">
css: {'last': !(driveEnabled() && driveVisible())}">
<sup style="font-weight: bold; font-size: 100%; top: -0.3em;">+</sup><i class="icon-attachment"></i> <sup style="font-weight: bold; font-size: 100%; top: -0.3em;">+</sup><i class="icon-attachment"></i>
</a> </a>
</div> </div>