Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-13 07:18:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-21 23:25:45 +00:00
commit c87d1df047
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php
View File

@ -104,7 +104,7 @@ class SpreadsheetDatabaseMapper implements IODatabaseMapper
$cells[] = $workSheet->getCell(StringUtils::intToAlphabet($j) . $line)->getCalculatedValue(); $cells[] = $workSheet->getCell(StringUtils::intToAlphabet($j) . $line)->getCalculatedValue();
} }
var_dump($cells); \var_dump($cells);
++$line; ++$line;

2
Utils/Parser/Markdown/Markdown.php
View File

@ -3999,7 +3999,7 @@ class Markdown
$Elements = $this->linesElements($lines); $Elements = $this->linesElements($lines);
if (! \in_array('', $lines) if (! \in_array('', $lines)
&& isset($Elements[0]) && isset($Elements[0]['name']) && isset($Elements[0], $Elements[0]['name'])
&& $Elements[0]['name'] === 'p' && $Elements[0]['name'] === 'p'
) { ) {
unset($Elements[0]['name']); unset($Elements[0]['name']);

4
tests/Message/Http/RestTest.php
View File

@ -52,6 +52,10 @@ final class RestTest extends \PHPUnit\Framework\TestCase
$request = new HttpRequest(new HttpUri('http://httpbin.org/post')); $request = new HttpRequest(new HttpUri('http://httpbin.org/post'));
$request->setMethod(RequestMethod::POST); $request->setMethod(RequestMethod::POST);
self::assertTrue($request->setData('pdata', 'abc')); self::assertTrue($request->setData('pdata', 'abc'));
<<<<<<< HEAD
=======
\var_dump(REST::request($request)->getJsonData());
>>>>>>> 0080e35aace364fcf8708442f556fff4aba75143
self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata'] ?? ''); self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata'] ?? '');
} }

2
tests/Stdlib/Base/EnumTest.php
View File

@ -144,6 +144,6 @@ final class EnumTest extends \PHPUnit\Framework\TestCase
*/ */
public function testInvalidConstantException() : void public function testInvalidConstantException() : void
{ {
self::assertEquals(null, EnumDemo::getByName('ENUM3')); self::assertNull(EnumDemo::getByName('ENUM3'));
} }
} }