diff --git a/Dbal/AclProvider.php b/Dbal/AclProvider.php index a0da21c..e050803 100644 --- a/Dbal/AclProvider.php +++ b/Dbal/AclProvider.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Security\Acl\Dbal; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver\Statement; +use Doctrine\DBAL\Result; use Symfony\Component\Security\Acl\Domain\Acl; use Symfony\Component\Security\Acl\Domain\Entry; use Symfony\Component\Security\Acl\Domain\FieldEntry; @@ -481,7 +481,7 @@ private function lookupObjectIdentities(array $batch, array $sids, array $oidLoo * * @throws \RuntimeException */ - private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, array $sids) + private function hydrateObjectIdentities(Result $stmt, array $oidLookup, array $sids) { $parentIdToFill = new \SplObjectStorage(); $acls = $aces = $emptyArray = []; diff --git a/composer.json b/composer.json index 24e37ff..7af9397 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "symfony/phpunit-bridge": "^3.4|^4.4|^5.0", "doctrine/common": "~2.2", "doctrine/persistence": "^1.3.3", - "doctrine/dbal": "~2.2", + "doctrine/dbal": "^2.13", "psr/log": "~1.0" }, "autoload": { @@ -32,6 +32,9 @@ "/Tests/" ] }, + "conflict": { + "doctrine/dbal": "<2.13.0" + }, "minimum-stability": "dev", "extra": { "branch-alias": {