Merge pull request #13 from W0rma/codeception5

Support for Codeception 5

Author: Naktibalda

.github/workflows/main.yml

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

composer.json

@@ -15,8 +15,8 @@
 	],
 	"minimum-stability": "RC",
 	"require": {
-		"php": "^7.4 | ^8.0",
-		"codeception/codeception": "^4.0",
+		"php": "^8.0",
+		"codeception/codeception": "^5.0.0-RC1",
 		"php-amqplib/php-amqplib": "^2.10 | ^3.0"
 	},
 	"autoload": {

src/Codeception/Module/AMQP.php

@@ -51,10 +51,7 @@
  */
 class AMQP extends Module implements RequiresPackage
 {
-    /**
-     * @var array
-     */
-    protected $config = [
+    protected array $config = [
         'host'           => 'localhost',
         'username'       => 'guest',
         'password'       => 'guest',
@@ -72,14 +69,14 @@ class AMQP extends Module implements RequiresPackage
     /**
      * @var string[]
      */
-    protected $requiredFields = ['host', 'username', 'password', 'vhost'];
+    protected array $requiredFields = ['host', 'username', 'password', 'vhost'];
 
-    public function _requires()
+    public function _requires(): array
     {
         return [AMQPStreamConnection::class => '"php-amqplib/php-amqplib": "~2.4"'];
     }
 
-    public function _initialize()
+    public function _initialize(): void
     {
         $host = $this->config['host'];
         $port = $this->config['port'];
@@ -94,7 +91,7 @@ public function _initialize()
         }
     }
 
-    public function _before(TestInterface $test)
+    public function _before(TestInterface $test): void
     {
         if ($this->config['cleanup']) {
             $this->cleanup();
@@ -111,10 +108,8 @@ public function _before(TestInterface $test)
      * $I->pushToExchange('exchange.emails', new AMQPMessage('Thanks!'));
      * $I->pushToExchange('exchange.emails', new AMQPMessage('Thanks!'), 'severity');
      * ```
-     *
-     * @param string|AMQPMessage $message
      */
-    public function pushToExchange(string $exchange, $message, string $routing_key = null): void
+    public function pushToExchange(string $exchange, string|AMQPMessage $message, string $routing_key = null): void
     {
         $message = $message instanceof AMQPMessage
             ? $message
@@ -130,10 +125,8 @@ public function pushToExchange(string $exchange, $message, string $routing_key =
      * $I->pushToQueue('queue.jobs', 'create user');
      * $I->pushToQueue('queue.jobs', new AMQPMessage('create'));
      * ```
-     *
-     * @param string|AMQPMessage $message
      */
-    public function pushToQueue(string $queue, $message): void
+    public function pushToQueue(string $queue, string|AMQPMessage $message): void
     {
         $message = $message instanceof AMQPMessage
             ? $message

tests/unit/Codeception/Module/AMQPTest.php

@@ -5,7 +5,7 @@
 use Codeception\Lib\ModuleContainer;
 use Codeception\Module\AMQP;
 use Codeception\PHPUnit\TestCase;
-use Codeception\Util\Stub;
+use Codeception\Stub;
 
 final class AMQPTest extends TestCase
 {