Skip to content

Handle multiple Doctrine managers #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Handle multiple Doctrine managers #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Reflection/Doctrine/EntityRepositoryClassReflectionExtension.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function hasMethod(\PHPStan\Reflection\ClassReflection $classReflection,
return false;
}

$objectManager = $this->objectMetadataResolver->getObjectManager();
$objectManager = $this->objectMetadataResolver->getObjectManagerForClass($entityClassType->getClassName());
if ($objectManager === null) {
return false;
}
Expand Down
6 changes: 4 additions & 2 deletions src/Rules/Doctrine/ORM/EntityColumnRule.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace PHPStan\Rules\Doctrine\ORM;

use Doctrine\Persistence\AbstractManagerRegistry;
use PhpParser\Node;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\MissingPropertyFromReflectionException;
Expand Down Expand Up @@ -58,12 +59,13 @@ public function processNode(Node $node, Scope $scope): array
return [];
}

$objectManager = $this->objectMetadataResolver->getObjectManager();
$className = $class->getName();

$objectManager = $this->objectMetadataResolver->getObjectManagerForClass($className);
if ($objectManager === null) {
return [];
}

$className = $class->getName();
if ($objectManager->getMetadataFactory()->isTransient($className)) {
return [];
}
Expand Down
5 changes: 3 additions & 2 deletions src/Rules/Doctrine/ORM/EntityRelationRule.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ public function processNode(Node $node, Scope $scope): array
return [];
}

$objectManager = $this->objectMetadataResolver->getObjectManager();
$className = $class->getName();

$objectManager = $this->objectMetadataResolver->getObjectManagerForClass($className);
if ($objectManager === null) {
return [];
}

$className = $class->getName();
if ($objectManager->getMetadataFactory()->isTransient($className)) {
return [];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Rules/Doctrine/ORM/RepositoryMethodCallRule.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function processNode(Node $node, Scope $scope): array
return [];
}

$objectManager = $this->objectMetadataResolver->getObjectManager();
$objectManager = $this->objectMetadataResolver->getObjectManagerForClass($entityClass);
if ($objectManager === null) {
return [];
}
Expand Down
26 changes: 21 additions & 5 deletions src/Type/Doctrine/ObjectMetadataResolver.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

namespace PHPStan\Type\Doctrine;

use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\Persistence\ObjectManager;
use Doctrine\Persistence\AbstractManagerRegistry;
use PHPStan\Reflection\ReflectionProvider;
use function file_exists;
use function is_readable;
Expand All @@ -16,7 +17,7 @@ final class ObjectMetadataResolver
/** @var string|null */
private $objectManagerLoader;

/** @var ObjectManager|null|false */
/** @var ObjectManager|AbstractManagerRegistry|null|false */
private $objectManager;

/** @var string|null */
Expand All @@ -36,7 +37,7 @@ public function __construct(
$this->repositoryClass = $repositoryClass;
}

public function getObjectManager(): ?ObjectManager
public function getObjectManager()
{
if ($this->objectManager === false) {
return null;
Expand All @@ -56,8 +57,19 @@ public function getObjectManager(): ?ObjectManager

return $this->objectManager;
}
public function getObjectManagerForClass(string $className): ?ObjectManager
{
if ($this->objectManager instanceof ObjectManager) {
return $this->objectManager;
}
if ($this->objectManager instanceof AbstractManagerRegistry) {
return $this->objectManager->getManagerForClass($className);
}

private function loadObjectManager(string $objectManagerLoader): ?ObjectManager
return null;
}

private function loadObjectManager(string $objectManagerLoader)
{
if (
!file_exists($objectManagerLoader)
Expand All @@ -76,6 +88,10 @@ private function getResolvedRepositoryClass(): string
}

$objectManager = $this->getObjectManager();
if($objectManager instanceof AbstractManagerRegistry) {
// Use default manager, which is enough to determine whether we're in an ODM or ORM environment
$objectManager = $objectManager->getManager();
}
if ($this->repositoryClass !== null) {
return $this->resolvedRepositoryClass = $this->repositoryClass;
} elseif ($objectManager !== null && get_class($objectManager) === 'Doctrine\ODM\MongoDB\DocumentManager') {
Expand All @@ -87,7 +103,7 @@ private function getResolvedRepositoryClass(): string

public function getRepositoryClass(string $className): string
{
$objectManager = $this->getObjectManager();
$objectManager = $this->getObjectManagerForClass($className);
if ($objectManager === null) {
return $this->getResolvedRepositoryClass();
}
Expand Down