This commit is contained in:
Yuri Kuznetsov
2021-11-04 13:50:10 +02:00
parent 3445f87e0c
commit 093001bf95
4 changed files with 16 additions and 8 deletions

View File

@@ -107,6 +107,9 @@ class TotpLogin implements Login
private function getUserDataRepository(): UserDataRepository
{
return $this->entityManager->getRepository(UserData::ENTITY_TYPE);
/** @var UserDataRepository $repository */
$repository = $this->entityManager->getRepository(UserData::ENTITY_TYPE);
return $repository;
}
}

View File

@@ -49,9 +49,6 @@ class TotpUserSetup implements UserSetup
private $config;
/**
* @var EntityManager
*/
private $entityManager;
public function __construct(Util $totp, Config $config, EntityManager $entityManager)
@@ -113,6 +110,9 @@ class TotpUserSetup implements UserSetup
private function getUserDataRepository(): UserDataRepository
{
return $this->entityManager->getRepository(UserData::ENTITY_TYPE);
/** @var UserDataRepository $repository */
$repository = $this->entityManager->getRepository(UserData::ENTITY_TYPE);
return $repository;
}
}

View File

@@ -59,9 +59,10 @@ use Espo\ORM\EntityManager;
use stdClass;
class RecordBase extends Base implements Di\EntityManagerAware
class RecordBase extends Base implements Di\EntityManagerAware, Di\InjectableFactoryAware
{
use Di\EntityManagerSetter;
use Di\InjectableFactorySetter;
public static $defaultAction = 'list';
@@ -247,7 +248,7 @@ class RecordBase extends Base implements Di\EntityManagerAware
{
if (method_exists($this, 'actionDelete')) {
// For backward compatibility.
return (object) $this->actionDelete($request->getRouteParams(), $request->getParsedBody(), $request);
return $this->actionDelete($request->getRouteParams(), $request->getParsedBody(), $request);
}
$id = $request->getRouteParam('id');

View File

@@ -83,6 +83,10 @@ class RecordTree extends Record
protected function getRecordTreeService(): Service
{
return $this->getRecordService();
$service = $this->getRecordService();
assert($service instanceof Service);
return $service;
}
}