Load functions using composer autoloader

Author: Naktibalda

composer.json

@@ -16,7 +16,8 @@
         "codeception/codeception": "^5.0"
     },
     "autoload":{
-        "classmap": ["src/"]
+        "classmap": ["src/"],
+        "files": ["src/Codeception/Util/sq.php"]
     },
     "config": {
         "classmap-authoritative": true

src/Codeception/Module/Sequence.php

@@ -132,9 +132,3 @@ 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(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;
-        }
-
-        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(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;
-        }
+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;
 }