Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-10 05:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-12-19 20:26:16 +01:00
commit d20da74b77
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataStorage/Database/Mapper/ReadMapper.php
View File

@ -306,8 +306,8 @@ final class ReadMapper extends DataMapperAbstract
/** /**
* Get mapper specific builder * Get mapper specific builder
* *
* @param null|Builder $query Query to fill * @param Builder $query Query to fill
* @param array $columns Columns to use * @param array $columns Columns to use
* *
* @return Builder * @return Builder
* *
@ -843,7 +843,7 @@ final class ReadMapper extends DataMapperAbstract
->from($many['table']) ->from($many['table'])
->where($many['table'] . '.' . $many['self'], '=', $primaryKey); ->where($many['table'] . '.' . $many['self'], '=', $primaryKey);
if ($many['mapper']::TABLE !== $many['table']) { if ($many['table'] !== $many['mapper']::TABLE) {
$query->leftJoin($many['mapper']::TABLE) $query->leftJoin($many['mapper']::TABLE)
->on($many['table'] . '.' . $src, '=', $many['mapper']::TABLE . '.' . $many['mapper']::PRIMARYFIELD); ->on($many['table'] . '.' . $src, '=', $many['mapper']::TABLE . '.' . $many['mapper']::PRIMARYFIELD);
} }

2
DataStorage/Database/Mapper/UpdateMapper.php
View File

@ -330,7 +330,7 @@ final class UpdateMapper extends DataMapperAbstract
->from($many['table']) ->from($many['table'])
->where($many['table'] . '.' . $many['self'], '=', $objId); ->where($many['table'] . '.' . $many['self'], '=', $objId);
if ($many['mapper']::TABLE !== $many['table']) { if ($many['table'] !== $many['mapper']::TABLE) {
$query->leftJoin($many['mapper']::TABLE) $query->leftJoin($many['mapper']::TABLE)
->on($many['table'] . '.' . $src, '=', $many['mapper']::TABLE . '.' . $many['mapper']::PRIMARYFIELD); ->on($many['table'] . '.' . $src, '=', $many['mapper']::TABLE . '.' . $many['mapper']::PRIMARYFIELD);
} }

2
Message/Mail/Email.php
View File

@ -895,7 +895,7 @@ class Email implements MessageInterface
$errorcode = 0; $errorcode = 0;
if (\defined('INTL_IDNA_VARIANT_UTS46')) { if (\defined('INTL_IDNA_VARIANT_UTS46')) {
$punycode = \idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46); $punycode = \idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46);
} else { } else {
$punycode = \idn_to_ascii($domain, $errorcode); $punycode = \idn_to_ascii($domain, $errorcode);
} }