[SOAP-13] Fix tests (failures and warnings)

Author: lucasppons

src/Requests/Verifier.php

@@ -161,11 +161,11 @@ public function getContent($asResource = false)
      */
     public function isValid(string $key) : bool
     {
-        if (!$this->headers->has($this->algorithmHeader)) {
+        if (!$this->algorithmHeader || !$this->headers->has($this->algorithmHeader)) {
             return false;
         }
 
-        if (!$this->headers->has($this->signatureHeader)) {
+        if (!$this->signatureHeader || !$this->headers->has($this->signatureHeader)) {
             return false;
         }
 

tests/Middlewares/Laravel/VerifySignatureTest.php

@@ -13,6 +13,9 @@
 use SoapBox\SignedRequests\Requests\Payload;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Config\Repository as Configurations;
+use SoapBox\SignedRequests\Exceptions\ExpiredRequestException;
+use SoapBox\SignedRequests\Exceptions\InvalidConfigurationException;
+use SoapBox\SignedRequests\Exceptions\InvalidSignatureException;
 use SoapBox\SignedRequests\Middlewares\Laravel\VerifySignature;
 
 class VerifySignatureTest extends TestCase
@@ -70,10 +73,11 @@ public function it_can_be_constructed()
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\InvalidSignatureException
      */
     public function it_throws_an_invalid_signature_exception_if_the_request_is_not_valid()
     {
+        $this->expectException(InvalidSignatureException::class);
+
         $this->configurations->shouldReceive('get')
             ->with('signed-requests.default.headers.signature')
             ->andReturn('HTTP_SIGNATURE');
@@ -190,10 +194,11 @@ public function it_should_set_the_key_when_one_is_passed()
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\InvalidConfigurationException
      */
     public function it_should_throw_an_exception_when_it_cannot_find_the_key()
     {
+        $this->expectException(InvalidConfigurationException::class);
+
         $id = (string) Uuid::uuid4();
 
         $query = [];
@@ -217,10 +222,11 @@ public function it_should_throw_an_exception_when_it_cannot_find_the_key()
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_throws_an_expired_request_exception_if_the_timestamp_on_the_request_is_outside_of_the_tolerance_allowed_for_requests()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')
@@ -302,10 +308,11 @@ public function it_should_call_our_callback_if_the_id_has_not_previously_been_se
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_should_throw_an_expired_request_exception_if_the_request_id_has_previously_been_seen()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')
@@ -348,10 +355,11 @@ public function it_should_throw_an_expired_request_exception_if_the_request_id_h
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_should_throw_an_expired_request_exception_if_the_same_request_is_played_multiple_times()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')
@@ -395,10 +403,11 @@ public function it_should_throw_an_expired_request_exception_if_the_same_request
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_throws_an_expired_request_exception_if_the_timestamp_on_the_request_does_not_have_the_correct_format()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')