Update codebase to PHP 7.4 (#52)

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [7.4, 8.0, 8.1]
 
     steps:
     - name: Checkout code

README.md

@@ -15,7 +15,7 @@ With [BDD][3] assertions influenced by [Chai][4], [Jasmine][5], and [RSpec][6] y
 
 ## Installation
 
-*Requires PHP  7.1 or higher*
+*Requires PHP  7.4 or higher*
 
 ```
 composer require codeception/verify --dev

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-dom": "*",
         "phpunit/phpunit": "^9.3"
     },

src/Codeception/Exception/InvalidVerifyException.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codeception\Exception;
 

src/Codeception/Verify/Asserts/AssertThrows.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codeception\Verify\Asserts;
 
@@ -18,23 +20,23 @@ public function assertThrows($throws = null, $message = false): self
 
         try {
             call_user_func($this->actual);
-        } catch (Throwable $exception) {
+        } catch (Throwable $throwable) {
             if (!$throws) {
                 return $this; // it throws
             }
 
-            $actualThrows = get_class($exception);
-            $actualMessage = $exception->getMessage();
+            $actualThrows = get_class($throwable);
+            $actualMessage = $throwable->getMessage();
 
-            Assert::assertSame($throws, $actualThrows, sprintf('exception \'%s\' was expected, but \'%s\' was thrown', $throws, $actualThrows));
+            Assert::assertSame($throws, $actualThrows, sprintf("exception '%s' was expected, but '%s' was thrown", $throws, $actualThrows));
 
             if ($message) {
-                Assert::assertSame($message, $actualMessage, sprintf('exception message \'%s\' was expected, but \'%s\' was received', $message, $actualMessage));
+                Assert::assertSame($message, $actualMessage, sprintf("exception message '%s' was expected, but '%s' was received", $message, $actualMessage));
             }
         }
 
-        if (!isset($exception)) {
-            throw new ExpectationFailedException(sprintf('exception \'%s\' was not thrown as expected', $throws));
+        if (!isset($throwable)) {
+            throw new ExpectationFailedException(sprintf("exception '%s' was not thrown as expected", $throws));
         }
 
         return $this;
@@ -62,11 +64,11 @@ public function assertDoesNotThrow($throws = null, $message = false): self
             }
 
             if (!$message) {
-                throw new ExpectationFailedException(sprintf('exception \'%s\' was not expected to be thrown', $throws));
+                throw new ExpectationFailedException(sprintf("exception '%s' was not expected to be thrown", $throws));
             }
 
             if ($message === $actualMessage) {
-                throw new ExpectationFailedException(sprintf('exception \'%s\' with message \'%s\' was not expected to be thrown', $throws, $message));
+                throw new ExpectationFailedException(sprintf("exception '%s' with message '%s' was not expected to be thrown", $throws, $message));
             }
         }
 

src/Codeception/Verify/Expect.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codeception\Verify;