From ecfe1a6fa17a6fad54f3cb677400e3a41199811a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Sun, 14 Oct 2018 16:43:21 +0200
Subject: [PATCH] Remove assertion count manipulation

Using `@doesNotPerformAssertions` is preferred since it doesn't rely on
PHPUnit's internals.
---
 test/unit/Validation/Constraint/IdentifiedByTest.php | 2 +-
 test/unit/Validation/Constraint/IssuedByTest.php     | 2 +-
 test/unit/Validation/Constraint/PermittedForTest.php | 2 +-
 test/unit/Validation/Constraint/RelatedToTest.php    | 2 +-
 test/unit/Validation/Constraint/SignedWithTest.php   | 1 -
 test/unit/Validation/Constraint/ValidAtTest.php      | 5 ++---
 test/unit/Validation/ValidatorTest.php               | 1 -
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/unit/Validation/Constraint/IdentifiedByTest.php b/test/unit/Validation/Constraint/IdentifiedByTest.php
index 5cd310e1..a23ad8f9 100644
--- a/test/unit/Validation/Constraint/IdentifiedByTest.php
+++ b/test/unit/Validation/Constraint/IdentifiedByTest.php
@@ -45,6 +45,7 @@ public function assertShouldRaiseExceptionWhenIdDoesNotMatch(): void
 
     /**
      * @test
+     * @doesNotPerformAssertions
      *
      * @covers \Lcobucci\JWT\Validation\Constraint\IdentifiedBy::__construct
      * @covers \Lcobucci\JWT\Validation\Constraint\IdentifiedBy::assert
@@ -60,6 +61,5 @@ public function assertShouldNotRaiseExceptionWhenIdMatches(): void
         $constraint = new IdentifiedBy('123456');
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 }
diff --git a/test/unit/Validation/Constraint/IssuedByTest.php b/test/unit/Validation/Constraint/IssuedByTest.php
index daf0bfab..3946df0f 100644
--- a/test/unit/Validation/Constraint/IssuedByTest.php
+++ b/test/unit/Validation/Constraint/IssuedByTest.php
@@ -63,6 +63,7 @@ public function assertShouldRaiseExceptionWhenIssuerTypeValueDoesNotMatch(): voi
 
     /**
      * @test
+     * @doesNotPerformAssertions
      *
      * @covers \Lcobucci\JWT\Validation\Constraint\IssuedBy::__construct
      * @covers \Lcobucci\JWT\Validation\Constraint\IssuedBy::assert
@@ -77,6 +78,5 @@ public function assertShouldNotRaiseExceptionWhenIssuerMatches(): void
         $constraint = new IssuedBy('test.com', 'test.net');
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 }
diff --git a/test/unit/Validation/Constraint/PermittedForTest.php b/test/unit/Validation/Constraint/PermittedForTest.php
index 6a31fa5c..bdc32f04 100644
--- a/test/unit/Validation/Constraint/PermittedForTest.php
+++ b/test/unit/Validation/Constraint/PermittedForTest.php
@@ -63,6 +63,7 @@ public function assertShouldRaiseExceptionWhenAudienceTypeDoesNotMatch(): void
 
     /**
      * @test
+     * @doesNotPerformAssertions
      *
      * @covers \Lcobucci\JWT\Validation\Constraint\PermittedFor::__construct
      * @covers \Lcobucci\JWT\Validation\Constraint\PermittedFor::assert
@@ -77,6 +78,5 @@ public function assertShouldNotRaiseExceptionWhenAudienceMatches(): void
         $constraint = new PermittedFor('test.com');
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 }
diff --git a/test/unit/Validation/Constraint/RelatedToTest.php b/test/unit/Validation/Constraint/RelatedToTest.php
index 978bd2d3..4abe4315 100644
--- a/test/unit/Validation/Constraint/RelatedToTest.php
+++ b/test/unit/Validation/Constraint/RelatedToTest.php
@@ -45,6 +45,7 @@ public function assertShouldRaiseExceptionWhenSubjectDoesNotMatch(): void
 
     /**
      * @test
+     * @doesNotPerformAssertions
      *
      * @covers \Lcobucci\JWT\Validation\Constraint\RelatedTo::__construct
      * @covers \Lcobucci\JWT\Validation\Constraint\RelatedTo::assert
@@ -59,6 +60,5 @@ public function assertShouldNotRaiseExceptionWhenSubjectMatches(): void
         $constraint = new RelatedTo('user-auth');
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 }
diff --git a/test/unit/Validation/Constraint/SignedWithTest.php b/test/unit/Validation/Constraint/SignedWithTest.php
index ddef9371..00ae04d6 100644
--- a/test/unit/Validation/Constraint/SignedWithTest.php
+++ b/test/unit/Validation/Constraint/SignedWithTest.php
@@ -128,6 +128,5 @@ public function assertShouldRaiseExceptionWhenSignatureIsValid(): void
         $constraint = new SignedWith($this->signer, $this->key);
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 }
diff --git a/test/unit/Validation/Constraint/ValidAtTest.php b/test/unit/Validation/Constraint/ValidAtTest.php
index c50546ed..d380b6e8 100644
--- a/test/unit/Validation/Constraint/ValidAtTest.php
+++ b/test/unit/Validation/Constraint/ValidAtTest.php
@@ -111,6 +111,7 @@ public function assertShouldRaiseExceptionWhenTokenWasIssuedInTheFuture(): void
 
     /**
      * @test
+     * @doesNotPerformAssertions
      *
      * @covers \Lcobucci\JWT\Validation\Constraint\ValidAt::__construct
      * @covers \Lcobucci\JWT\Validation\Constraint\ValidAt::assert
@@ -136,7 +137,6 @@ public function assertShouldNotRaiseExceptionWhenTokenIsUsedInTheRightMoment():
         );
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
 
         $token = $this->buildToken(
             [
@@ -147,11 +147,11 @@ public function assertShouldNotRaiseExceptionWhenTokenIsUsedInTheRightMoment():
         );
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 
     /**
      * @test
+     * @doesNotPerformAssertions
      *
      * @covers \Lcobucci\JWT\Validation\Constraint\ValidAt::__construct
      * @covers \Lcobucci\JWT\Validation\Constraint\ValidAt::assert
@@ -169,6 +169,5 @@ public function assertShouldNotRaiseExceptionWhenTokenDoesNotHaveTimeClaims(): v
         $constraint = new ValidAt($this->clock);
 
         $constraint->assert($token);
-        $this->addToAssertionCount(1);
     }
 }
diff --git a/test/unit/Validation/ValidatorTest.php b/test/unit/Validation/ValidatorTest.php
index 7cce9662..f5109b40 100644
--- a/test/unit/Validation/ValidatorTest.php
+++ b/test/unit/Validation/ValidatorTest.php
@@ -67,7 +67,6 @@ public function assertShouldNotRaiseExceptionWhenNoConstraintFails(): void
         $validator = new Validator();
 
         $validator->assert($this->token, $constraint);
-        $this->addToAssertionCount(1);
     }
 
     /**