Fix composer and tests

api-platform · Jun 14, 2019 · ccfafca · ccfafca
1 parent e583620
commit ccfafca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -73,8 +73,8 @@
         "symfony/form": "^3.4 || ^4.0",
         "symfony/framework-bundle": "^4.3",
         "symfony/mercure-bundle": "*",
-        "symfony/messenger": "^4.2",
-        "symfony/phpunit-bridge": "^4.3",
+        "symfony/messenger": "^4.3",
+        "symfony/phpunit-bridge": "^4.3.1",
         "symfony/routing": "^3.4 || ^4.0",
         "symfony/security-bundle": "^3.4 || ^4.0",
         "symfony/security-core": "^3.4 || ^4.0",
@@ -86,8 +86,7 @@
     },
     "conflict": {
         "doctrine/common": "<2.7",
-        "doctrine/mongodb-odm": "<2.0",
-        "symfony/messenger": ">=4.3"
+        "doctrine/mongodb-odm": "<2.0"
     },
     "suggest": {
         "doctrine/mongodb-odm-bundle": "To support MongoDB. Only versions 4.0 and later are supported.",

diff --git a/tests/Security/EventListener/DenyAccessListenerTest.php b/tests/Security/EventListener/DenyAccessListenerTest.php
@@ -29,6 +29,7 @@
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Role\RoleHierarchy;
+use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
@@ -269,8 +270,8 @@ private function getLegacyListener(ResourceMetadataFactoryInterface $resourceMet
     {
         $authenticationTrustResolverProphecy = $this->prophesize(AuthenticationTrustResolverInterface::class);
 
-        $roleHierarchyInterfaceProphecy = $this->prophesize(RoleHierarchy::class);
-        $roleHierarchyInterfaceProphecy->getReachableRoles(Argument::type('array'))->willReturn([]);
+		$roleHierarchyInterfaceProphecy = $this->prophesize(RoleHierarchyInterface::class);
+        $roleHierarchyInterfaceProphecy->{method_exists(RoleHierarchy::class, 'getReachableRoleNames') ? 'getReachableRoleNames' : 'getReachableRoles'}(Argument::type('array'))->willReturn([]);
 
         $tokenProphecy = $this->prophesize(AbstractToken::class);
         $tokenProphecy->getUser()->willReturn('anon.');