cs and phpstan fixes

This commit is contained in:
Dennis Eichhorn 2020-10-24 17:52:23 +02:00
parent 3dddb2edaa
commit 31a2973496
4 changed files with 18 additions and 19 deletions

View File

@ -254,8 +254,7 @@ final class ApiController extends Controller
$requestAccount = $request->getHeader()->getAccount(); $requestAccount = $request->getHeader()->getAccount();
$accountId = (int) $request->getData('account_id'); $accountId = (int) $request->getData('account_id');
if ( if ($requestAccount !== $accountId
$requestAccount !== $accountId
&& !$this->app->accountManager->get($accountId)->hasPermission( && !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::MODIFY, PermissionType::MODIFY,
$this->app->orgId, $this->app->orgId,

View File

@ -55,7 +55,7 @@ final class AccountMapper extends DataMapperAbstract
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, self:string, by?:string, column?:string}> * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $ownsOne = [ protected static array $ownsOne = [

View File

@ -34,30 +34,30 @@ final class AddressMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'address_id' => ['name' => 'address_id', 'type' => 'int', 'internal' => 'id'], 'address_id' => ['name' => 'address_id', 'type' => 'int', 'internal' => 'id'],
'address_name' => ['name' => 'address_name', 'type' => 'string', 'internal' => 'name'], 'address_name' => ['name' => 'address_name', 'type' => 'string', 'internal' => 'name'],
'address_addition' => ['name' => 'address_addition', 'type' => 'string', 'internal' => 'addition'], 'address_addition' => ['name' => 'address_addition', 'type' => 'string', 'internal' => 'addition'],
'address_address' => ['name' => 'address_address', 'type' => 'string', 'internal' => 'address'], 'address_address' => ['name' => 'address_address', 'type' => 'string', 'internal' => 'address'],
'address_postal' => ['name' => 'address_postal', 'type' => 'string', 'internal' => 'postal'], 'address_postal' => ['name' => 'address_postal', 'type' => 'string', 'internal' => 'postal'],
'address_state' => ['name' => 'address_state', 'type' => 'string', 'internal' => 'state'], 'address_state' => ['name' => 'address_state', 'type' => 'string', 'internal' => 'state'],
'address_city' => ['name' => 'address_city', 'type' => 'string', 'internal' => 'city'], 'address_city' => ['name' => 'address_city', 'type' => 'string', 'internal' => 'city'],
'address_country' => ['name' => 'address_country', 'type' => 'string', 'internal' => 'country'], 'address_country' => ['name' => 'address_country', 'type' => 'string', 'internal' => 'country'],
'address_type' => ['name' => 'address_type', 'type' => 'int', 'internal' => 'type'], 'address_type' => ['name' => 'address_type', 'type' => 'int', 'internal' => 'type'],
]; ];
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, self:string, by?:string}> * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $ownsOne = [ protected static array $ownsOne = [
'country' => [ 'country' => [
'mapper' => CountryMapper::class, 'mapper' => CountryMapper::class,
'external' => 'address_country', 'external' => 'address_country',
'by' => 'code2', 'by' => 'code2',
'column' => 'code2', 'column' => 'code2',
'conditional' => true, 'conditional' => true,
], ],
]; ];

View File

@ -94,7 +94,7 @@ final class LocalizationMapper extends DataMapperAbstract
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, self:string, by?:string, column?:string}> * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $ownsOne = [ protected static array $ownsOne = [