Merge pull request #7 from Codeception/codecept5

Support Codeception 5

Author: Naktibalda

.github/workflows/main.yml

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

composer.json

@@ -12,11 +12,12 @@
     ],
     "minimum-stability": "RC",
     "require": {
-        "php": "^7.4 | ^8.0",
-        "codeception/codeception": "^4.0"
+        "php": "^8.0",
+        "codeception/codeception": "^5.0"
     },
     "autoload":{
-        "classmap": ["src/"]
+        "classmap": ["src/"],
+        "files": ["src/Codeception/Util/sq.php"]
     },
     "config": {
         "classmap-authoritative": true

src/Codeception/Module/Sequence.php

@@ -100,35 +100,35 @@
  */
 class Sequence extends Module
 {
+    /**
+     * @var array<int|string,string>
+     */
     public static array $hash = [];
 
+    /**
+     * @var array<int|string,string>
+     */
     public static array $suiteHash = [];
 
     public static string $prefix = '';
 
     /**
      * @var array<string, string>
      */
-    protected $config = ['prefix' => '{id}_'];
+    protected array $config = ['prefix' => '{id}_'];
 
-    public function _initialize()
+    public function _initialize(): void
     {
         static::$prefix = $this->config['prefix'];
     }
 
-    public function _after(TestInterface $t)
+    public function _after(TestInterface $test): void
     {
         self::$hash = [];
     }
 
-    public function _afterSuite()
+    public function _afterSuite(): void
     {
         self::$suiteHash = [];
     }
 }
-
-if (!function_exists('sq') && !function_exists('sqs')) {
-    require_once __DIR__ . '/../Util/sq.php';
-} else {
-    throw new ModuleException(Sequence::class, "function 'sq' and 'sqs' already defined");
-}

src/Codeception/Util/sq.php

@@ -4,36 +4,32 @@
 
 use Codeception\Module\Sequence;
 
-if (!function_exists('sq')) {
-    function sq($id = null)
-    {
-        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;
+function sq(int|string $id = null): string
+{
+    if ($id && isset(Sequence::$hash[$id])) {
+        return Sequence::$hash[$id];
+    }
+
+    $prefix = str_replace('{id}', (string)$id, Sequence::$prefix);
+    $sequence = $prefix . uniqid((string)$id);
+    if ($id) {
+        Sequence::$hash[$id] = $sequence;
     }
-}
 
-if (!function_exists('sqs')) {
-    function sqs($id = null)
-    {
-        if ($id && isset(Sequence::$suiteHash[$id])) {
-            return Sequence::$suiteHash[$id];
-        }
+    return $sequence;
+}
 
-        $prefix = str_replace('{id}', $id, Sequence::$prefix);
-        $sequence = $prefix . uniqid($id);
-        if ($id) {
-            Sequence::$suiteHash[$id] = $sequence;
-        }
+function sqs(int|string $id = null): string
+{
+    if ($id && isset(Sequence::$suiteHash[$id])) {
+        return Sequence::$suiteHash[$id];
+    }
 
-        return $sequence;
+    $prefix = str_replace('{id}', (string)$id, Sequence::$prefix);
+    $sequence = $prefix . uniqid((string)$id);
+    if ($id) {
+        Sequence::$suiteHash[$id] = $sequence;
     }
+
+    return $sequence;
 }

tests/unit/Codeception/Module/SequenceTest.php

@@ -5,7 +5,7 @@
 use Codeception\Lib\ModuleContainer;
 use Codeception\Module\Sequence;
 use Codeception\Test\Unit;
-use Codeception\Util\Stub;
+use Codeception\Stub;
 
 final class SequenceTest extends Unit
 {