Merge pull request #15 from MadCat34/fix/deprecated_tests

Fix/deprecated tests

composer.json

@@ -44,8 +44,8 @@
     "malukenho/docheader": "^0.1.7",
     "phpunit/phpunit": "^9.5.0",
     "phpspec/prophecy": "^1.10",
+    "phpspec/prophecy-phpunit": "^2.0",
     "friendsofphp/php-cs-fixer": "^2.9.3",
-
     "php-coveralls/php-coveralls": "^2.0"
   },
   "autoload": {

test/Assertion/AssertionSetTest.php

@@ -81,8 +81,11 @@ public function testWhenNoConditionIsGivenAndIsUsed()
         $assertionContainer = $this->getMockBuilder(AssertionContainerInterface::class)->getMock();
         $assertionSet = new AssertionSet($assertionContainer, ['fooFactory', 'barFactory']);
 
-        $assertionContainer->expects($this->at(0))->method('get')->with('fooFactory')->willReturn($fooAssertion);
-        $assertionContainer->expects($this->at(1))->method('get')->with('barFactory')->willReturn($barAssertion);
+        $assertionContainer->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(
+                ['fooFactory'], ['barFactory'])
+            ->willReturnOnConsecutiveCalls($fooAssertion, $barAssertion);
 
         $this->assertFalse($assertionSet->assert('permission'));
 
@@ -98,7 +101,7 @@ public function testAndConditionWillBreakEarlyWithFailure()
         $assertionContainer = $this->getMockBuilder(AssertionContainerInterface::class)->getMock();
         $assertionSet = new AssertionSet($assertionContainer, ['fooFactory', 'barFactory', 'condition' => AssertionSet::CONDITION_AND]);
 
-        $assertionContainer->expects($this->at(0))->method('get')->with('fooFactory')->willReturn($fooAssertion);
+        $assertionContainer->expects($this->once())->method('get')->with('fooFactory')->willReturn($fooAssertion);
 
         $this->assertFalse($assertionSet->assert('permission'));
 
@@ -114,7 +117,7 @@ public function testOrConditionWillBreakEarlyWithSuccess()
         $assertionContainer = $this->getMockBuilder(AssertionContainerInterface::class)->getMock();
         $assertionSet = new AssertionSet($assertionContainer, ['fooFactory', 'barFactory', 'condition' => AssertionSet::CONDITION_OR]);
 
-        $assertionContainer->expects($this->at(0))->method('get')->with('fooFactory')->willReturn($fooAssertion);
+        $assertionContainer->expects($this->once())->method('get')->with('fooFactory')->willReturn($fooAssertion);
 
         $this->assertTrue($assertionSet->assert('permission'));
 
@@ -189,8 +192,10 @@ public function testUsesAssertionsAsArrays()
         $assertionContainer = $this->getMockBuilder(AssertionContainerInterface::class)->getMock();
         $assertionSet = new AssertionSet($assertionContainer, ['fooFactory', ['barFactory']]);
 
-        $assertionContainer->expects($this->at(0))->method('get')->with('fooFactory')->willReturn($fooAssertion);
-        $assertionContainer->expects($this->at(1))->method('get')->with('barFactory')->willReturn($barAssertion);
+        $assertionContainer->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['fooFactory'], ['barFactory'])
+            ->willReturnOnConsecutiveCalls($fooAssertion, $barAssertion);
 
         $this->assertTrue($assertionSet->assert('permission'));
 

test/Container/AuthorizationServiceFactoryTest.php

@@ -28,13 +28,16 @@
 use LmcRbac\Service\AuthorizationService;
 use LmcRbac\Service\RoleServiceInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 
 /**
  * @covers \LmcRbac\Container\AuthorizationServiceFactory
  */
 class AuthorizationServiceFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testCanCreateAuthorizationService(): void
     {
         $container = $this->prophesize(ContainerInterface::class);

test/Service/RoleServiceTest.php

@@ -31,12 +31,15 @@
 use LmcRbacTest\Asset\Identity;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @covers \LmcRbac\Service\RoleService
  */
 class RoleServiceTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testReturnGuestRoleIfNoIdentityIsGiven(): void
     {
         $roleService = new RoleService(new InMemoryRoleProvider([]), 'guest');