Jingga/oms-Profile
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Profile.git synced 2026-02-16 15:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 18:44:22 +01:00
parent d82537a0c1
commit 8b0a9b18e6
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/ApiController.php
View File

@ -317,13 +317,13 @@ final class ApiController extends Controller
public function createAddressFromRequest(RequestAbstract $request) : Address public function createAddressFromRequest(RequestAbstract $request) : Address
{ {
/** @var Address $element */ /** @var Address $element */
$element = new Address(); $element = new Address();
$element->name = (string) ($request->getData('name') ?? ''); $element->name = (string) ($request->getData('name') ?? '');
$element->addition = (string) ($request->getData('addition') ?? ''); $element->addition = (string) ($request->getData('addition') ?? '');
$element->postal = (string) ($request->getData('postal') ?? ''); $element->postal = (string) ($request->getData('postal') ?? '');
$element->city = (string) ($request->getData('city') ?? ''); $element->city = (string) ($request->getData('city') ?? '');
$element->address = (string) ($request->getData('address') ?? ''); $element->address = (string) ($request->getData('address') ?? '');
$element->state = (string) ($request->getData('state') ?? ''); $element->state = (string) ($request->getData('state') ?? '');
$element->setCountry((string) ($request->getData('country') ?? '')); $element->setCountry((string) ($request->getData('country') ?? ''));
$element->setType((int) ($request->getData('type') ?? 0)); $element->setType((int) ($request->getData('type') ?? 0));

4
Controller/BackendController.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace Modules\Profile\Controller; namespace Modules\Profile\Controller;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia;
use Modules\Profile\Models\ProfileMapper; use Modules\Profile\Models\ProfileMapper;
use phpOMS\Asset\AssetType; use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
@ -128,7 +129,8 @@ final class BackendController extends Controller
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector); $view->addData('accGrpSelector', $accGrpSelector);
$view->setData('media', MediaMapper::getFor((int) $profile->account->getId(), 'createdBy')); $media = MediaMapper::getFor((int) $profile->account->getId(), 'createdBy');
$view->setData('media', $media instanceof NullMedia ? [] : $media);
return $view; return $view;
} }

2
tests/Controller/ApiControllerTest.php
View File

@ -110,7 +110,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->header->account = 1; $request->header->account = 1;
$profile = new Profile(new \Modules\Admin\Models\Account()); $profile = new Profile(new \Modules\Admin\Models\Account());
$profile->account->login = 'ProfileCreateDb'; $profile->account->login = 'ProfileCreateDb';
$profile->account->setEmail('profile_create_db@email.com'); $profile->account->setEmail('profile_create_db@email.com');

14
tests/Models/ProfileMapperTest.php
View File

@ -31,26 +31,26 @@ class ProfileMapperTest extends \PHPUnit\Framework\TestCase
*/ */
public function testCRUD() : void public function testCRUD() : void
{ {
$media = new Media(); $media = new Media();
$media->createdBy = new NullAccount(1); $media->createdBy = new NullAccount(1);
$media->description = 'desc'; $media->description = 'desc';
$media->setPath('Web/Backend/img/default-user.jpg'); $media->setPath('Web/Backend/img/default-user.jpg');
$media->size = 11; $media->size = 11;
$media->extension = 'png'; $media->extension = 'png';
$media->name = 'Image'; $media->name = 'Image';
if (($profile = ProfileMapper::getFor(1, 'account'))->getId() === 0) { if (($profile = ProfileMapper::getFor(1, 'account'))->getId() === 0) {
$profile = new Profile(); $profile = new Profile();
$profile->account = AccountMapper::get(1); $profile->account = AccountMapper::get(1);
$profile->image = $media; $profile->image = $media;
$profile->birthday = new \DateTime('now'); $profile->birthday = new \DateTime('now');
$id = ProfileMapper::create($profile); $id = ProfileMapper::create($profile);
self::assertGreaterThan(0, $profile->getId()); self::assertGreaterThan(0, $profile->getId());
self::assertEquals($id, $profile->getId()); self::assertEquals($id, $profile->getId());
} else { } else {
$profile->image = $media; $profile->image = $media;
$profile->birthday = new \DateTime('now'); $profile->birthday = new \DateTime('now');
ProfileMapper::update($profile); ProfileMapper::update($profile);

6
tests/Models/ProfileTest.php
View File

@ -47,7 +47,7 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
self::assertEquals([], $this->profile->getContactElements()); self::assertEquals([], $this->profile->getContactElements());
self::assertInstanceOf('\Modules\Media\Models\Media', $this->profile->image); self::assertInstanceOf('\Modules\Media\Models\Media', $this->profile->image);
self::assertInstanceOf('\Modules\Admin\Models\Account', $this->profile->account); self::assertInstanceOf('\Modules\Admin\Models\Account', $this->profile->account);
self::assertEquals(null, $this->profile->birthday); self::assertNull($this->profile->birthday);
} }
/** /**
@ -154,8 +154,8 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
$this->profile->setGender(GenderType::FEMALE); $this->profile->setGender(GenderType::FEMALE);
$this->profile->setSex(SexType::FEMALE); $this->profile->setSex(SexType::FEMALE);
$this->profile->birthday = ($date = new \DateTime('now')); $this->profile->birthday = ($date = new \DateTime('now'));
$this->profile->account = ($a = new NullAccount(1)); $this->profile->account = ($a = new NullAccount(1));
$this->profile->image = ($i = new NullMedia(1)); $this->profile->image = ($i = new NullMedia(1));
self::assertEquals( self::assertEquals(
[ [