Skip to content

Commit

Permalink
Update depends version - 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@ViktorTkachenko @mrVrAlex
ViktorTkachenko authored and mrVrAlex committed Apr 29, 2024
1 parent 41f78ce commit d6ecb4f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 114 deletions.
12 changes: 9 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
],
"require": {
"php": "^8.1",
"doctrine/dbal": "^4.0",
"doctrine/orm": "^3.0",
"psr/container": "^1.0 || ^2.0"
},
"require-dev": {
"opsway/psr12-strict-coding-standard": "^1.1",
"lctrs/psalm-psr-container-plugin": "^1.10",
"vimeo/psalm": "^5.23"
"vimeo/psalm": "^5.23",
"weirdan/doctrine-psalm-plugin": "dev-develop"
},
"autoload": {
"psr-4": {
Expand All @@ -28,5 +28,11 @@
"scripts": {
"cs-check": "phpcs",
"cs-fix": "phpcbf"
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/ViktorTkachenko/psalm-plugin-doctrine"
}
]
}
147 changes: 36 additions & 111 deletions src/EntityManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
namespace OpsWay\Doctrine\ORM\Swoole;

use Closure;
use DateTimeInterface;
use DateTimeInterface; // phpcs:ignore
use Doctrine\Common\EventManager;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\LockMode; // phpcs:ignore
use Doctrine\ORM;
use Doctrine\ORM\AbstractQuery; // phpcs:ignore
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Exception\ORMException;
use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\Exception\ORMException;
use Doctrine\ORM\PessimisticLockException;
use Doctrine\ORM\Query\ResultSetMapping;
use RuntimeException;
use Swoole\Coroutine as Co;

final class EntityManager implements EntityManagerInterface
Expand All @@ -28,38 +29,34 @@ public function __construct(private Closure $emCreatorFn)

public function getWrappedEm() : EntityManagerInterface
{
$cid = Co::getCid();
$context = Co::getContext($cid);

if (! isset($context->entityManager) || ! $context->entityManager instanceof EntityManagerInterface) {
$context->entityManager = ($this->emCreatorFn)();
$context = $this->getContext();
if (! isset($context[self::class]) || ! $context[self::class] instanceof EntityManagerInterface) {
/** @psalm-var EntityManagerInterface */
$context[self::class] = ($this->emCreatorFn)();
/** @psalm-suppress MixedMethodCall */
Co::defer(function () use ($context) {
$context->entityManager->close();
unset($context->entityManager);
$context[self::class]->close();
unset($context[self::class]);
});
}

return $context->entityManager;
/** @psalm-var EntityManagerInterface */
return $context[self::class];
}

/**
* @param string $className
* @psalm-suppress MethodSignatureMismatch
*/
public function getClassMetadata(string $className) : ORM\Mapping\ClassMetadata
public function getClassMetadata(string $className) : ClassMetadata
{
return $this->getWrappedEm()->getClassMetadata($className);
}

/**
* @return ORM\UnitOfWork
*/
public function getUnitOfWork() : ORM\UnitOfWork
{
return $this->getWrappedEm()->getUnitOfWork();
}

/**
* @param string $className
* @psalm-suppress all
*/
public function getRepository(string $className) : EntityRepository
Expand All @@ -71,25 +68,16 @@ public function getRepository(string $className) : EntityRepository
return new $repositoryClassName($this, $metadata);
}

/**
* @return Connection
*/
public function getConnection() : Connection
{
return $this->getWrappedEm()->getConnection();
}

/**
* @return ORM\Cache|null
*/
public function getCache() : ?ORM\Cache
{
return $this->getWrappedEm()->getCache();
}

/**
* @return ORM\Query\Expr
*/
public function getExpressionBuilder() : ORM\Query\Expr
{
return $this->getWrappedEm()->getExpressionBuilder();
Expand All @@ -100,10 +88,7 @@ public function beginTransaction() : void
$this->getWrappedEm()->beginTransaction();
}

/**
* @return mixed
*/
public function wrapInTransaction(callable $func) : callable
public function wrapInTransaction(callable $func) : mixed
{
return $this->getWrappedEm()->wrapInTransaction($func);
}
Expand All @@ -118,40 +103,25 @@ public function rollback() : void
$this->getWrappedEm()->rollback();
}

/**
* @param string $dql
* @return ORM\Query
*/
public function createQuery(string $dql = '') : ORM\Query
{
return $this->getWrappedEm()->createQuery($dql);
}

/**
* @param string $sql
* @return ORM\NativeQuery
*/
public function createNativeQuery(string $sql, ResultSetMapping $rsm) : ORM\NativeQuery
{
return $this->getWrappedEm()->createNativeQuery($sql, $rsm);
}

/**
* @return ORM\QueryBuilder
*/
public function createQueryBuilder() : ORM\QueryBuilder
{
return $this->getWrappedEm()->createQueryBuilder();
}

/**
* @param string $entityName
* @param mixed $id
* @psalm-param class-string $entityName
* @return object|null
* @throws ORMException
*/
public function getReference(string $entityName, $id) : ?object
public function getReference(string $entityName, mixed $id) : ?object
{
return $this->getWrappedEm()->getReference($entityName, $id);
}
Expand All @@ -162,47 +132,30 @@ public function close() : void
}

/**
* @param object $entity
* @param int $lockMode
* @param int|DateTimeInterface|null $lockVersion
* @psalm-param LockMode::* $lockMode
* @psalm-return void
* @throws OptimisticLockException
* @throws PessimisticLockException
*/
public function lock(object $entity, LockMode|int $lockMode, int|DateTimeInterface|null $lockVersion = null) : void
public function lock(object $entity, LockMode|int $lockMode, DateTimeInterface|int|null $lockVersion = null) : void
{
$this->getWrappedEm()->lock($entity, $lockMode, $lockVersion);
}

/**
* @return EventManager
*/
public function getEventManager() : EventManager
{
return $this->getWrappedEm()->getEventManager();
}

/**
* @return ORM\Configuration
*/
public function getConfiguration() : ORM\Configuration
{
return $this->getWrappedEm()->getConfiguration();
}

/**
* @return bool
*/
public function isOpen() : bool
{
return $this->getWrappedEm()->isOpen();
}

/**
* @param string|int $hydrationMode
* @psalm-param string|AbstractQuery::HYDRATE_* $hydrationMode
* @return AbstractHydrator
* @throws ORMException
*/
public function newHydrator(int|string $hydrationMode) : AbstractHydrator
Expand All @@ -212,62 +165,41 @@ public function newHydrator(int|string $hydrationMode) : AbstractHydrator

/**
* @psalm-suppress DeprecatedClass
* @return ORM\Proxy\ProxyFactory
*/
public function getProxyFactory() : ORM\Proxy\ProxyFactory
{
return $this->getWrappedEm()->getProxyFactory();
}

/**
* @return ORM\Query\FilterCollection
*/
public function getFilters() : ORM\Query\FilterCollection
{
return $this->getWrappedEm()->getFilters();
}

/**
* @return bool
*/
public function isFiltersStateClean() : bool
{
return $this->getWrappedEm()->isFiltersStateClean();
}

/**
* @return bool
*/
public function hasFilters() : bool
{
return $this->getWrappedEm()->hasFilters();
}

/**
* @param string $className
* @param mixed $id
* @param int|null $lockMode
* @param int|null $lockVersion
* @psalm-param class-string $className
* @psalm-param LockMode::*|null $lockMode
* @return object|null
*/
public function find(string $className, $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null) : ?object
{
public function find(
string $className,
mixed $id,
LockMode|int|null $lockMode = null,
?int $lockVersion = null
) : ?object {
return $this->getWrappedEm()->find($className, $id, $lockMode, $lockVersion);
}

/**
* @param object $object
*/
public function persist(object $object) : void
{
$this->getWrappedEm()->persist($object);
}

/**
* @param object $object
*/
public function remove(object $object) : void
{
$this->getWrappedEm()->remove($object);
Expand All @@ -278,18 +210,11 @@ public function clear() : void
$this->getWrappedEm()->clear();
}

/**
* @param object $object
*/
public function detach(object $object) : void
{
$this->getWrappedEm()->detach($object);
}

/**
* @param object $object
* @param int|LockMode|null $lockMode
*/
public function refresh(object $object, LockMode|int|null $lockMode = null) : void
{
$this->getWrappedEm()->refresh($object, $lockMode);
Expand All @@ -300,39 +225,39 @@ public function flush() : void
$this->getWrappedEm()->flush();
}

/**
* @return ORM\Mapping\ClassMetadataFactory
*/
public function getMetadataFactory() : ORM\Mapping\ClassMetadataFactory
{
return $this->getWrappedEm()->getMetadataFactory();
}

/**
* @param object $obj
*/
public function initializeObject(object $obj) : void
{
$this->getWrappedEm()->initializeObject($obj);
}

/**
* @param object $object
* @return bool
*/
public function contains(object $object) : bool
{
return $this->getWrappedEm()->contains($object);
}

public function reopen() : void
{
$context = Co::getContext(Co::getCid());
$context = $this->getContext();
$em = $this->getWrappedEm();
if ($em->isOpen()) {
$em->clear();
} else {
unset($context->entityManager);
unset($context[self::class]);
}
}

private function getContext() : Co\Context
{
/** @psalm-var Co\Context|null $context */
$context = Co::getContext((int) Co::getCid());
if (! $context instanceof Co\Context) {
throw new RuntimeException('Co::Context unavailable');
}
return $context;
}
}

0 comments on commit d6ecb4f

Please sign in to comment.