Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-03-31 19:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix pullout bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-12-09 18:01:20 +01:00
parent 296eb7c20b
commit 07776f489c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Account/Account.php
View File

@ -87,10 +87,10 @@ class Account implements ArrayableInterface, \JsonSerializable
/**
* Login.
*
* @var string
* @var string|null
* @since 1.0.0
*/
protected $login = '';
protected $login = null;
/**
* Last activity.
@ -352,7 +352,7 @@ class Account implements ArrayableInterface, \JsonSerializable
*
* @since 1.0.0
*/
public function getName() : string
public function getName() : ?string
{
return $this->login;
}

2
Module/ModuleAbstract.php
View File

@ -325,7 +325,7 @@ abstract class ModuleAbstract
*/
protected function createModelRelation(RequestAbstract $request, $rel1, $rel2, string $mapper, string $field, string $trigger) : void
{
$this->app->eventManager->trigger('PRE:Module:' . self::MODULE_NAME . '-' . $trigger . '-relation', '', $$rel1);
$this->app->eventManager->trigger('PRE:Module:' . self::MODULE_NAME . '-' . $trigger . '-relation', '', $rel1);
$mapper::createRelation($field, $rel1, $rel2);
$this->app->eventManager->trigger('POST:Module:' . self::MODULE_NAME . '-' . $trigger . '-relation', '', [
$request->getHEader()->getAccount(),

3
tests/Account/AccountTest.php
View File

@ -69,8 +69,7 @@ class AccountTest extends \PHPUnit\Framework\TestCase
self::assertEquals([], $account->getGroups());
self::assertTrue(\is_string($account->getName()));
self::assertEquals('', $account->getName());
self::assertEquals(null, $account->getName());
self::assertTrue(\is_string($account->getName1()));
self::assertEquals('', $account->getName1());