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

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2021-12-11 10:58:10 +00:00
parent aa004569f5
commit 89ae5950e4
4 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataStorage/Database/Mapper/DeleteMapper.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace phpOMS\DataStorage\Database\Mapper; namespace phpOMS\DataStorage\Database\Mapper;
use phpOMS\DataStorage\Database\Exception\InvalidMapperException;
use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\Builder;
/** /**
@ -95,7 +94,7 @@ class DeleteMapper extends DataMapperAbstract
$mapper = $relData['mapper']; $mapper = $relData['mapper'];
/** @var self $relMapper */ /** @var self $relMapper */
$relMapper = $this->createRelationMapper($mapper::delete(db: $this->db), $member); $relMapper = $this->createRelationMapper($mapper::delete(db: $this->db), $member);
$relMapper->depth = $this->depth + 1; $relMapper->depth = $this->depth + 1;
$refProp = $refClass->getProperty($member); $refProp = $refClass->getProperty($member);
@ -121,7 +120,7 @@ class DeleteMapper extends DataMapperAbstract
continue; continue;
} }
$objIds = []; $objIds = [];
$refProp = $refClass->getProperty($member); $refProp = $refClass->getProperty($member);
if (!$refProp->isPublic()) { if (!$refProp->isPublic()) {
$refProp->setAccessible(true); $refProp->setAccessible(true);

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

@ -105,12 +105,12 @@ class ReadMapper extends DataMapperAbstract
// @todo: consider to always return an array, this way we could remove executeGetAll // @todo: consider to always return an array, this way we could remove executeGetAll
public function executeGet(Builder $query = null) : mixed public function executeGet(Builder $query = null) : mixed
{ {
$primaryKeys = []; $primaryKeys = [];
$memberOfPrimaryField = $this->mapper::COLUMNS[$this->mapper::PRIMARYFIELD]['internal']; $memberOfPrimaryField = $this->mapper::COLUMNS[$this->mapper::PRIMARYFIELD]['internal'];
$emptyWhere = empty($this->where); $emptyWhere = empty($this->where);
if (isset($this->where[$memberOfPrimaryField])) { if (isset($this->where[$memberOfPrimaryField])) {
$keys = $this->where[$memberOfPrimaryField][0]['value']; $keys = $this->where[$memberOfPrimaryField][0]['value'];
$primaryKeys = \array_merge(\is_array($keys) ? $keys : [$keys], $primaryKeys); $primaryKeys = \array_merge(\is_array($keys) ? $keys : [$keys], $primaryKeys);
} }
@ -205,8 +205,8 @@ class ReadMapper extends DataMapperAbstract
/** /**
* Get mapper specific builder * Get mapper specific builder
* *
* @param 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
* *
@ -350,7 +350,7 @@ class ReadMapper extends DataMapperAbstract
} }
/** @var self $relMapper */ /** @var self $relMapper */
$relMapper = $this->createRelationMapper($rel['mapper']::reader(db: $this->db), $member); $relMapper = $this->createRelationMapper($rel['mapper']::reader(db: $this->db), $member);
$relMapper->depth = $this->depth + 1; $relMapper->depth = $this->depth + 1;
$query = $relMapper->getQuery( $query = $relMapper->getQuery(
@ -638,7 +638,7 @@ class ReadMapper extends DataMapperAbstract
} }
/** @var class-string<DataMapperFactory> $ownsOneMapper */ /** @var class-string<DataMapperFactory> $ownsOneMapper */
$ownsOneMapper = $this->createRelationMapper($mapper::get($this->db), $member); $ownsOneMapper = $this->createRelationMapper($mapper::get($this->db), $member);
$ownsOneMapper->depth = $this->depth + 1; $ownsOneMapper->depth = $this->depth + 1;
return $ownsOneMapper->populateAbstract($result, $mapper::createBaseModel()); return $ownsOneMapper->populateAbstract($result, $mapper::createBaseModel());
@ -689,7 +689,7 @@ class ReadMapper extends DataMapperAbstract
// in this case you can get the profile by loading the profile based on the account reference column // in this case you can get the profile by loading the profile based on the account reference column
if (isset($this->mapper::BELONGS_TO[$member]['by'])) { if (isset($this->mapper::BELONGS_TO[$member]['by'])) {
/** @var class-string<DataMapperFactory> $belongsToMapper */ /** @var class-string<DataMapperFactory> $belongsToMapper */
$belongsToMapper = $this->createRelationMapper($mapper::get($this->db), $member); $belongsToMapper = $this->createRelationMapper($mapper::get($this->db), $member);
$belongsToMapper->depth = $this->depth + 1; $belongsToMapper->depth = $this->depth + 1;
$belongsToMapper->where($this->mapper::BELONGS_TO[$member]['by'], $result[$mapper::getColumnByMember($this->mapper::BELONGS_TO[$member]['by']) . '_d' . $this->depth + 1], '='); $belongsToMapper->where($this->mapper::BELONGS_TO[$member]['by'], $result[$mapper::getColumnByMember($this->mapper::BELONGS_TO[$member]['by']) . '_d' . $this->depth + 1], '=');
@ -697,7 +697,7 @@ class ReadMapper extends DataMapperAbstract
} }
/** @var class-string<DataMapperFactory> $belongsToMapper */ /** @var class-string<DataMapperFactory> $belongsToMapper */
$belongsToMapper = $this->createRelationMapper($mapper::get($this->db), $member); $belongsToMapper = $this->createRelationMapper($mapper::get($this->db), $member);
$belongsToMapper->depth = $this->depth + 1; $belongsToMapper->depth = $this->depth + 1;
return $belongsToMapper->populateAbstract($result, $mapper::createBaseModel()); return $belongsToMapper->populateAbstract($result, $mapper::createBaseModel());
@ -706,7 +706,7 @@ class ReadMapper extends DataMapperAbstract
/** /**
* Fill object with relations * Fill object with relations
* *
* @param mixed $obj Object to fill * @param mixed $obj Object to fill
* *
* @return void * @return void
* *
@ -742,7 +742,7 @@ 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);
} }

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

@ -158,7 +158,7 @@ class UpdateMapper extends DataMapperAbstract
$mapper = $this->mapper::BELONGS_TO[$propertyName]['mapper']; $mapper = $this->mapper::BELONGS_TO[$propertyName]['mapper'];
/** @var self $relMapper */ /** @var self $relMapper */
$relMapper = $this->createRelationMapper($mapper::update(db: $this->db), $propertyName); $relMapper = $this->createRelationMapper($mapper::update(db: $this->db), $propertyName);
$relMapper->depth = $this->depth + 1; $relMapper->depth = $this->depth + 1;
return $relMapper->execute($obj); return $relMapper->execute($obj);
@ -174,7 +174,7 @@ class UpdateMapper extends DataMapperAbstract
$mapper = $this->mapper::OWNS_ONE[$propertyName]['mapper']; $mapper = $this->mapper::OWNS_ONE[$propertyName]['mapper'];
/** @var self $relMapper */ /** @var self $relMapper */
$relMapper = $this->createRelationMapper($mapper::update(db: $this->db), $propertyName); $relMapper = $this->createRelationMapper($mapper::update(db: $this->db), $propertyName);
$relMapper->depth = $this->depth + 1; $relMapper->depth = $this->depth + 1;
return $relMapper->execute($obj); return $relMapper->execute($obj);
@ -230,7 +230,7 @@ class UpdateMapper extends DataMapperAbstract
// already in db // already in db
if (!empty($primaryKey)) { if (!empty($primaryKey)) {
/** @var self $relMapper */ /** @var self $relMapper */
$relMapper = $this->createRelationMapper($mapper::update(db: $this->db), $propertyName); $relMapper = $this->createRelationMapper($mapper::update(db: $this->db), $propertyName);
$relMapper->depth = $this->depth + 1; $relMapper->depth = $this->depth + 1;
$relMapper->execute($value); $relMapper->execute($value);
@ -277,7 +277,7 @@ 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);
} }