Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-03-07 08:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-09-30 16:29:51 +02:00
parent 634cc3d505
commit 328e9c547e
4 changed files with 6523 additions and 6305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utils/StringUtils.php
View File

@ -293,7 +293,7 @@ final class StringUtils
// @todo: this should not be necessary
return \str_replace(
['</del></del>', '</ins></ins>', '<ins></ins>', '<del></del>', '</ins><ins>', '</del><del>', '</ins> <del>', '</del> <ins>'],
['', '', '', '', '', '', '</ins><del>', '</del><ins>'],
['</del>', '</ins>', '', '', '', '', '</ins><del>', '</del><ins>'],
$result
);
}

78
tests/Message/Mail/MailHandlerSmtpTrait.php
View File

@ -33,9 +33,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -69,9 +69,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -110,9 +110,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -140,9 +140,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -168,9 +168,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -196,9 +196,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -227,9 +227,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -256,9 +256,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -284,9 +284,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -313,9 +313,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -346,9 +346,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -379,9 +379,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}
@ -443,9 +443,9 @@ trait MailHandlerSmtpTrait
$smtp = new Smtp();
$this->handler->smtp = $smtp;
if ($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
&& ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
if (($this->handler->mailerTool !== ''
&& !\file_exists(\explode(' ', $this->handler->mailerTool)[0]))
|| (!$this->handler->smtpConnect($this->handler->smtpOptions))
) {
self::markTestSkipped();
}

2
tests/Module/InstallerAbstractTest.php
View File

@ -48,7 +48,7 @@ final class InstallerAbstractTest extends \PHPUnit\Framework\TestCase
*/
public function testInvalidModuleInstall() : void
{
$this->expectException(\UnexpectedValueException::class);
$this->expectException(\Error::class);
$app = new class() extends ApplicationAbstract {};
$app->dbPool = $GLOBALS['dbpool'];

12746
tests/coverage.xml
View File

File diff suppressed because it is too large Load Diff