Update codebase to PHP 7.4 (#4)

Author: TavoNiievez

.github/workflows/main.yml

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

composer.json

@@ -12,7 +12,7 @@
     ],
     "minimum-stability": "RC",
     "require": {
-        "php": ">=5.6.0 <9.0",
+        "php": "^7.4 | ^8.0",
         "codeception/codeception": "^4.0"
     },
     "autoload":{

readme.md

@@ -1,11 +1,16 @@
-# Sequence module for Codeception
+# Codeception Module Sequence
+
+Sequence module for Codeception.
 
 ![Build Status](https://github.com/Codeception/module-sequence/workflows/CI/badge.svg)
+[![Latest Stable Version](https://poser.pugx.org/codeception/module-sequence/v/stable)](https://github.com/Codeception/module-sequence/releases)
+[![Total Downloads](https://poser.pugx.org/codeception/module-sequence/downloads)](https://packagist.org/packages/codeception/module-sequence)
+[![License](https://poser.pugx.org/codeception/module-sequence/license)](/LICENSE)
 
 ## Installation
 
 ```
-composer require --dev "codeception/module-sequence"
+composer require "codeception/module-sequence" --dev
 ```
 
 ## Documentation

src/Codeception/Module/Sequence.php

@@ -1,7 +1,10 @@
 <?php
+
+declare(strict_types=1);
+
 namespace Codeception\Module;
 
-use Codeception\Module as CodeceptionModule;
+use Codeception\Module;
 use Codeception\Exception\ModuleException;
 use Codeception\TestInterface;
 
@@ -46,7 +49,6 @@
  * for ($i = 0; $i<10; $i++) {
  *      $I->haveInDatabase('users', array('login' => sq("user$i"), 'email' => sq("user$i").'@email.com');
  * }
- * ?>
  * ```
  *
  * Cest Suite tests:
@@ -70,7 +72,6 @@
  *         $I->removeUser(sqs('user') . '@mailserver.com');
  *     }
  * }
- * ?>
  * ```
  *
  * ### Config
@@ -97,12 +98,17 @@
  *     prefix: '{id}.'
  * ```
  */
-class Sequence extends CodeceptionModule
+class Sequence extends Module
 {
-    public static $hash = [];
-    public static $suiteHash = [];
-    public static $prefix = '';
+    public static array $hash = [];
+
+    public static array $suiteHash = [];
+
+    public static string $prefix = '';
 
+    /**
+     * @var array<string, string>
+     */
     protected $config = ['prefix' => '{id}_'];
 
     public function _initialize()
@@ -124,5 +130,5 @@ public function _afterSuite()
 if (!function_exists('sq') && !function_exists('sqs')) {
     require_once __DIR__ . '/../Util/sq.php';
 } else {
-    throw new ModuleException('Codeception\Module\Sequence', "function 'sq' and 'sqs' already defined");
+    throw new ModuleException(Sequence::class, "function 'sq' and 'sqs' already defined");
 }

src/Codeception/Util/sq.php

@@ -1,32 +1,39 @@
 <?php
+
+declare(strict_types=1);
+
 use Codeception\Module\Sequence;
 
 if (!function_exists('sq')) {
     function sq($id = null)
     {
-        if ($id and isset(Sequence::$hash[$id])) {
+        if ($id && isset(Sequence::$hash[$id])) {
             return Sequence::$hash[$id];
         }
+
         $prefix = str_replace('{id}', $id, Sequence::$prefix);
         $sequence = $prefix . uniqid($id);
         if ($id) {
             Sequence::$hash[$id] = $sequence;
         }
+
         return $sequence;
     }
 }
 
 if (!function_exists('sqs')) {
     function sqs($id = null)
     {
-        if ($id and isset(Sequence::$suiteHash[$id])) {
+        if ($id && isset(Sequence::$suiteHash[$id])) {
             return Sequence::$suiteHash[$id];
         }
+
         $prefix = str_replace('{id}', $id, Sequence::$prefix);
         $sequence = $prefix . uniqid($id);
         if ($id) {
             Sequence::$suiteHash[$id] = $sequence;
         }
+
         return $sequence;
     }
 }

tests/unit/Codeception/Module/SequenceTest.php

@@ -1,31 +1,36 @@
 <?php
 
-class SequenceTest extends \Codeception\Test\Unit
+declare(strict_types=1);
+
+use Codeception\Lib\ModuleContainer;
+use Codeception\Module\Sequence;
+use Codeception\Test\Unit;
+use Codeception\Util\Stub;
+
+final class SequenceTest extends Unit
 {
-    // tests
-    public function testSequences()
+    public function testSequences(): void
     {
-        $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
-        $module = new \Codeception\Module\Sequence($container);
-        $this->assertNotEquals(sq(), sq());
-        $this->assertNotEquals(sq(1), sq(2));
-        $this->assertEquals(sq(1), sq(1));
-        $old = sq(1);
+        $container = Stub::make(ModuleContainer::class);
+        $module = new Sequence($container);
+        $this->assertNotEquals(sq(''), sq(''));
+        $this->assertNotEquals(sq('1'), sq('2'));
+        $this->assertEquals(sq('1'), sq('1'));
+        $old = sq('1');
         $module->_after($this);
-        $this->assertNotEquals($old, sq(1));
+        $this->assertNotEquals($old, sq('1'));
     }
 
-    public function testSuiteSequences()
+    public function testSuiteSequences(): void
     {
-        $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
-        $module = new \Codeception\Module\Sequence($container);
-        $this->assertNotEquals(sqs(), sqs());
-        $this->assertNotEquals(sqs(1), sqs(2));
-        $this->assertEquals(sqs(1), sqs(1));
-        $old = sqs(1);
+        $container = Stub::make(ModuleContainer::class);
+        $module = new Sequence($container);
+        $this->assertNotEquals(sqs('1'), sqs('2'));
+        $this->assertEquals(sqs('1'), sqs('1'));
+        $old = sqs('1');
         $module->_after($this);
-        $this->assertEquals($old, sqs(1));
+        $this->assertEquals($old, sqs('1'));
         $module->_afterSuite();
-        $this->assertNotEquals($old, sqs(1));
+        $this->assertNotEquals($old, sqs('1'));
     }
 }