diff --git a/composer.json b/composer.json
index b530ec16..11c1cbfb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,42 +1,59 @@
 {
-    "name": "zendframework/zend-code",
+    "name": "acbjtechnology/zend-code-25",
     "description": "provides facilities to generate arbitrary code using an object oriented interface",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
         "code"
     ],
-    "homepage": "https://github.com/zendframework/zend-code",
+    "homepage": "https://github.com/acbjtechnology/zend-code-25",
     "autoload": {
         "psr-4": {
             "Zend\\Code\\": "src/"
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-eventmanager": "~2.5"
+        "php": ">=7.3",
+        "acbjtechnology/zend-eventmanager-25": "@dev"
     },
     "require-dev": {
         "doctrine/common": ">=2.1",
-        "zendframework/zend-stdlib": "~2.5",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
+        "zendframework/zend-stdlib": "~2.5"
     },
     "suggest": {
         "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
         "zendframework/zend-stdlib": "Zend\\Stdlib component"
     },
     "minimum-stability": "dev",
-    "prefer-stable": true,
+    "prefer-stable": false,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-master": "main",
+            "dev-develop": "52-3-1-dev"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Code\\": "test/"
         }
-    }
+    },
+    "repositories" : [
+        {
+            "type":"package",
+            "package": {
+                "name": "acbjtechnology/zend-eventmanager-25",
+                "version":"dev-main",
+                "source": {
+                    "url": "https://github.com/acbjtechnology/zend-eventmanager-25.git",
+                    "type": "git",
+                    "reference":"main"
+                },
+                "autoload": {
+                    "psr-4": {
+                        "Zend\\EventManager\\": "src/"
+                    }
+                }
+            }
+        }
+    ]
 }
diff --git a/src/Scanner/AnnotationScanner.php b/src/Scanner/AnnotationScanner.php
index 341ab492..6c106ed4 100644
--- a/src/Scanner/AnnotationScanner.php
+++ b/src/Scanner/AnnotationScanner.php
@@ -160,7 +160,7 @@ protected function tokenize()
             }
             $currentChar = $stream[$streamIndex];
             $matches     = [];
-            $currentLine = (preg_match('#(.*?)(?:\n|\r\n?)#', $stream, $matches, null, $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
+            $currentLine = (preg_match('#(.*?)(?:\n|\r\n?)#', $stream, $matches, 0, $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
             if ($currentChar === ' ') {
                 $currentWord = (preg_match('#( +)#', $currentLine, $matches) === 1) ? $matches[1] : $currentLine;
             } else {
diff --git a/src/Scanner/DocBlockScanner.php b/src/Scanner/DocBlockScanner.php
index 3de6d9fe..5e933299 100644
--- a/src/Scanner/DocBlockScanner.php
+++ b/src/Scanner/DocBlockScanner.php
@@ -200,7 +200,7 @@ protected function tokenize()
             }
             $currentChar = $stream[$streamIndex];
             $matches     = [];
-            $currentLine = (preg_match('#(.*?)\r?\n#', $stream, $matches, null, $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
+            $currentLine = (preg_match('#(.*?)\r?\n#', $stream, $matches, 0, $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
             if ($currentChar === ' ') {
                 $currentWord = (preg_match('#( +)#', $currentLine, $matches) === 1) ? $matches[1] : $currentLine;
             } else {