diff --git a/.gitignore b/.gitignore
index 170b69dd..15fbd282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,6 @@
-.vagrant
-tests/Zend/Db/Table/_files/cachefiles/*
-tests/Zend/Auth/Adapter/OpenId/_files/*
-tests/Zend/Filter/_files/Compress/*
-tests/Zend/Filter/_files/Users/*
-tests/Zend/OpenId/Provider/Storage/_files/*
-tests/Zend/OpenId/_files/*
-tests/Zend/Translate/Adapter/_files/zend_cache---internal-metadatas---testid
-tests/Zend/Translate/Adapter/_files/zend_cache---testid
-tests/TestConfiguration.php
-vendor/*
-bin/dbunit
-bin/phpunit
+/.idea/
+/vendor/
+/tests/Zend/Filter/_files/Compress/*
+/tests/Zend/Filter/_files/Users/*
+/tests/Zend/Translate/Adapter/_files/zend_cache---internal-metadatas---testid
+/tests/Zend/Translate/Adapter/_files/zend_cache---testid
diff --git a/composer.json b/composer.json
index e8073a1f..f4211ad9 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "php": ">=8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "@stable",
         "friendsofphp/php-cs-fixer": "@stable"
     }
 }
diff --git a/composer.lock b/composer.lock
index 70c86d1e..de302d3f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "87aa88e5fec7d79b3625e57a090cec0b",
+    "content-hash": "fbe46f571e1105f90430a4f499b7573e",
     "packages": [],
     "packages-dev": [
         {
@@ -591,6 +591,62 @@
             ],
             "time": "2022-03-03T13:19:32+00:00"
         },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.13.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+            },
+            "time": "2021-11-30T19:35:32+00:00"
+        },
         {
             "name": "phar-io/manifest",
             "version": "2.0.3",
@@ -983,40 +1039,44 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.15",
+            "version": "9.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48"
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": ">=7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.3 || ^4.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1.3"
+                "nikic/php-parser": "^4.13.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2.2"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.7.2"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.0-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -1044,7 +1104,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
             },
             "funding": [
                 {
@@ -1052,32 +1112,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-26T12:20:09+00:00"
+            "time": "2022-03-07T09:28:20+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -1104,7 +1164,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -1112,26 +1172,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:42:26+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1148,41 +1220,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
             "keywords": [
-                "template"
+                "process"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.3",
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1201,14 +1279,14 @@
                     "role": "lead"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "timer"
+                "template"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
             "funding": [
                 {
@@ -1216,33 +1294,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:20:02+00:00"
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "4.0.4",
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1257,17 +1334,18 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "tokenizer"
+                "timer"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
             "funding": [
                 {
@@ -1275,21 +1353,20 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2020-08-04T08:28:15+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.25",
+            "version": "9.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "9ff23f4dfde040ccd3b8db876192d1184b934158"
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ff23f4dfde040ccd3b8db876192d1184b934158",
-                "reference": "9ff23f4dfde040ccd3b8db876192d1184b934158",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
                 "shasum": ""
             },
             "require": {
@@ -1300,32 +1377,35 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.0",
+                "myclabs/deep-copy": "^1.10.1",
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
-                "php": ">=7.2",
-                "phpspec/prophecy": "^1.10.3",
-                "phpunit/php-code-coverage": "^7.0.12",
-                "phpunit/php-file-iterator": "^2.0.4",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1.2",
-                "sebastian/comparator": "^3.0.2",
-                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.3",
-                "sebastian/exporter": "^3.1.2",
-                "sebastian/global-state": "^3.0.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.3",
-                "sebastian/version": "^2.0.1"
+                "php": ">=7.3",
+                "phpspec/prophecy": "^1.12.1",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.0",
+                "sebastian/version": "^3.0.2"
             },
             "require-dev": {
-                "ext-pdo": "*"
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0.1"
             },
             "suggest": {
                 "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0.0"
+                "ext-xdebug": "*"
             },
             "bin": [
                 "phpunit"
@@ -1333,10 +1413,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.5-dev"
+                    "dev-master": "9.5-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -1361,7 +1444,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.25"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
             },
             "funding": [
                 {
@@ -1373,7 +1456,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-16T16:24:13+00:00"
+            "time": "2022-03-15T09:57:31+00:00"
         },
         {
             "name": "psr/cache",
@@ -1577,30 +1660,142 @@
             },
             "time": "2021-07-14T16:46:02+00:00"
         },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1622,7 +1817,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -1630,34 +1825,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.3",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1696,7 +1891,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
             },
             "funding": [
                 {
@@ -1704,33 +1899,90 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:04:30+00:00"
+            "time": "2020-10-26T15:49:45+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1762,7 +2014,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1770,27 +2022,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.4",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -1798,7 +2050,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -1825,7 +2077,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
             },
             "funding": [
                 {
@@ -1833,34 +2085,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:53:42+00:00"
+            "time": "2020-09-28T05:52:38+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.4",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
-                "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1895,14 +2147,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1910,30 +2162,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T13:51:24+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.2",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/de036ec91d55d2a9e0db2ba975b512cdb1c23921",
-                "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -1941,7 +2193,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1966,7 +2218,64 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-14T08:28:10+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
             },
             "funding": [
                 {
@@ -1974,34 +2283,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-10T06:55:38+00:00"
+            "time": "2020-11-28T06:42:11+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2023,7 +2332,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2031,32 +2340,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -2078,7 +2387,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -2086,32 +2395,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2141,7 +2450,7 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2149,29 +2458,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2193,7 +2505,7 @@
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
             },
             "funding": [
                 {
@@ -2201,32 +2513,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:30:19+00:00"
+            "time": "2020-09-28T06:45:17+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "1.1.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4"
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2249,7 +2561,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
             },
             "funding": [
                 {
@@ -2257,29 +2569,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:25:11+00:00"
+            "time": "2022-03-15T09:54:48+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2302,9 +2614,15 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "symfony/console",
@@ -3715,6 +4033,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "phpunit/phpunit": 0,
         "friendsofphp/php-cs-fixer": 0
     },
     "prefer-stable": false,
diff --git a/phpunit.xml b/phpunit.xml
index 1232ee86..f049b9fc 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,13 +1,7 @@
-<phpunit bootstrap="./tests/TestHelper.php">
+<phpunit bootstrap="./tests/TestHelper.php"
+ cacheResultFile="/tmp/.zf1.phpunit.result.cache"
+>
     <testsuite name="Zend Framework - Testsuite">
         <directory>./tests/</directory>
     </testsuite>
-
-    <!-- Enable this for proper unit testing code coverage reports
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../library/Zend</directory>
-        </whitelist>
-    </filter>
-    -->
 </phpunit>
diff --git a/tests/Zend/Application/ApplicationTest.php b/tests/Zend/Application/ApplicationTest.php
index 9b8bd77f..d124b1b9 100644
--- a/tests/Zend/Application/ApplicationTest.php
+++ b/tests/Zend/Application/ApplicationTest.php
@@ -429,7 +429,7 @@ public function testPassingZfVersionAutoloaderInformationConfiguresAutoloader()
         ]);
         $autoloader = $application->getAutoloader();
         $actual = $autoloader->getZfPath();
-        $this->assertContains($latest, $actual);
+        $this->assertStringContainsString($latest, $actual);
     }
 
     /**
diff --git a/tests/Zend/Application/Module/AutoloaderTest.php b/tests/Zend/Application/Module/AutoloaderTest.php
index 351dfc44..12061a38 100644
--- a/tests/Zend/Application/Module/AutoloaderTest.php
+++ b/tests/Zend/Application/Module/AutoloaderTest.php
@@ -99,7 +99,7 @@ public function testDbTableResourceTypeShouldBeLoadedByDefault()
     public function testDbTableResourceTypeShouldPointToModelsDbTableSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('models/DbTable', $resources['dbtable']['path']);
+        $this->assertStringContainsStringIgnoringCase('models/DbTable', $resources['dbtable']['path']);
     }
 
     public function testFormResourceTypeShouldBeLoadedByDefault()
@@ -110,7 +110,7 @@ public function testFormResourceTypeShouldBeLoadedByDefault()
     public function testFormResourceTypeShouldPointToFormsSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('forms', $resources['form']['path']);
+        $this->assertStringContainsStringIgnoringCase('forms', $resources['form']['path']);
     }
 
     public function testModelResourceTypeShouldBeLoadedByDefault()
@@ -121,7 +121,7 @@ public function testModelResourceTypeShouldBeLoadedByDefault()
     public function testModelResourceTypeShouldPointToModelsSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('models', $resources['model']['path']);
+        $this->assertStringContainsStringIgnoringCase('models', $resources['model']['path']);
     }
 
     public function testPluginResourceTypeShouldBeLoadedByDefault()
@@ -132,7 +132,7 @@ public function testPluginResourceTypeShouldBeLoadedByDefault()
     public function testPluginResourceTypeShouldPointToPluginsSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('plugins', $resources['plugin']['path']);
+        $this->assertStringContainsStringIgnoringCase('plugins', $resources['plugin']['path']);
     }
 
     public function testServiceResourceTypeShouldBeLoadedByDefault()
@@ -143,7 +143,7 @@ public function testServiceResourceTypeShouldBeLoadedByDefault()
     public function testServiceResourceTypeShouldPointToServicesSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('services', $resources['service']['path']);
+        $this->assertStringContainsStringIgnoringCase('services', $resources['service']['path']);
     }
 
     public function testViewHelperResourceTypeShouldBeLoadedByDefault()
@@ -154,7 +154,7 @@ public function testViewHelperResourceTypeShouldBeLoadedByDefault()
     public function testViewHelperResourceTypeShouldPointToViewHelperSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('views/helpers', $resources['viewhelper']['path']);
+        $this->assertStringContainsStringIgnoringCase('views/helpers', $resources['viewhelper']['path']);
     }
 
     public function testViewFilterResourceTypeShouldBeLoadedByDefault()
@@ -165,7 +165,7 @@ public function testViewFilterResourceTypeShouldBeLoadedByDefault()
     public function testViewFilterResourceTypeShouldPointToViewFilterSubdirectory()
     {
         $resources = $this->loader->getResourceTypes();
-        $this->assertContains('views/filters', $resources['viewfilter']['path']);
+        $this->assertStringContainsStringIgnoringCase('views/filters', $resources['viewfilter']['path']);
     }
 
     public function testDefaultResourceShouldBeModel()
diff --git a/tests/Zend/Captcha/DumbTest.php b/tests/Zend/Captcha/DumbTest.php
index 3249481a..50d558ce 100644
--- a/tests/Zend/Captcha/DumbTest.php
+++ b/tests/Zend/Captcha/DumbTest.php
@@ -70,7 +70,7 @@ public function testRendersWordInReverse()
         $word = $this->captcha->getWord();
         $html = $this->captcha->render(new Zend_View());
         $this->assertStringContainsString(strrev($word), $html);
-        $this->assertNotContains($word, $html);
+        $this->assertStringNotContainsString($word, $html);
     }
 
     /**
diff --git a/tests/Zend/Captcha/FigletTest.php b/tests/Zend/Captcha/FigletTest.php
index 5c16512c..c1e92694 100644
--- a/tests/Zend/Captcha/FigletTest.php
+++ b/tests/Zend/Captcha/FigletTest.php
@@ -89,9 +89,9 @@ public function testCaptchaHasIdAndInput()
     {
         $html = $this->element->render($this->getView());
         $expect = sprintf('type="hidden" name="%s\[id\]" value="%s"', $this->element->getName(), $this->captcha->getId());
-        $this->assertRegexp("/<input[^>]*?$expect/", $html, $html);
+        $this->assertMatchesRegularExpression("/<input[^>]*?$expect/", $html, $html);
         $expect = sprintf('type="text" name="%s\[input\]"', $this->element->getName());
-        $this->assertRegexp("/<input[^>]*?$expect/", $html, $html);
+        $this->assertMatchesRegularExpression("/<input[^>]*?$expect/", $html, $html);
     }
 
     // @group ZF-8268
@@ -104,7 +104,7 @@ public function testLabelIdIsCorrect()
         $form->addElement($this->element);
         $html = $form->render($this->getView());
         $expect = sprintf('for="comment-%s-input"', $this->element->getName());
-        $this->assertRegexp("/<label [^>]*?$expect/", $html, $html);
+        $this->assertMatchesRegularExpression("/<label [^>]*?$expect/", $html, $html);
     }
 
     public function testTimeoutPopulatedByDefault()
diff --git a/tests/Zend/Captcha/ImageTest.php b/tests/Zend/Captcha/ImageTest.php
index 7693020d..21c99c09 100644
--- a/tests/Zend/Captcha/ImageTest.php
+++ b/tests/Zend/Captcha/ImageTest.php
@@ -137,25 +137,25 @@ public function testCaptchaHasIdAndInput()
     {
         $html = $this->element->render($this->getView());
         $expect = sprintf('type="hidden" name="%s\[id\]" value="%s"', $this->element->getName(), $this->captcha->getId());
-        $this->assertRegexp("/<input[^>]*?$expect/", $html, $html);
+        $this->assertMatchesRegularExpression("/<input[^>]*?$expect/", $html, $html);
         $expect = sprintf('type="text" name="%s\[input\]"', $this->element->getName());
-        $this->assertRegexp("/<input[^>]*?$expect/", $html, $html);
+        $this->assertMatchesRegularExpression("/<input[^>]*?$expect/", $html, $html);
     }
 
     public function testCaptchaHasImage()
     {
         $html = $this->element->render($this->getView());
         $id = $this->captcha->getId();
-        $this->assertRegexp("|<img[^>]*?src=\"/images/captcha/$id.png\"|", $html, "Expected $id in HTML:\n" . $html);
+        $this->assertMatchesRegularExpression("|<img[^>]*?src=\"/images/captcha/$id.png\"|", $html, "Expected $id in HTML:\n" . $html);
     }
 
     public function testCaptchaHasAlt()
     {
         $html = $this->element->render($this->getView());
-        $this->assertRegexp('|<img[^>]*? alt=""|', $html, "Expected alt= in HTML:\n" . $html);
+        $this->assertMatchesRegularExpression('|<img[^>]*? alt=""|', $html, "Expected alt= in HTML:\n" . $html);
         $this->captcha->setImgAlt('Test Image');
         $html = $this->element->render($this->getView());
-        $this->assertRegexp('|<img[^>]*? alt="Test Image"|', $html, "Wrong alt in HTML:\n" . $html);
+        $this->assertMatchesRegularExpression('|<img[^>]*? alt="Test Image"|', $html, "Wrong alt in HTML:\n" . $html);
     }
 
     public function testCaptchaSetSuffix()
@@ -304,10 +304,10 @@ public function testImageTagRenderedProperlyBasedUponDoctype()
         $view = new Zend_View();
 
         $view->doctype('XHTML1_STRICT');
-        $this->assertRegExp('#/>$#', $this->captcha->render($view));
+        $this->assertMatchesRegularExpression('#/>$#', $this->captcha->render($view));
 
         $view->doctype('HTML4_STRICT');
-        $this->assertRegExp('#[^/]>$#', $this->captcha->render($view));
+        $this->assertMatchesRegularExpression('#[^/]>$#', $this->captcha->render($view));
     }
 }
 
diff --git a/tests/Zend/Config/IniTest.php b/tests/Zend/Config/IniTest.php
index ab110ef9..4e0904be 100644
--- a/tests/Zend/Config/IniTest.php
+++ b/tests/Zend/Config/IniTest.php
@@ -253,7 +253,7 @@ public function testZF3196_InvalidIniFile()
             $config = new Zend_Config_Ini($this->_iniFileInvalid);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertRegexp('/(Error parsing|parse error|syntax error, unexpected)/', $expected->getMessage());
+            $this->assertMatchesRegularExpression('/(Error parsing|parse error|syntax error, unexpected)/', $expected->getMessage());
         }
     }
 
diff --git a/tests/Zend/ConfigTest.php b/tests/Zend/ConfigTest.php
index 54e4fefb..fc194635 100644
--- a/tests/Zend/ConfigTest.php
+++ b/tests/Zend/ConfigTest.php
@@ -255,15 +255,15 @@ public function testZf1019_HandlingInvalidKeyNames()
     {
         $config = new Zend_Config($this->_leadingdot);
         $array = $config->toArray();
-        $this->assertContains('dot-test', $array['.test']);
+        $this->assertStringContainsString('dot-test', $array['.test']);
     }
 
     public function testZF1019_EmptyKeys()
     {
         $config = new Zend_Config($this->_invalidkey);
         $array = $config->toArray();
-        $this->assertContains('test', $array[' ']);
-        $this->assertContains('test', $array['']);
+        $this->assertStringContainsString('test', $array[' ']);
+        $this->assertStringContainsString('test', $array['']);
     }
 
     public function testZF1417_DefaultValues()
diff --git a/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php b/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
index b807f326..21b9636e 100644
--- a/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
+++ b/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
@@ -313,7 +313,7 @@ public function testCanAddContext()
         $this->assertTrue(isset($context['headers']));
         $this->assertTrue(isset($context['callbacks']));
 
-        $this->assertContains('foo.bar', $context['suffix']);
+        $this->assertStringContainsString('foo.bar', $context['suffix']);
         $this->assertEquals('application/x-foobar', $context['headers']['Content-Type']);
         $this->assertEquals('Bar', $context['headers']['X-Foo']);
     }
@@ -485,13 +485,13 @@ public function testInitContextUsesBooleanTrueActionValueToAssumeAllContexts()
             ->setActionName('all');
         $this->helper->initContext();
         $this->assertEquals('json', $this->helper->getCurrentContext());
-        $this->assertContains('json', $this->viewRenderer->getViewSuffix());
+        $this->assertStringContainsString('json', $this->viewRenderer->getViewSuffix());
 
         $this->request->setParam('format', 'xml')
             ->setActionName('all');
         $this->helper->initContext();
         $this->assertEquals('xml', $this->helper->getCurrentContext());
-        $this->assertContains('xml', $this->viewRenderer->getViewSuffix());
+        $this->assertStringContainsString('xml', $this->viewRenderer->getViewSuffix());
     }
 
     public function testInitContextDoesNothingIfActionDoesNotHaveContextAndPassedFormatInvalid()
@@ -507,7 +507,7 @@ public function testInitContextSetsViewRendererViewSuffix()
         $this->request->setParam('format', 'xml')
             ->setActionName('foo');
         $this->helper->initContext();
-        $this->assertContains('xml', $this->viewRenderer->getViewSuffix());
+        $this->assertStringContainsString('xml', $this->viewRenderer->getViewSuffix());
     }
 
     public function testInitContextSetsAppropriateResponseHeader()
@@ -536,7 +536,7 @@ public function testInitContextUsesPassedFormatWhenContextParamPresent()
             ->setActionName('foo');
         $this->helper->initContext('json');
 
-        $this->assertContains('json', $this->viewRenderer->getViewSuffix());
+        $this->assertStringContainsString('json', $this->viewRenderer->getViewSuffix());
 
         $headers = $this->response->getHeaders();
 
@@ -557,7 +557,7 @@ public function testInitContextUsesPassedFormatWhenNoContextParamNotPresent()
         $this->request->setActionName('foo');
         $this->helper->initContext('xml');
 
-        $this->assertContains('xml', $this->viewRenderer->getViewSuffix());
+        $this->assertStringContainsString('xml', $this->viewRenderer->getViewSuffix());
 
         $headers = $this->response->getHeaders();
 
@@ -866,7 +866,7 @@ public function testForwardingShouldNotUseContextSuffixIfNewActionDoesNotDetectV
         $this->helper->init();
         $this->helper->initContext();
         $suffix = $this->viewRenderer->getViewSuffix();
-        $this->assertNotContains('xml', $suffix, $suffix);
+        $this->assertStringNotContainsString('xml', $suffix, $suffix);
     }
 
     /**
@@ -882,15 +882,15 @@ public function testForwardingShouldNotPrependMultipleViewSuffixesForCustomConte
         $this->helper->initContext();
         $this->assertEquals('foo', $this->helper->getCurrentContext());
         $suffix = $this->viewRenderer->getViewSuffix();
-        $this->assertContains('foo', $suffix, $suffix);
+        $this->assertStringContainsString('foo', $suffix, $suffix);
 
         $this->request->setActionName('bar');
         $this->helper->init();
         $this->helper->initContext();
         $this->assertEquals('foo', $this->helper->getCurrentContext());
         $suffix = $this->viewRenderer->getViewSuffix();
-        $this->assertContains('foo', $suffix, $suffix);
-        $this->assertNotContains('foo.foo', $suffix, $suffix);
+        $this->assertStringContainsString('foo', $suffix, $suffix);
+        $this->assertStringNotContainsString('foo.foo', $suffix, $suffix);
     }
 
     /**
diff --git a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
index 0317986a..7e488c39 100644
--- a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
+++ b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
@@ -160,7 +160,7 @@ protected function _checkDefaults($module = 'foo', $count = 1)
 
         $scriptPaths = $this->helper->view->getScriptPaths();
         $this->assertEquals($count, count($scriptPaths), var_export($scriptPaths, 1));
-        $this->assertContains($module, $scriptPaths[0]);
+        $this->assertStringContainsString($module, $scriptPaths[0]);
 
         $helperPaths = $this->helper->view->getHelperPaths();
         $test = ucfirst($module) . '_View_Helper_';
@@ -263,7 +263,7 @@ public function testInitViewWithOptions()
 
         $scriptPaths = $this->helper->view->getScriptPaths();
         $scriptPath = $scriptPaths[0];
-        $this->assertContains(
+        $this->assertStringContainsString(
             $this->_normalizePath($viewDir),
             $this->_normalizePath($scriptPath)
             );
@@ -775,7 +775,7 @@ public function testStockInflectorWorksWithViewBaseSpec()
         $viewScriptPaths = $this->helper->view->getAllPaths();
 
         $expectedPathRegex = '#modules/bar/bar/scripts/$#';
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             $expectedPathRegex,
             $this->_normalizePath($viewScriptPaths['script'][0])
             );
@@ -795,7 +795,7 @@ public function testStockInflectorWorksWithDottedRequestParts()
         $viewScriptPaths = $this->helper->view->getAllPaths();
 
         $expectedPathRegex = '#modules/foo/views/scripts/$#';
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             $expectedPathRegex,
             $this->_normalizePath($viewScriptPaths['script'][0])
             );
diff --git a/tests/Zend/Controller/ActionTest.php b/tests/Zend/Controller/ActionTest.php
index 3db163af..4e5a14eb 100644
--- a/tests/Zend/Controller/ActionTest.php
+++ b/tests/Zend/Controller/ActionTest.php
@@ -75,21 +75,21 @@ public function testInit()
     public function testPreRun()
     {
         $this->_controller->preDispatch();
-        $this->assertNotContains('Prerun ran', $this->_controller->getResponse()->getBody());
+        $this->assertStringNotContainsString('Prerun ran', $this->_controller->getResponse()->getBody());
 
         $this->_controller->getRequest()->setParam('prerun', true);
         $this->_controller->preDispatch();
-        $this->assertContains('Prerun ran', $this->_controller->getResponse()->getBody());
+        $this->assertStringContainsString('Prerun ran', $this->_controller->getResponse()->getBody());
     }
 
     public function testPostRun()
     {
         $this->_controller->postDispatch();
-        $this->assertNotContains('Postrun ran', $this->_controller->getResponse()->getBody());
+        $this->assertStringNotContainsString('Postrun ran', $this->_controller->getResponse()->getBody());
 
         $this->_controller->getRequest()->setParam('postrun', true);
         $this->_controller->postDispatch();
-        $this->assertContains('Postrun ran', $this->_controller->getResponse()->getBody());
+        $this->assertStringContainsString('Postrun ran', $this->_controller->getResponse()->getBody());
     }
 
     public function testGetRequest()
@@ -172,8 +172,8 @@ public function testRun()
     {
         $response = $this->_controller->run();
         $body = $response->getBody();
-        $this->assertContains('In the index action', $body, var_export($this->_controller->getRequest(), 1));
-        $this->assertNotContains('Prerun ran', $body, $body);
+        $this->assertStringContainsString('In the index action', $body, var_export($this->_controller->getRequest(), 1));
+        $this->assertStringNotContainsString('Prerun ran', $body, $body);
     }
 
     public function testRun2()
@@ -192,8 +192,8 @@ public function testRun3()
     {
         $this->_controller->getRequest()->setActionName('foo');
         $response = $this->_controller->run();
-        $this->assertContains('In the foo action', $response->getBody());
-        $this->assertNotContains('Prerun ran', $this->_controller->getResponse()->getBody());
+        $this->assertStringContainsString('In the foo action', $response->getBody());
+        $this->assertStringNotContainsString('Prerun ran', $this->_controller->getResponse()->getBody());
     }
 
     public function testHasParam()
@@ -267,7 +267,7 @@ public function testRedirect()
             }
         }
         $this->assertEquals(1, $found);
-        $this->assertContains('/foo/bar', $url);
+        $this->assertStringContainsString('/foo/bar', $url);
     }
 
     public function testInitView()
@@ -472,7 +472,7 @@ public function testMissingActionExceptionsDifferFromMissingMethods()
             $this->_controller->bogusAction();
             $this->fail('Invalid action should throw exception');
         } catch (Zend_Controller_Exception $e) {
-            $this->assertRegexp('/^Action.*?(does not exist and was not trapped in __call\(\))$/', $e->getMessage());
+            $this->assertMatchesRegularExpression('/^Action.*?(does not exist and was not trapped in __call\(\))$/', $e->getMessage());
             $this->assertStringContainsString('bogus', $e->getMessage());
             $this->assertStringNotContainsString('bogusAction', $e->getMessage());
             $this->assertEquals(404, $e->getCode());
@@ -482,7 +482,7 @@ public function testMissingActionExceptionsDifferFromMissingMethods()
             $this->_controller->bogus();
             $this->fail('Invalid method should throw exception');
         } catch (Zend_Controller_Exception $e) {
-            $this->assertRegexp('/^Method.*?(does not exist and was not trapped in __call\(\))$/', $e->getMessage());
+            $this->assertMatchesRegularExpression('/^Method.*?(does not exist and was not trapped in __call\(\))$/', $e->getMessage());
             $this->assertStringContainsString('bogus', $e->getMessage());
             $this->assertEquals(500, $e->getCode());
         }
diff --git a/tests/Zend/Controller/Dispatcher/StandardTest.php b/tests/Zend/Controller/Dispatcher/StandardTest.php
index 4b75c639..04b4fc46 100644
--- a/tests/Zend/Controller/Dispatcher/StandardTest.php
+++ b/tests/Zend/Controller/Dispatcher/StandardTest.php
@@ -182,7 +182,7 @@ public function testDispatchValidControllerDefaultAction()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
 
-        $this->assertContains('Index action called', $this->_dispatcher->getResponse()->getBody());
+        $this->assertStringContainsString('Index action called', $this->_dispatcher->getResponse()->getBody());
     }
 
     public function testDispatchValidControllerAndAction()
@@ -193,7 +193,7 @@ public function testDispatchValidControllerAndAction()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
 
-        $this->assertContains('Index action called', $this->_dispatcher->getResponse()->getBody());
+        $this->assertStringContainsString('Index action called', $this->_dispatcher->getResponse()->getBody());
     }
 
     public function testDispatchValidControllerWithInvalidAction()
@@ -293,9 +293,9 @@ public function testDispatchValidControllerWithPrePostDispatch()
         $this->_dispatcher->dispatch($request, $response);
 
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('Bar action called', $body);
-        $this->assertContains('preDispatch called', $body);
-        $this->assertContains('postDispatch called', $body);
+        $this->assertStringContainsString('Bar action called', $body);
+        $this->assertStringContainsString('preDispatch called', $body);
+        $this->assertStringContainsString('postDispatch called', $body);
     }
 
     public function testDispatchNoControllerUsesDefaults()
@@ -346,7 +346,7 @@ public function testModules()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('Admin_Foo::bar action called', $body, $body);
+        $this->assertStringContainsString('Admin_Foo::bar action called', $body, $body);
     }
 
     public function testModuleControllerInSubdirWithCamelCaseAction()
@@ -361,7 +361,7 @@ public function testModuleControllerInSubdirWithCamelCaseAction()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('Admin_FooBar::bazBat action called', $body, $body);
+        $this->assertStringContainsString('Admin_FooBar::bazBat action called', $body, $body);
     }
 
     public function testUseModuleDefaultController()
@@ -377,7 +377,7 @@ public function testUseModuleDefaultController()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('Admin_Foo::index action called', $body, $body);
+        $this->assertStringContainsString('Admin_Foo::index action called', $body, $body);
     }
 
     public function testNoModuleOrControllerDefaultsCorrectly()
@@ -389,7 +389,7 @@ public function testNoModuleOrControllerDefaultsCorrectly()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('Index action called', $body, $body);
+        $this->assertStringContainsString('Index action called', $body, $body);
     }
 
     public function testOutputBuffering()
@@ -403,7 +403,7 @@ public function testOutputBuffering()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('OB index action called', $body, $body);
+        $this->assertStringContainsString('OB index action called', $body, $body);
     }
 
     public function testDisableOutputBuffering()
@@ -444,7 +444,7 @@ public function testModuleSubdirControllerFound()
         $response = new Zend_Controller_Response_Cli();
         $this->_dispatcher->dispatch($request, $response);
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertContains('Foo_Admin_IndexController::indexAction() called', $body, $body);
+        $this->assertStringContainsString('Foo_Admin_IndexController::indexAction() called', $body, $body);
     }
 
     public function testDefaultModule()
@@ -488,8 +488,8 @@ public function testSanelyDiscardOutputBufferOnException()
         } catch (Exception $e) {
         }
         $body = $this->_dispatcher->getResponse()->getBody();
-        $this->assertNotContains('In exception action', $body, $body);
-        $this->assertNotContains('Foo', $body, $body);
+        $this->assertStringNotContainsString('In exception action', $body, $body);
+        $this->assertStringNotContainsString('Foo', $body, $body);
     }
 
     public function testGetDefaultControllerClassResetsRequestObject()
@@ -637,7 +637,7 @@ public function testCamelCasedActionsNotRequestedWithWordSeparatorsShouldResolve
             $this->_dispatcher->dispatch($request, $response);
             $body = $this->_dispatcher->getResponse()->getBody();
             error_reporting($oldLevel);
-            $this->assertContains('Admin_FooBar::bazBat action called', $body, $body);
+            $this->assertStringContainsString('Admin_FooBar::bazBat action called', $body, $body);
         } catch (Zend_Controller_Exception $e) {
             error_reporting($oldLevel);
             $this->fail('camelCased actions should succeed when forced');
@@ -669,7 +669,7 @@ public function testForcingCamelCasedActionsNotRequestedWithWordSeparatorsShould
             $body = $this->_dispatcher->getResponse()->getBody();
             restore_error_handler();
             $this->assertTrue(isset($this->error));
-            $this->assertContains('deprecated', $this->error);
+            $this->assertStringContainsString('deprecated', $this->error);
         } catch (Zend_Controller_Exception $e) {
             restore_error_handler();
             $this->fail('camelCased actions should succeed when forced');
diff --git a/tests/Zend/Controller/FrontTest.php b/tests/Zend/Controller/FrontTest.php
index ec773312..4bcd3e44 100644
--- a/tests/Zend/Controller/FrontTest.php
+++ b/tests/Zend/Controller/FrontTest.php
@@ -248,7 +248,7 @@ public function testDispatch()
         $this->_controller->setResponse(new Zend_Controller_Response_Cli());
         $response = $this->_controller->dispatch($request);
 
-        $this->assertContains('Index action called', $response->getBody());
+        $this->assertStringContainsString('Index action called', $response->getBody());
     }
 
     /**
@@ -260,7 +260,7 @@ public function testDispatch1()
         $this->_controller->setResponse(new Zend_Controller_Response_Cli());
         $response = $this->_controller->dispatch($request);
 
-        $this->assertContains('Index action called', $response->getBody());
+        $this->assertStringContainsString('Index action called', $response->getBody());
     }
 
     /**
@@ -307,9 +307,9 @@ public function testDispatch4()
         $response = $this->_controller->dispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Bar action called', $body, $body);
-        $this->assertContains('preDispatch called', $body, $body);
-        $this->assertContains('postDispatch called', $body, $body);
+        $this->assertStringContainsString('Bar action called', $body, $body);
+        $this->assertStringContainsString('preDispatch called', $body, $body);
+        $this->assertStringContainsString('postDispatch called', $body, $body);
     }
 
     /**
@@ -324,8 +324,8 @@ public function testDispatch5()
         $response = $this->_controller->dispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('foo: bar', $body, $body);
-        $this->assertContains('baz: bat', $body);
+        $this->assertStringContainsString('foo: bar', $body, $body);
+        $this->assertStringContainsString('baz: bat', $body);
     }
 
     /**
@@ -339,7 +339,7 @@ public function testDispatch6()
         $response = $this->_controller->dispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Bar action called', $body);
+        $this->assertStringContainsString('Bar action called', $body);
         $params = $request->getParams();
         $this->assertTrue(isset($params['var1']));
         $this->assertEquals('baz', $params['var1']);
@@ -359,7 +359,7 @@ public function testDispatch7()
         $response = $this->_controller->dispatch($request, $response);
 
         $body = $response->getBody();
-        $this->assertContains('Bar action called', $body);
+        $this->assertStringContainsString('Bar action called', $body);
     }
 
     /**
@@ -514,7 +514,7 @@ public function testModulePathDispatched()
         $response = $this->_controller->dispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Admin_Foo::bar action called', $body, $body);
+        $this->assertStringContainsString('Admin_Foo::bar action called', $body, $body);
     }
 
     public function testModuleControllerDirectoryName()
@@ -534,9 +534,9 @@ public function testAddModuleDirectory()
         $this->assertTrue(isset($controllerDirs['default']));
         $this->assertFalse(isset($controllerDirs['.svn']));
 
-        $this->assertContains('modules' . DIRECTORY_SEPARATOR . 'foo', $controllerDirs['foo']);
-        $this->assertContains('modules' . DIRECTORY_SEPARATOR . 'bar', $controllerDirs['bar']);
-        $this->assertContains('modules' . DIRECTORY_SEPARATOR . 'default', $controllerDirs['default']);
+        $this->assertStringContainsString('modules' . DIRECTORY_SEPARATOR . 'foo', $controllerDirs['foo']);
+        $this->assertStringContainsString('modules' . DIRECTORY_SEPARATOR . 'bar', $controllerDirs['bar']);
+        $this->assertStringContainsString('modules' . DIRECTORY_SEPARATOR . 'default', $controllerDirs['default']);
     }
 
     /**#@+
@@ -549,16 +549,16 @@ public function testShouldAllowRetrievingCurrentModuleDirectory()
         $request->setModuleName('bar');
         $this->_controller->setRequest($request);
         $dir = $this->_controller->getModuleDirectory();
-        $this->assertContains('modules' . DIRECTORY_SEPARATOR . 'bar', $dir);
-        $this->assertNotContains('controllers', $dir);
+        $this->assertStringContainsString('modules' . DIRECTORY_SEPARATOR . 'bar', $dir);
+        $this->assertStringNotContainsString('controllers', $dir);
     }
 
     public function testShouldAllowRetrievingSpecifiedModuleDirectory()
     {
         $this->testAddModuleDirectory();
         $dir = $this->_controller->getModuleDirectory('foo');
-        $this->assertContains('modules' . DIRECTORY_SEPARATOR . 'foo', $dir);
-        $this->assertNotContains('controllers', $dir);
+        $this->assertStringContainsString('modules' . DIRECTORY_SEPARATOR . 'foo', $dir);
+        $this->assertStringNotContainsString('controllers', $dir);
     }
 
     public function testShouldReturnNullWhenRetrievingNonexistentModuleDirectory()
@@ -591,7 +591,7 @@ public function testAddModuleDirectoryThrowsExceptionForInvalidDirectory()
             $this->fail('Exception expected but not thrown');
         } catch (Exception $e) {
             $this->assertTrue($e instanceof Zend_Exception);
-            $this->assertRegExp(
+            $this->assertMatchesRegularExpression(
                 '/Directory \w+ not readable/', $e->getMessage()
             );
         }
@@ -603,7 +603,7 @@ public function testGetControllerDirectoryByModuleName()
         $this->_controller->addModuleDirectory($moduleDir);
         $barDir = $this->_controller->getControllerDirectory('bar');
         $this->assertNotNull($barDir);
-        $this->assertContains('modules' . DIRECTORY_SEPARATOR . 'bar', $barDir);
+        $this->assertStringContainsString('modules' . DIRECTORY_SEPARATOR . 'bar', $barDir);
     }
 
     public function testGetControllerDirectoryByModuleNameReturnsNullOnBadModule()
@@ -657,7 +657,7 @@ public function testReplaceRequestAndResponseMidStream()
         $this->assertNotSame($request, $requestPost);
         $this->assertNotSame($response, $responsePost);
 
-        $this->assertContains('Reset action called', $responsePost->getBody());
+        $this->assertStringContainsString('Reset action called', $responsePost->getBody());
         $this->assertStringNotContainsString('Reset action called', $response->getBody());
     }
 
diff --git a/tests/Zend/Controller/Response/HttpTest.php b/tests/Zend/Controller/Response/HttpTest.php
index e218f19e..3ef93314 100644
--- a/tests/Zend/Controller/Response/HttpTest.php
+++ b/tests/Zend/Controller/Response/HttpTest.php
@@ -334,7 +334,7 @@ public function testCanSendHeadersIndicatesFileAndLine()
             static::fail('canSendHeaders() should throw exception');
         } catch (Exception $e) {
             var_dump($e->getMessage());
-            static::assertRegExp('/headers already sent in .+, line \d+$/', $e->getMessage());
+            static::assertMatchesRegularExpression('/headers already sent in .+, line \d+$/', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Controller/Router/Route/ChainTest.php b/tests/Zend/Controller/Router/Route/ChainTest.php
index 5058591b..063c32bb 100644
--- a/tests/Zend/Controller/Router/Route/ChainTest.php
+++ b/tests/Zend/Controller/Router/Route/ChainTest.php
@@ -296,7 +296,7 @@ public function testChainingAssembleWithRoutePlaceholder()
         $res = $chain->match($request);
 
         $this->assertTrue(is_array($res));
-        $this->assertRegexp('#[^a-z0-9]?foobar\.zend\.com/bar/foo/bar#i', $chain->assemble(['account' => 'foobar', 'foo' => 'bar']));
+        $this->assertMatchesRegularExpression('#[^a-z0-9]?foobar\.zend\.com/bar/foo/bar#i', $chain->assemble(['account' => 'foobar', 'foo' => 'bar']));
     }
 
     public function testChainingAssembleWithStatic()
@@ -312,7 +312,7 @@ public function testChainingAssembleWithStatic()
         $res = $chain->match($request);
 
         $this->assertTrue(is_array($res));
-        $this->assertRegexp('#[^a-z0-9]?www\.zend\.com/bar$#i', $chain->assemble());
+        $this->assertMatchesRegularExpression('#[^a-z0-9]?www\.zend\.com/bar$#i', $chain->assemble());
     }
 
     public function testChainingAssembleWithRegex()
@@ -328,7 +328,7 @@ public function testChainingAssembleWithRegex()
         $res = $chain->match($request);
 
         $this->assertTrue(is_array($res));
-        $this->assertRegexp('#[^a-z0-9]?www\.zend\.com/bar$#i', $chain->assemble());
+        $this->assertMatchesRegularExpression('#[^a-z0-9]?www\.zend\.com/bar$#i', $chain->assemble());
     }
 
     public function testChainingReuse()
diff --git a/tests/Zend/Controller/Router/Route/HostnameTest.php b/tests/Zend/Controller/Router/Route/HostnameTest.php
index c6e9b608..0985053c 100644
--- a/tests/Zend/Controller/Router/Route/HostnameTest.php
+++ b/tests/Zend/Controller/Router/Route/HostnameTest.php
@@ -85,14 +85,14 @@ public function testAssembleStaticHost()
     {
         $route = $this->_getStaticHostRoute();
 
-        $this->assertRegexp('/[^a-z0-9]?www\.zend\.com$/i', $route->assemble());
+        $this->assertMatchesRegularExpression('/[^a-z0-9]?www\.zend\.com$/i', $route->assemble());
     }
 
     public function testAssembleHost()
     {
         $route = $this->_getHostRoute();
 
-        $this->assertRegexp('/[^a-z0-9]?foo\.zend\.com$/i', $route->assemble(['subdomain' => 'foo']));
+        $this->assertMatchesRegularExpression('/[^a-z0-9]?foo\.zend\.com$/i', $route->assemble(['subdomain' => 'foo']));
     }
 
     public function testAssembleHostWithMissingParam()
@@ -111,7 +111,7 @@ public function testAssembleHostWithDefaultParam()
     {
         $route = $this->_getHostRouteWithDefault();
 
-        $this->assertRegexp('/[^a-z0-9]?bar\.zend\.com$/i', $route->assemble());
+        $this->assertMatchesRegularExpression('/[^a-z0-9]?bar\.zend\.com$/i', $route->assemble());
     }
 
     public function testHostGetDefault()
diff --git a/tests/Zend/Date/DateObjectTest.php b/tests/Zend/Date/DateObjectTest.php
index 47439d53..415aaa31 100644
--- a/tests/Zend/Date/DateObjectTest.php
+++ b/tests/Zend/Date/DateObjectTest.php
@@ -473,7 +473,7 @@ public function testSetTimezone()
                 $this->fail('exception expected');
             }
         } catch (Zend_Date_Exception $e) {
-            $this->assertRegexp('/not a known timezone/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/not a known timezone/i', $e->getMessage());
             $this->assertSame('Unknown', $e->getOperand());
         }
         $this->assertSame('Indian/Maldives', $date->getTimezone());
diff --git a/tests/Zend/File/ClassFileLocatorTest.php b/tests/Zend/File/ClassFileLocatorTest.php
index 6afc9e53..17fa3916 100644
--- a/tests/Zend/File/ClassFileLocatorTest.php
+++ b/tests/Zend/File/ClassFileLocatorTest.php
@@ -45,7 +45,7 @@ public function testIterationShouldReturnOnlyPhpFiles()
 
         $locator = new Zend_File_ClassFileLocator(__DIR__);
         foreach ($locator as $file) {
-            $this->assertRegexp('/\.php$/', $file->getFilename());
+            $this->assertMatchesRegularExpression('/\.php$/', $file->getFilename());
         }
     }
 
diff --git a/tests/Zend/File/Transfer/Adapter/HttpTest.php b/tests/Zend/File/Transfer/Adapter/HttpTest.php
index d59b22b5..8426203f 100644
--- a/tests/Zend/File/Transfer/Adapter/HttpTest.php
+++ b/tests/Zend/File/Transfer/Adapter/HttpTest.php
@@ -68,7 +68,7 @@ public function tearDown(): void
     public function testEmptyAdapter()
     {
         $files = $this->adapter->getFileName();
-        $this->assertContains('test.txt', $files);
+        $this->assertStringContainsString('test.txt', $files);
     }
 
     public function testAutoSetUploadValidator()
@@ -215,7 +215,7 @@ public function testNoUploadInProgress()
         }
 
         $status = Zend_File_Transfer_Adapter_HttpTest_MockAdapter::getProgress();
-        $this->assertContains('No upload in progress', $status);
+        $this->assertStringContainsString('No upload in progress', $status);
     }
 
     public function testUploadProgressFailure()
@@ -292,7 +292,7 @@ public function testValidationOfPhpExtendsFormError()
         $_FILES = [];
         $adapter = new Zend_File_Transfer_Adapter_HttpTest_MockAdapter();
         $this->assertFalse($adapter->isValidParent());
-        $this->assertContains('exceeds the defined ini size', current($adapter->getMessages()));
+        $this->assertStringContainsString('exceeds the defined ini size', current($adapter->getMessages()));
     }
 }
 
diff --git a/tests/Zend/Filter/InputTest.php b/tests/Zend/Filter/InputTest.php
index 4d04d482..9b4f189b 100644
--- a/tests/Zend/Filter/InputTest.php
+++ b/tests/Zend/Filter/InputTest.php
@@ -2077,17 +2077,17 @@ public function testSettingNotEmptyMessageAndMessagePerKeyAndMessagePerArray()
         $filter = new Zend_Filter_Input($filters, $validators, ['street' => '']);
         $this->assertFalse($filter->isValid());
         $message = $filter->getMessages();
-        $this->assertContains('Bitte geben Sie Ihre Straße ein.', $message['street']['isEmpty']);
+        $this->assertStringContainsString('Bitte geben Sie Ihre Straße ein.', $message['street']['isEmpty']);
 
         $filter2 = new Zend_Filter_Input($filters, $validators, ['street' => 'Str!!']);
         $this->assertFalse($filter2->isValid());
         $message = $filter2->getMessages();
-        $this->assertContains('Verwenden Sie bitte keine Sonderzeichen', $message['street']['regexNotMatch']);
+        $this->assertStringContainsString('Verwenden Sie bitte keine Sonderzeichen', $message['street']['regexNotMatch']);
 
         $filter3 = new Zend_Filter_Input($filters, $validators, ['street' => 'Str1234567890']);
         $this->assertFalse($filter3->isValid());
         $message = $filter3->getMessages();
-        $this->assertContains('Bitte beschränken Sie sich auf', $message['street']['stringLengthTooLong']);
+        $this->assertStringContainsString('Bitte beschränken Sie sich auf', $message['street']['stringLengthTooLong']);
     }
 
     /**
@@ -2116,9 +2116,9 @@ public function testSettingMultipleNotEmptyMessages()
         $filter = new Zend_Filter_Input($filters, $validators, $data);
         $this->assertFalse($filter->isValid());
         $message = $filter->getMessages();
-        $this->assertContains('Please enter your name', $message['name']['isEmpty']);
-        $this->assertContains('Please enter a subject', $message['subject']['isEmpty']);
-        $this->assertContains('Please enter message contents', $message['content']['isEmpty']);
+        $this->assertStringContainsString('Please enter your name', $message['name']['isEmpty']);
+        $this->assertStringContainsString('Please enter a subject', $message['subject']['isEmpty']);
+        $this->assertStringContainsString('Please enter message contents', $message['content']['isEmpty']);
     }
 
     /**
diff --git a/tests/Zend/Form/Decorator/CallbackTest.php b/tests/Zend/Form/Decorator/CallbackTest.php
index 56159117..0d93895a 100644
--- a/tests/Zend/Form/Decorator/CallbackTest.php
+++ b/tests/Zend/Form/Decorator/CallbackTest.php
@@ -147,7 +147,7 @@ public function testRenderCanPrepend()
         $this->assertStringContainsString('foo bar', $content);
         $this->assertStringContainsString($element->getName(), $content);
         $this->assertStringContainsString($element->getLabel(), $content);
-        $this->assertRegexp('/foo bar$/s', $content);
+        $this->assertMatchesRegularExpression('/foo bar$/s', $content);
     }
 
     public function testRenderCanReplaceContent()
diff --git a/tests/Zend/Form/Decorator/DescriptionTest.php b/tests/Zend/Form/Decorator/DescriptionTest.php
index c9349711..c6a8effa 100644
--- a/tests/Zend/Form/Decorator/DescriptionTest.php
+++ b/tests/Zend/Form/Decorator/DescriptionTest.php
@@ -83,7 +83,7 @@ public function testRendersDescriptionInParagraphTagsByDefault()
     public function testParagraphTagsContainHintClassByDefault()
     {
         $this->testRendersDescriptionInParagraphTagsByDefault();
-        $this->assertRegexp('/<p[^>]*?class="hint"/', $this->html);
+        $this->assertMatchesRegularExpression('/<p[^>]*?class="hint"/', $this->html);
     }
 
     public function testCanSpecifyAlternateTag()
@@ -109,14 +109,14 @@ public function testCanSpecifyAlternateTagViaOption()
     public function testAlternateTagContainsHintClass()
     {
         $this->testCanSpecifyAlternateTag();
-        $this->assertRegexp('/<quote[^>]*?class="hint"/', $this->html);
+        $this->assertMatchesRegularExpression('/<quote[^>]*?class="hint"/', $this->html);
     }
 
     public function testCanSpecifyAlternateClass()
     {
         $this->decorator->setOption('class', 'haha');
         $html = $this->decorator->render('');
-        $this->assertRegexp('/<p[^>]*?class="haha"/', $html);
+        $this->assertMatchesRegularExpression('/<p[^>]*?class="haha"/', $html);
     }
 
     public function testRenderingEscapesDescriptionByDefault()
diff --git a/tests/Zend/Form/Decorator/ErrorsTest.php b/tests/Zend/Form/Decorator/ErrorsTest.php
index f62878d0..66963051 100644
--- a/tests/Zend/Form/Decorator/ErrorsTest.php
+++ b/tests/Zend/Form/Decorator/ErrorsTest.php
@@ -90,7 +90,7 @@ public function testRenderRendersAllErrorMessages()
         $test = $this->decorator->render($content);
         $this->assertStringContainsString($content, $test);
         foreach ($this->element->getMessages() as $message) {
-            $this->assertContains($message, $test);
+            $this->assertStringContainsString($message, $test);
         }
     }
 
@@ -99,7 +99,7 @@ public function testRenderAppendsMessagesToContentByDefault()
         $this->setupElement();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('#' . $content . '.*?<ul#s', $test, $test);
+        $this->assertMatchesRegularExpression('#' . $content . '.*?<ul#s', $test, $test);
     }
 
     public function testRenderPrependsMessagesToContentWhenRequested()
@@ -108,7 +108,7 @@ public function testRenderPrependsMessagesToContentWhenRequested()
         $this->setupElement();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('#</ul>.*?' . $content . '#s', $test);
+        $this->assertMatchesRegularExpression('#</ul>.*?' . $content . '#s', $test);
     }
 
     public function testRenderSeparatesContentAndErrorsWithPhpEolByDefault()
diff --git a/tests/Zend/Form/Decorator/FileTest.php b/tests/Zend/Form/Decorator/FileTest.php
index bfeac294..0fde5652 100644
--- a/tests/Zend/Form/Decorator/FileTest.php
+++ b/tests/Zend/Form/Decorator/FileTest.php
@@ -95,14 +95,14 @@ public function testRenderSingleFiles()
     {
         $this->setupSingleElement();
         $test = $this->decorator->render(null);
-        $this->assertRegexp('#foo#s', $test);
+        $this->assertMatchesRegularExpression('#foo#s', $test);
     }
 
     public function testRenderMultiFiles()
     {
         $this->setupMultiElement();
         $test = $this->decorator->render(null);
-        $this->assertRegexp('#foo\[\]#s', $test);
+        $this->assertMatchesRegularExpression('#foo\[\]#s', $test);
     }
 
     public function setupElementWithMaxFileSize()
@@ -123,8 +123,8 @@ public function testRenderMaxFileSize()
 
         $this->setupElementWithMaxFileSize();
         $test = $this->decorator->render(null);
-        $this->assertRegexp('#MAX_FILE_SIZE#s', $test);
-        $this->assertRegexp('#' . $max . '#s', $test);
+        $this->assertMatchesRegularExpression('#MAX_FILE_SIZE#s', $test);
+        $this->assertMatchesRegularExpression('#' . $max . '#s', $test);
     }
 
     public function testPlacementInitiallyAppends()
@@ -149,7 +149,7 @@ public function testCanPrependFileToContent()
             ->setOption('placement', 'prepend');
 
         $file = $this->decorator->render('content');
-        $this->assertRegexp('#<input[^>]*>.*?(content)#s', $file, $file);
+        $this->assertMatchesRegularExpression('#<input[^>]*>.*?(content)#s', $file, $file);
     }
 
     /**
@@ -168,7 +168,7 @@ public function testCanChangeViewHelper()
         $mockOutput = $element->render();
 
         // Ensure the view helper was changed
-        $this->assertRegexp('/FormFileMock/s', $mockOutput);
+        $this->assertMatchesRegularExpression('/FormFileMock/s', $mockOutput);
         $this->assertNotEquals($defaultOutput, $mockOutput);
     }
 
diff --git a/tests/Zend/Form/Decorator/FormErrorsTest.php b/tests/Zend/Form/Decorator/FormErrorsTest.php
index dfc5fada..b1c79c14 100644
--- a/tests/Zend/Form/Decorator/FormErrorsTest.php
+++ b/tests/Zend/Form/Decorator/FormErrorsTest.php
@@ -146,7 +146,7 @@ public function testRenderRendersAllErrorMessages()
                     $this->assertStringContainsString($message, $test, var_export($messages, 1));
                 } else {
                     foreach ($message as $m) {
-                        $this->assertContains($m, $test, var_export($messages, 1));
+                        $this->assertStringContainsString($m, $test, var_export($messages, 1));
                     }
                 }
             }
@@ -158,7 +158,7 @@ public function testRenderAppendsMessagesToContentByDefault()
         $this->setupForm();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('#' . $content . '.*?<ul#s', $test, $test);
+        $this->assertMatchesRegularExpression('#' . $content . '.*?<ul#s', $test, $test);
     }
 
     public function testRenderPrependsMessagesToContentWhenRequested()
@@ -167,7 +167,7 @@ public function testRenderPrependsMessagesToContentWhenRequested()
         $this->setupForm();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('#</ul>.*?' . $content . '#s', $test);
+        $this->assertMatchesRegularExpression('#</ul>.*?' . $content . '#s', $test);
     }
 
     public function testRenderSeparatesContentAndErrorsWithPhpEolByDefault()
@@ -243,7 +243,7 @@ public function testMarkupOptionsShouldBeUsedWhenRendering()
             if ($key == 'ignoreSubForms') {
                 $this->assertStringNotContainsString('Sub ', $markup);
             } else {
-                $this->assertContains($value, $markup);
+                $this->assertStringContainsString($value, $markup);
             }
         }
     }
@@ -259,7 +259,7 @@ public function testRenderIsArrayForm()
         foreach ($this->form->getMessages() as $name => $messages) {
             while (($message = current($messages))) {
                 if (is_string($message)) {
-                    $this->assertStringContainsString($message, $test, var_export($messages, 1));
+                    $this->assertContains($message, $test, var_export($messages, 1));
                 }
                 if (false === next($messages) && is_array(prev($messages))) {
                     $messages = current($messages);
@@ -278,7 +278,7 @@ public function testCustomFormErrors()
 
         $this->decorator->setOnlyCustomFormErrors(true);
         $html = $this->form->render();
-        $this->assertNotRegexp('/form-errors.*?Master Foo/', $html);
+        $this->assertDoesNotMatchRegularExpression('/form-errors.*?Master Foo/', $html);
 
         $this->decorator->setShowCustomFormErrors(false);
         $html = $this->form->render();
diff --git a/tests/Zend/Form/Decorator/HtmlTagTest.php b/tests/Zend/Form/Decorator/HtmlTagTest.php
index 674cb55c..579e2d99 100644
--- a/tests/Zend/Form/Decorator/HtmlTagTest.php
+++ b/tests/Zend/Form/Decorator/HtmlTagTest.php
@@ -159,7 +159,7 @@ public function testAppendPlacementWithCloseOnlyRendersClosingTagFollowingConten
         ];
         $this->decorator->setOptions($options);
         $html = $this->decorator->render('content');
-        $this->assertRegexp('#(content).*?(</div>)#', $html, $html);
+        $this->assertMatchesRegularExpression('#(content).*?(</div>)#', $html, $html);
     }
 
     public function testAppendPlacementWithOpenOnlyRendersOpeningTagFollowingContent()
@@ -171,7 +171,7 @@ public function testAppendPlacementWithOpenOnlyRendersOpeningTagFollowingContent
         ];
         $this->decorator->setOptions($options);
         $html = $this->decorator->render('content');
-        $this->assertRegexp('#(content).*?(<div>)#', $html, $html);
+        $this->assertMatchesRegularExpression('#(content).*?(<div>)#', $html, $html);
     }
 
     public function testPrependPlacementWithCloseOnlyRendersClosingTagBeforeContent()
@@ -183,7 +183,7 @@ public function testPrependPlacementWithCloseOnlyRendersClosingTagBeforeContent(
         ];
         $this->decorator->setOptions($options);
         $html = $this->decorator->render('content');
-        $this->assertRegexp('#(</div>).*?(content)#', $html, $html);
+        $this->assertMatchesRegularExpression('#(</div>).*?(content)#', $html, $html);
     }
 
     public function testPrependPlacementWithOpenOnlyRendersOpeningTagBeforeContent()
@@ -195,7 +195,7 @@ public function testPrependPlacementWithOpenOnlyRendersOpeningTagBeforeContent()
         ];
         $this->decorator->setOptions($options);
         $html = $this->decorator->render('content');
-        $this->assertRegexp('#(<div>).*?(content)#', $html, $html);
+        $this->assertMatchesRegularExpression('#(<div>).*?(content)#', $html, $html);
     }
 
     public function testTagIsInitiallyDiv()
diff --git a/tests/Zend/Form/Decorator/ImageTest.php b/tests/Zend/Form/Decorator/ImageTest.php
index dfd6060f..9bc88532 100644
--- a/tests/Zend/Form/Decorator/ImageTest.php
+++ b/tests/Zend/Form/Decorator/ImageTest.php
@@ -120,7 +120,7 @@ public function testCanRenderImageWithinAdditionalTag()
             ->setOption('tag', 'div');
 
         $image = $this->decorator->render('');
-        $this->assertRegexp('#<div>.*?<input[^>]*>.*?</div>#s', $image, $image);
+        $this->assertMatchesRegularExpression('#<div>.*?<input[^>]*>.*?</div>#s', $image, $image);
     }
 
     public function testCanPrependImageToContent()
@@ -132,7 +132,7 @@ public function testCanPrependImageToContent()
             ->setOption('placement', 'prepend');
 
         $image = $this->decorator->render('content');
-        $this->assertRegexp('#<input[^>]*>.*?(content)#s', $image, $image);
+        $this->assertMatchesRegularExpression('#<input[^>]*>.*?(content)#s', $image, $image);
     }
 
     /**
diff --git a/tests/Zend/Form/Decorator/LabelTest.php b/tests/Zend/Form/Decorator/LabelTest.php
index 6e4831a8..76a56cfb 100644
--- a/tests/Zend/Form/Decorator/LabelTest.php
+++ b/tests/Zend/Form/Decorator/LabelTest.php
@@ -105,14 +105,14 @@ public function testRenderAddsOptionalClassForNonRequiredElements()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*optional/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*optional/', $test, $test);
 
         $element->class = 'bar';
         $this->decorator->setOption('class', 'foo');
         $test = $this->decorator->render($content);
-        $this->assertNotRegexp('/<label[^>]*?class="[^"]*bar/', $test, $test);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*foo/', $test, $test);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*optional/', $test, $test);
+        $this->assertDoesNotMatchRegularExpression('/<label[^>]*?class="[^"]*bar/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*foo/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*optional/', $test, $test);
     }
 
     public function testRenderAddsRequiredClassForRequiredElements()
@@ -124,14 +124,14 @@ public function testRenderAddsRequiredClassForRequiredElements()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*required/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*required/', $test, $test);
 
         $element->class = 'bar';
         $this->decorator->setOption('class', 'foo');
         $test = $this->decorator->render($content);
-        $this->assertNotRegexp('/<label[^>]*?class="[^"]*bar/', $test, $test);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*foo/', $test, $test);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*required/', $test, $test);
+        $this->assertDoesNotMatchRegularExpression('/<label[^>]*?class="[^"]*bar/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*foo/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*required/', $test, $test);
     }
 
     public function testRenderAppendsRequiredClassToClassProvidedInRequiredElement()
@@ -144,8 +144,8 @@ public function testRenderAppendsRequiredClassToClassProvidedInRequiredElement()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('/<label[^>]*?class="[^"]*required/', $test, $test);
-        $this->assertNotRegexp('/<label[^>]*?class="[^"]*bazbat/', $test, $test);
+        $this->assertMatchesRegularExpression('/<label[^>]*?class="[^"]*required/', $test, $test);
+        $this->assertDoesNotMatchRegularExpression('/<label[^>]*?class="[^"]*bazbat/', $test, $test);
     }
 
     public function testRenderUtilizesOptionalSuffixesAndPrefixesWhenRequested()
@@ -166,7 +166,7 @@ public function testRenderUtilizesOptionalSuffixesAndPrefixesWhenRequested()
         $this->assertStringNotContainsString('-req-suffix-', $test, $test);
         $this->assertStringContainsString('-opt-prefix-', $test, $test);
         $this->assertStringContainsString('-opt-suffix-', $test, $test);
-        $this->assertRegexp('/-opt-prefix-[^-]*?My Label[^-]*-opt-suffix-/s', $test, $test);
+        $this->assertMatchesRegularExpression('/-opt-prefix-[^-]*?My Label[^-]*-opt-suffix-/s', $test, $test);
     }
 
     public function testRenderUtilizesRequiredSuffixesAndPrefixesWhenRequested()
@@ -188,7 +188,7 @@ public function testRenderUtilizesRequiredSuffixesAndPrefixesWhenRequested()
         $this->assertStringNotContainsString('-opt-suffix-', $test, $test);
         $this->assertStringContainsString('-req-prefix-', $test, $test);
         $this->assertStringContainsString('-req-suffix-', $test, $test);
-        $this->assertRegexp('/-req-prefix-[^-]*?My Label[^-]*-req-suffix-/s', $test, $test);
+        $this->assertMatchesRegularExpression('/-req-prefix-[^-]*?My Label[^-]*-req-suffix-/s', $test, $test);
     }
 
     /**
@@ -203,7 +203,7 @@ public function testRenderShouldNotUtilizeElementClass()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertNotRegexp('#<label[^>]*(class="[^"]*foobar)[^"]*"#', $test, $test);
+        $this->assertDoesNotMatchRegularExpression('#<label[^>]*(class="[^"]*foobar)[^"]*"#', $test, $test);
     }
 
     public function testRenderRendersLabel()
@@ -229,7 +229,7 @@ public function testRenderAppendsOnRequest()
             ->setOptions(['placement' => 'APPEND']);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertRegexp('#' . $content . '.*?<label#s', $test);
+        $this->assertMatchesRegularExpression('#' . $content . '.*?<label#s', $test);
     }
 
     public function testCanChooseNotToEscapeLabel()
diff --git a/tests/Zend/Form/Decorator/ViewHelperTest.php b/tests/Zend/Form/Decorator/ViewHelperTest.php
index 913608c6..bc2a91b8 100644
--- a/tests/Zend/Form/Decorator/ViewHelperTest.php
+++ b/tests/Zend/Form/Decorator/ViewHelperTest.php
@@ -133,7 +133,7 @@ public function testRenderRendersElementWithSpecifiedHelper()
         $content = 'test content';
         $test = $this->decorator->render($content);
         $this->assertStringContainsString($content, $test);
-        $this->assertRegexp('#<input.*?name="foo"#s', $test);
+        $this->assertMatchesRegularExpression('#<input.*?name="foo"#s', $test);
     }
 
     public function testMultiOptionsPassedToViewHelperAreTranslated()
diff --git a/tests/Zend/Form/DisplayGroupTest.php b/tests/Zend/Form/DisplayGroupTest.php
index 06cb1745..442abbf7 100644
--- a/tests/Zend/Form/DisplayGroupTest.php
+++ b/tests/Zend/Form/DisplayGroupTest.php
@@ -388,7 +388,7 @@ public function testRenderingRendersAllElementsWithinFieldsetByDefault()
 
         $this->group->addElements([$foo, $bar]);
         $html = $this->group->render($this->getView());
-        $this->assertRegexp('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
+        $this->assertMatchesRegularExpression('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
         $this->assertStringContainsString('<input', $html, $html);
         $this->assertStringContainsString('"foo"', $html);
         $this->assertStringContainsString('"bar"', $html);
@@ -402,7 +402,7 @@ public function testToStringProxiesToRender()
         $this->group->addElements([$foo, $bar])
             ->setView($this->getView());
         $html = $this->group->__toString();
-        $this->assertRegexp('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
+        $this->assertMatchesRegularExpression('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
         $this->assertStringContainsString('<input', $html);
         $this->assertStringContainsString('"foo"', $html);
         $this->assertStringContainsString('"bar"', $html);
@@ -735,15 +735,15 @@ public function testGroupShouldOverloadToRenderDecorators()
         $this->group->setView($this->getView());
         $html = $this->group->renderFormElements();
         foreach ($this->group->getElements() as $element) {
-            $this->assertContains('id="' . $element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
+            $this->assertStringContainsString('id="' . $element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
         }
-        $this->assertNotContains('<dl', $html);
-        $this->assertNotContains('<form', $html);
+        $this->assertStringNotContainsString('<dl', $html);
+        $this->assertStringNotContainsString('<form', $html);
 
         $html = $this->group->renderFieldset('this is the content');
-        $this->assertContains('<fieldset', $html);
-        $this->assertContains('</fieldset>', $html);
-        $this->assertContains('this is the content', $html);
+        $this->assertStringContainsString('<fieldset', $html);
+        $this->assertStringContainsString('</fieldset>', $html);
+        $this->assertStringContainsString('this is the content', $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/ButtonTest.php b/tests/Zend/Form/Element/ButtonTest.php
index 6870dc3d..b6c48e02 100644
--- a/tests/Zend/Form/Element/ButtonTest.php
+++ b/tests/Zend/Form/Element/ButtonTest.php
@@ -116,7 +116,7 @@ public function testTranslatedLabelIsRendered()
         $decorator = $this->element->getDecorator('ViewHelper');
         $decorator->setElement($this->element);
         $html = $decorator->render('');
-        $this->assertRegexp('/<(input|button)[^>]*?>Submit Button/', $html, $html);
+        $this->assertMatchesRegularExpression('/<(input|button)[^>]*?>Submit Button/', $html, $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/CheckboxTest.php b/tests/Zend/Form/Element/CheckboxTest.php
index 18233e11..62e84b0f 100644
--- a/tests/Zend/Form/Element/CheckboxTest.php
+++ b/tests/Zend/Form/Element/CheckboxTest.php
@@ -217,9 +217,9 @@ public function testCheckedValueAlwaysRenderedAsCheckboxValue()
         $this->assertEquals(2, is_countable($matches[1]) ? count($matches[1]) : 0);
         foreach ($matches[1] as $element) {
             if (strstr($element, 'hidden')) {
-                $this->assertContains($this->element->getUncheckedValue(), $element);
+                $this->assertStringContainsString($this->element->getUncheckedValue(), $element);
             } else {
-                $this->assertContains($this->element->getCheckedValue(), $element);
+                $this->assertStringContainsString($this->element->getCheckedValue(), $element);
             }
         }
     }
diff --git a/tests/Zend/Form/Element/HashTest.php b/tests/Zend/Form/Element/HashTest.php
index c1be0da8..c7cdc1dc 100644
--- a/tests/Zend/Form/Element/HashTest.php
+++ b/tests/Zend/Form/Element/HashTest.php
@@ -118,7 +118,7 @@ public function testHashIsMd5()
     {
         $this->testGetHashReturnsHashValue();
         $this->assertEquals(32, strlen($this->hash));
-        $this->assertRegexp('/^[a-f0-9]{32}$/', $this->hash);
+        $this->assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $this->hash);
     }
 
     public function testLabelIsNull()
@@ -173,7 +173,7 @@ public function testHashTokenIsRendered()
     public function testHiddenInputRenderedByDefault()
     {
         $html = $this->element->render($this->getView());
-        $this->assertRegexp('/<input[^>]*?type="hidden"/', $html, $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?type="hidden"/', $html, $html);
     }
 
     /**
@@ -183,7 +183,7 @@ public function testShouldRenderHashTokenIfRenderedThroughMagicCall()
     {
         $this->element->setView($this->getView());
         $html = $this->element->renderViewHelper();
-        $this->assertContains($this->element->getHash(), $html, 'Html is: ' . $html);
+        $this->assertStringContainsString($this->element->getHash(), $html, 'Html is: ' . $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/ImageTest.php b/tests/Zend/Form/Element/ImageTest.php
index a24f837d..d8d93c7f 100644
--- a/tests/Zend/Form/Element/ImageTest.php
+++ b/tests/Zend/Form/Element/ImageTest.php
@@ -121,7 +121,7 @@ public function testLabelUsedAsAltAttribute()
     {
         $this->element->setLabel('Foo Bar');
         $html = $this->element->render(new Zend_View());
-        $this->assertRegexp('#<input[^>]*alt="Foo Bar"#', $html);
+        $this->assertMatchesRegularExpression('#<input[^>]*alt="Foo Bar"#', $html);
     }
 
     public function testImageValueRenderedAsElementValue()
@@ -129,7 +129,7 @@ public function testImageValueRenderedAsElementValue()
         $this->element->setImageValue('foo')
             ->setImage('foo.gif');
         $html = $this->element->render(new Zend_View());
-        $this->assertRegexp('#<input[^>]*value="foo"#', $html, $html);
+        $this->assertMatchesRegularExpression('#<input[^>]*value="foo"#', $html, $html);
     }
 
     public function testIsCheckedReturnsSetValueMatchesImageValue()
diff --git a/tests/Zend/Form/Element/MultiCheckboxTest.php b/tests/Zend/Form/Element/MultiCheckboxTest.php
index 2b4f8a07..bbb09335 100644
--- a/tests/Zend/Form/Element/MultiCheckboxTest.php
+++ b/tests/Zend/Form/Element/MultiCheckboxTest.php
@@ -112,13 +112,13 @@ public function testCanDisableIndividualMultiCheckboxOptions()
             if (!preg_match('/(<input[^>]*?(value="' . $test . '")[^>]*>)/', $html, $m)) {
                 $this->fail('Unable to find matching disabled option for ' . $test);
             }
-            $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $m[1]);
+            $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $m[1]);
         }
         foreach (['foo', 'bar', 'bat'] as $test) {
             if (!preg_match('/(<input[^>]*?(value="' . $test . '")[^>]*>)/', $html, $m)) {
                 $this->fail('Unable to find matching option for ' . $test);
             }
-            $this->assertNotRegexp('/<input[^>]*?(disabled="disabled")/', $m[1], var_export($m, 1));
+            $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(disabled="disabled")/', $m[1], var_export($m, 1));
         }
     }
 
@@ -133,7 +133,7 @@ public function testSpecifiedSeparatorIsUsedWhenRendering()
         ])
             ->setSeparator('--FooBarFunSep--');
         $html = $this->element->render($this->getView());
-        $this->assertContains($this->element->getSeparator(), $html);
+        $this->assertStringContainsString($this->element->getSeparator(), $html);
         $count = substr_count($html, $this->element->getSeparator());
         $this->assertEquals(4, $count);
     }
@@ -183,7 +183,7 @@ public function testCanPopulateCheckboxOptionsFromPostedData()
             if (!preg_match('#(<input[^>]*' . $key . '[^>]*>)#', $html, $m)) {
                 $this->fail('Missing input for a given multi option: ' . $html);
             }
-            $this->assertContains('checked="checked"', $m[1]);
+            $this->assertStringContainsString('checked="checked"', $m[1]);
         }
     }
 
diff --git a/tests/Zend/Form/Element/MultiselectTest.php b/tests/Zend/Form/Element/MultiselectTest.php
index 0efebf54..3d5eb0b4 100644
--- a/tests/Zend/Form/Element/MultiselectTest.php
+++ b/tests/Zend/Form/Element/MultiselectTest.php
@@ -199,7 +199,7 @@ public function testOptionsAreRenderedInFinalMarkup()
         $this->element->addMultiOptions($options);
         $html = $this->element->render($this->getView());
         foreach ($options as $value => $label) {
-            $this->assertRegexp('/<option.*value="' . $value . '"[^>]*>' . $label . '/s', $html, $html);
+            $this->assertMatchesRegularExpression('/<option.*value="' . $value . '"[^>]*>' . $label . '/s', $html, $html);
         }
     }
 
@@ -224,7 +224,7 @@ public function testTranslatedOptionsAreRenderedInFinalMarkupWhenTranslatorPrese
         $html = $this->element->render($this->getView());
         foreach ($options as $value => $label) {
             $this->assertStringNotContainsString($label, $html, $html);
-            $this->assertRegexp('/<option.*value="' . $value . '"[^>]*>' . $translations[$label] . '/s', $html, $html);
+            $this->assertMatchesRegularExpression('/<option.*value="' . $value . '"[^>]*>' . $translations[$label] . '/s', $html, $html);
         }
     }
 
diff --git a/tests/Zend/Form/Element/PasswordTest.php b/tests/Zend/Form/Element/PasswordTest.php
index a7ca0fa2..5819cebd 100644
--- a/tests/Zend/Form/Element/PasswordTest.php
+++ b/tests/Zend/Form/Element/PasswordTest.php
@@ -90,8 +90,8 @@ public function testPasswordValueMaskedByGetMessages()
         $expect = '*******';
         $this->assertFalse($this->element->isValid($value));
         foreach ($this->element->getMessages() as $message) {
-            $this->assertNotContains($value, $message);
-            $this->assertContains($expect, $message, $message);
+            $this->assertStringNotContainsString($value, $message);
+            $this->assertStringContainsString($expect, $message, $message);
         }
     }
 
diff --git a/tests/Zend/Form/Element/RadioTest.php b/tests/Zend/Form/Element/RadioTest.php
index 0431b225..c6f35473 100644
--- a/tests/Zend/Form/Element/RadioTest.php
+++ b/tests/Zend/Form/Element/RadioTest.php
@@ -112,13 +112,13 @@ public function testCanDisableIndividualRadioOptions()
             if (!preg_match('/(<input[^>]*?(value="' . $test . '")[^>]*>)/', $html, $m)) {
                 $this->fail('Unable to find matching disabled option for ' . $test);
             }
-            $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $m[1]);
+            $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $m[1]);
         }
         foreach (['foo', 'bar', 'bat'] as $test) {
             if (!preg_match('/(<input[^>]*?(value="' . $test . '")[^>]*>)/', $html, $m)) {
                 $this->fail('Unable to find matching option for ' . $test);
             }
-            $this->assertNotRegexp('/<input[^>]*?(disabled="disabled")/', $m[1], var_export($m, 1));
+            $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(disabled="disabled")/', $m[1], var_export($m, 1));
         }
     }
 
@@ -133,7 +133,7 @@ public function testSpecifiedSeparatorIsUsedWhenRendering()
         ])
             ->setSeparator('--FooBarFunSep--');
         $html = $this->element->render($this->getView());
-        $this->assertContains($this->element->getSeparator(), $html);
+        $this->assertStringContainsString($this->element->getSeparator(), $html);
         $count = substr_count($html, $this->element->getSeparator());
         $this->assertEquals(4, $count);
     }
@@ -148,7 +148,7 @@ public function testRadioElementRendersDtDdWrapper()
             'test' => 'Test',
         ]);
         $html = $this->element->render($this->getView());
-        $this->assertRegexp('#<dt[^>]*>&\#160;</dt>.*?<dd#s', $html, $html);
+        $this->assertMatchesRegularExpression('#<dt[^>]*>&\#160;</dt>.*?<dd#s', $html, $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/SelectTest.php b/tests/Zend/Form/Element/SelectTest.php
index bb7a4c6b..41350ef6 100644
--- a/tests/Zend/Form/Element/SelectTest.php
+++ b/tests/Zend/Form/Element/SelectTest.php
@@ -99,18 +99,18 @@ public function testCanDisableIndividualSelectOptions()
         ])
             ->setAttrib('disable', ['baz', 'test']);
         $html = $this->element->render($this->getView());
-        $this->assertNotRegexp('/<select[^>]*?(disabled="disabled")/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?(disabled="disabled")/', $html, $html);
         foreach (['baz', 'test'] as $test) {
             if (!preg_match('/(<option[^>]*?(value="' . $test . '")[^>]*>)/', $html, $m)) {
                 $this->fail('Unable to find matching disabled option for ' . $test);
             }
-            $this->assertRegexp('/<option[^>]*?(disabled="disabled")/', $m[1]);
+            $this->assertMatchesRegularExpression('/<option[^>]*?(disabled="disabled")/', $m[1]);
         }
         foreach (['foo', 'bat'] as $test) {
             if (!preg_match('/(<option[^>]*?(value="' . $test . '")[^>]*>)/', $html, $m)) {
                 $this->fail('Unable to find matching option for ' . $test);
             }
-            $this->assertNotRegexp('/<option[^>]*?(disabled="disabled")/', $m[1], var_export($m, 1));
+            $this->assertDoesNotMatchRegularExpression('/<option[^>]*?(disabled="disabled")/', $m[1], var_export($m, 1));
         }
     }
 
@@ -158,7 +158,7 @@ public function testUsingZeroAsValueShouldSelectAppropriateOption()
         if (!preg_match('#(<option[^>]*(?:value="somewhat")[^>]*>)#s', $html, $matches)) {
             $this->fail('Could not find option: ' . $html);
         }
-        $this->assertNotContains('selected', $matches[1]);
+        $this->assertStringNotContainsString('selected', $matches[1]);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/SubmitTest.php b/tests/Zend/Form/Element/SubmitTest.php
index f3e7c2f2..d585ca8f 100644
--- a/tests/Zend/Form/Element/SubmitTest.php
+++ b/tests/Zend/Form/Element/SubmitTest.php
@@ -114,7 +114,7 @@ public function testTranslatedLabelIsRendered()
         $decorator = $this->element->getDecorator('ViewHelper');
         $decorator->setElement($this->element);
         $html = $decorator->render('');
-        $this->assertRegexp('/<(input|button)[^>]*?value="Submit Button"/', $html);
+        $this->assertMatchesRegularExpression('/<(input|button)[^>]*?value="Submit Button"/', $html);
     }
 
     public function testConstructorSetsLabelToNameIfNoLabelProvided()
diff --git a/tests/Zend/Form/ElementTest.php b/tests/Zend/Form/ElementTest.php
index f3823172..fd114228 100644
--- a/tests/Zend/Form/ElementTest.php
+++ b/tests/Zend/Form/ElementTest.php
@@ -211,7 +211,7 @@ public function testGetValueFiltersValue()
 
     public function checkFilterValues($item, $key)
     {
-        $this->assertRegexp('/^[A-Z]+$/', $item);
+        $this->assertMatchesRegularExpression('/^[A-Z]+$/', $item);
     }
 
     public function testRetrievingArrayValueFiltersAllArrayValues()
@@ -1417,7 +1417,7 @@ public function testAddingConcreteDecoratorShouldHonorOrder()
                 $decorator,
             ]);
         $html = $this->element->render($this->getView());
-        $this->assertRegexp('#<tr><td>Foo</td><td>.*?<input[^>]+>.*?</td><td>sample description</td></tr>#s', $html, $html);
+        $this->assertMatchesRegularExpression('#<tr><td>Foo</td><td>.*?<input[^>]+>.*?</td><td>sample description</td></tr>#s', $html, $html);
     }
 
     public function testCanRetrieveSingleDecoratorRegisteredAsDecoratorObjectUsingShortName()
@@ -1600,7 +1600,7 @@ public function testRenderElementRendersErrorsWhenProvided()
         $this->assertTrue(is_string($html));
         $this->assertFalse(empty($html));
         $this->assertStringContainsString('error', $html);
-        $this->assertRegexp('/empty/i', $html);
+        $this->assertMatchesRegularExpression('/empty/i', $html);
     }
 
     public function testToStringProxiesToRender()
@@ -1988,13 +1988,13 @@ public function testElementShouldOverloadToRenderDecorators()
         $html = $this->element->renderViewHelper();
         $this->assertStringContainsString('<input', $html);
         $this->assertStringContainsString('id="' . $this->element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
-        $this->assertNotContains('<dd', $html);
-        $this->assertNotContains('<label', $html);
+        $this->assertStringNotContainsString('<dd', $html);
+        $this->assertStringNotContainsString('<label', $html);
 
         $html = $this->element->renderLabel('this is the content');
-        $this->assertRegexp('#<label[^>]*for="' . $this->element->getFullyQualifiedName() . '"[^>]*>Foo Label</label>#', $html);
+        $this->assertMatchesRegularExpression('#<label[^>]*for="' . $this->element->getFullyQualifiedName() . '"[^>]*>Foo Label</label>#', $html);
         $this->assertStringContainsString('this is the content', $html);
-        $this->assertNotContains('<input', $html);
+        $this->assertStringNotContainsString('<input', $html);
     }
 
     /**
diff --git a/tests/Zend/Form/FormTest.php b/tests/Zend/Form/FormTest.php
index 7112e28a..a78aec69 100644
--- a/tests/Zend/Form/FormTest.php
+++ b/tests/Zend/Form/FormTest.php
@@ -295,7 +295,7 @@ public function testSetOptionsSetsGlobalPrefixPaths()
             $paths = $loader->getPaths('Zend_Foo_' . ucfirst($type));
             $this->assertTrue(is_array($paths), "Failed for type $type: " . var_export($paths, 1));
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
         }
     }
 
@@ -311,7 +311,7 @@ public function testSetOptionsSetsIndividualPrefixPathsFromKeyedArrays()
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
         $this->assertFalse(empty($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testSetOptionsSetsIndividualPrefixPathsFromUnKeyedArrays()
@@ -326,7 +326,7 @@ public function testSetOptionsSetsIndividualPrefixPathsFromUnKeyedArrays()
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
         $this->assertFalse(empty($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testSetOptionsSetsDisplayGroups()
@@ -655,8 +655,8 @@ public function testGetPluginLoaderRetrievesDefaultDecoratorPluginLoader()
         $paths = $loader->getPaths('Zend_Form_Decorator');
         $this->assertTrue(is_array($paths), var_export($loader, 1));
         $this->assertTrue(0 < (is_countable($paths) ? count($paths) : 0));
-        $this->assertContains('Form', $paths[0]);
-        $this->assertContains('Decorator', $paths[0]);
+        $this->assertStringContainsString('Form', $paths[0]);
+        $this->assertStringContainsString('Decorator', $paths[0]);
     }
 
     public function testPassingInvalidTypeToSetPluginLoaderThrowsException()
@@ -705,7 +705,7 @@ public function testCanAddDecoratorPluginLoaderPrefixPath()
         $this->form->addPrefixPath('Zend_Foo', 'Zend/Foo/', 'decorator');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testUpdatedDecoratorPrefixPathUsedForNewElements()
@@ -717,14 +717,14 @@ public function testUpdatedDecoratorPrefixPathUsedForNewElements()
         $loader = $foo->getPluginLoader('decorator');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
 
         $this->form->addElement('text', 'bar');
         $bar = $this->form->bar;
         $loader = $bar->getPluginLoader('decorator');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testUpdatedDecoratorPrefixPathUsedForNewDisplayGroups()
@@ -736,7 +736,7 @@ public function testUpdatedDecoratorPrefixPathUsedForNewDisplayGroups()
         $loader = $foo->getPluginLoader('decorator');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testUpdatedPrefixPathUsedForNewSubForms()
@@ -747,7 +747,7 @@ public function testUpdatedPrefixPathUsedForNewSubForms()
         $loader = $this->form->sub->getPluginLoader('decorator');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testGetPluginLoaderRetrievesDefaultElementPluginLoader()
@@ -757,8 +757,8 @@ public function testGetPluginLoaderRetrievesDefaultElementPluginLoader()
         $paths = $loader->getPaths(\Zend_Form_Element::class);
         $this->assertTrue(is_array($paths), var_export($loader, 1));
         $this->assertTrue(0 < (is_countable($paths) ? count($paths) : 0));
-        $this->assertContains('Form', $paths[0]);
-        $this->assertContains('Element', $paths[0]);
+        $this->assertStringContainsString('Form', $paths[0]);
+        $this->assertStringContainsString('Element', $paths[0]);
     }
 
     public function testCanSetCustomDecoratorElementLoader()
@@ -775,7 +775,7 @@ public function testCanAddElementPluginLoaderPrefixPath()
         $this->form->addPrefixPath('Zend_Foo', 'Zend/Foo/', 'element');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testAddAllPluginLoaderPrefixPathsSimultaneously()
@@ -788,11 +788,11 @@ public function testAddAllPluginLoaderPrefixPathsSimultaneously()
 
         $paths = $decoratorLoader->getPaths('Zend_Decorator');
         $this->assertTrue(is_array($paths), var_export($paths, 1));
-        $this->assertContains('Decorator', $paths[0]);
+        $this->assertStringContainsString('Decorator', $paths[0]);
 
         $paths = $elementLoader->getPaths('Zend_Element');
         $this->assertTrue(is_array($paths), var_export($paths, 1));
-        $this->assertContains('Element', $paths[0]);
+        $this->assertStringContainsString('Element', $paths[0]);
     }
 
     // Elements:
@@ -1110,7 +1110,7 @@ public function testUseIdForDdTagByDefault()
             ->bar->addElement('text', 'foo');
 
         $html = $this->form->setView($this->getView())->render();
-        $this->assertRegexp('/<dd.*?bar-foo.*?>/', $html);
+        $this->assertMatchesRegularExpression('/<dd.*?bar-foo.*?>/', $html);
     }
 
     public function testUseIdForDtTagByDefault()
@@ -1119,7 +1119,7 @@ public function testUseIdForDtTagByDefault()
             ->bar->addElement('text', 'foo');
 
         $html = $this->form->setView($this->getView())->render();
-        $this->assertRegexp('/<dt.*?bar-foo.*?>/', $html);
+        $this->assertMatchesRegularExpression('/<dt.*?bar-foo.*?>/', $html);
     }
 
     /**
@@ -1605,11 +1605,11 @@ public function testPopulateWithElementsBelongTo()
         $this->form->setView($this->getView())->populate($data['valid']);
         $html = $this->form->render();
 
-        $this->assertRegexp('/value=.foo Value./', $html);
-        $this->assertRegexp('/value=.baz Value./', $html);
-        $this->assertRegexp('/value=.quo Value./', $html);
-        $this->assertRegexp('/value=.zoo Value./', $html);
-        $this->assertRegexp('/value=.iek Value./', $html);
+        $this->assertMatchesRegularExpression('/value=.foo Value./', $html);
+        $this->assertMatchesRegularExpression('/value=.baz Value./', $html);
+        $this->assertMatchesRegularExpression('/value=.quo Value./', $html);
+        $this->assertMatchesRegularExpression('/value=.zoo Value./', $html);
+        $this->assertMatchesRegularExpression('/value=.iek Value./', $html);
     }
 
     public function testGetValidValuesWithElementsBelongTo()
@@ -3071,11 +3071,11 @@ public function testRetrievingNamedDecoratorShouldNotReorderDecorators()
     public function checkMarkup($html)
     {
         $this->assertFalse(empty($html));
-        $this->assertContains('<form', $html);
-        $this->assertRegexp('/<form[^>]+action="' . $this->form->getAction() . '"/', $html);
-        $this->assertRegexp('/<form[^>]+method="' . $this->form->getMethod() . '"/i', $html);
-        $this->assertRegexp('#<form[^>]+enctype="application/x-www-form-urlencoded"#', $html);
-        $this->assertContains('</form>', $html);
+        $this->assertStringContainsString('<form', $html);
+        $this->assertMatchesRegularExpression('/<form[^>]+action="' . $this->form->getAction() . '"/', $html);
+        $this->assertMatchesRegularExpression('/<form[^>]+method="' . $this->form->getMethod() . '"/i', $html);
+        $this->assertMatchesRegularExpression('#<form[^>]+enctype="application/x-www-form-urlencoded"#', $html);
+        $this->assertStringContainsString('</form>', $html);
     }
 
     public function testRenderReturnsMarkup()
@@ -3093,7 +3093,7 @@ public function testRenderReturnsMarkupRepresentingAllElements()
             $this->assertFalse(empty($key));
             $this->assertFalse(is_numeric($key));
             $this->assertStringContainsString('<input', $html);
-            $this->assertRegexp('/<input type="text" name="' . $key . '"/', $html);
+            $this->assertMatchesRegularExpression('/<input type="text" name="' . $key . '"/', $html);
         }
     }
 
@@ -3103,14 +3103,14 @@ public function testRenderReturnsMarkupContainingSubForms()
         $this->setupSubForm();
         $this->form->setView($this->getView());
         $html = $this->form->render();
-        $this->assertRegexp('/<fieldset/', $html);
+        $this->assertMatchesRegularExpression('/<fieldset/', $html);
         $this->assertStringContainsString('</fieldset>', $html);
         foreach ($this->form->sub as $key => $item) {
             $this->assertFalse(empty($key));
             $this->assertFalse(is_numeric($key));
             $this->assertStringContainsString('<input', $html);
             $pattern = '/<input type="text" name="sub\[' . $key . '\]"/';
-            $this->assertRegexp($pattern, $html, 'Pattern: ' . $pattern . "\nHTML:\n" . $html);
+            $this->assertMatchesRegularExpression($pattern, $html, 'Pattern: ' . $pattern . "\nHTML:\n" . $html);
         }
     }
 
@@ -3120,9 +3120,9 @@ public function testRenderReturnsMarkupContainingDisplayGroups()
         $this->form->addDisplayGroup(['foo', 'baz'], 'foobaz', ['legend' => 'Display Group']);
         $this->form->setView($this->getView());
         $html = $this->html = $this->form->render();
-        $this->assertRegexp('/<fieldset/', $html);
+        $this->assertMatchesRegularExpression('/<fieldset/', $html);
         $this->assertStringContainsString('</fieldset>', $html);
-        $this->assertRegexp('#<legend>Display Group</legend>#', $html, $html);
+        $this->assertMatchesRegularExpression('#<legend>Display Group</legend>#', $html, $html);
         $dom = new DOMDocument();
         $dom->loadHTML($html);
         $fieldsets = $dom->getElementsByTagName('fieldset');
@@ -3253,7 +3253,7 @@ public function testToStringRaisesErrorWhenExceptionCaught()
 
         $this->assertTrue(empty($text));
         $this->assertTrue(isset($this->error));
-        $this->assertContains('Raising exception in decorator callback', $this->error);
+        $this->assertStringContainsString('Raising exception in decorator callback', $this->error);
     }
 
     /**
@@ -3592,7 +3592,7 @@ public function testSettingElementDecoratorsWithConcreteDecoratorShouldHonorOrde
             $decorator,
         ]);
         $html = $this->form->render($this->getView());
-        $this->assertRegexp('#<tr><td>Foo</td><td>.*?<input[^>]+>.*?</td><td>sample description</td></tr>#s', $html, $html);
+        $this->assertMatchesRegularExpression('#<tr><td>Foo</td><td>.*?<input[^>]+>.*?</td><td>sample description</td></tr>#s', $html, $html);
     }
 
     /**
@@ -3697,18 +3697,18 @@ public function testCanSetGlobalElementPrefixPath()
             $loader = $element->getPluginLoader('validate');
             $paths = $loader->getPaths('Zend_Foo_Validate');
             $this->assertFalse(empty($paths), $element->getName() . ':' . var_export($loader->getPaths(), 1));
-            $this->assertContains('Foo', $paths[0]);
-            $this->assertContains('Validate', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
+            $this->assertStringContainsString('Validate', $paths[0]);
 
             $paths = $element->getPluginLoader('filter')->getPaths('Zend_Foo_Filter');
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
-            $this->assertContains('Filter', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
+            $this->assertStringContainsString('Filter', $paths[0]);
 
             $paths = $element->getPluginLoader('decorator')->getPaths('Zend_Foo_Decorator');
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
-            $this->assertContains('Decorator', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
+            $this->assertStringContainsString('Decorator', $paths[0]);
         }
     }
 
@@ -3735,8 +3735,8 @@ public function testSettingElementPrefixPathPropagatesToAttachedSubForms()
         $loader = $this->form->subForm->foo->getPluginLoader('decorator');
         $paths = $loader->getPaths('Zend_Foo_Decorator');
         $this->assertFalse(empty($paths));
-        $this->assertContains('Foo', $paths[0]);
-        $this->assertContains('Decorator', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
+        $this->assertStringContainsString('Decorator', $paths[0]);
     }
 
     public function testCanSetElementValidatorPrefixPath()
@@ -3748,8 +3748,8 @@ public function testCanSetElementValidatorPrefixPath()
             $loader = $element->getPluginLoader('validate');
             $paths = $loader->getPaths('Zend_Foo');
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
-            $this->assertNotContains('Validate', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
+            $this->assertStringNotContainsString('Validate', $paths[0]);
         }
     }
 
@@ -3762,8 +3762,8 @@ public function testCanSetElementFilterPrefixPath()
             $loader = $element->getPluginLoader('filter');
             $paths = $loader->getPaths('Zend_Foo');
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
-            $this->assertNotContains('Filter', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
+            $this->assertStringNotContainsString('Filter', $paths[0]);
         }
     }
 
@@ -3776,8 +3776,8 @@ public function testCanSetElementDecoratorPrefixPath()
             $loader = $element->getPluginLoader('decorator');
             $paths = $loader->getPaths('Zend_Foo');
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
-            $this->assertNotContains('Decorator', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
+            $this->assertStringNotContainsString('Decorator', $paths[0]);
         }
     }
 
@@ -3824,7 +3824,7 @@ public function testCanSetDisplayGroupPrefixPath()
             $loader = $group->getPluginLoader();
             $paths = $loader->getPaths('Zend_Foo');
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
         }
     }
 
@@ -3953,15 +3953,15 @@ public function testFormShouldOverloadToRenderDecorators()
         $this->form->setView($this->getView());
         $html = $this->form->renderFormElements();
         foreach ($this->form->getElements() as $element) {
-            $this->assertContains('id="' . $element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
+            $this->assertStringContainsString('id="' . $element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
         }
-        $this->assertNotContains('<dl', $html);
-        $this->assertNotContains('<form', $html);
+        $this->assertStringNotContainsString('<dl', $html);
+        $this->assertStringNotContainsString('<form', $html);
 
         $html = $this->form->renderForm('this is the content');
-        $this->assertContains('<form', $html);
-        $this->assertContains('</form>', $html);
-        $this->assertContains('this is the content', $html);
+        $this->assertStringContainsString('<form', $html);
+        $this->assertStringContainsString('</form>', $html);
+        $this->assertStringContainsString('this is the content', $html);
     }
 
     /**
@@ -4033,7 +4033,7 @@ public function testEnctypeDefaultsToMultipartWhenFileElementIsAttachedToForm()
 
         $html = $this->form->render($this->getView());
         $this->assertFalse(empty($html));
-        $this->assertRegexp('#<form[^>]+enctype="multipart/form-data"#', $html);
+        $this->assertMatchesRegularExpression('#<form[^>]+enctype="multipart/form-data"#', $html);
     }
 
     /**
@@ -4049,7 +4049,7 @@ public function testEnctypeDefaultsToMultipartWhenFileElementIsAttachedToSubForm
 
         $this->assertStringContainsString('id="txt"', $html);
         $this->assertStringContainsString('name="txt"', $html);
-        $this->assertRegexp('#<form[^>]+enctype="multipart/form-data"#', $html, $html);
+        $this->assertMatchesRegularExpression('#<form[^>]+enctype="multipart/form-data"#', $html, $html);
     }
 
     /**
@@ -4064,7 +4064,7 @@ public function testEnctypeDefaultsToMultipartWhenFileElementIsAttachedToDisplay
 
         $this->assertStringContainsString('id="txt"', $html);
         $this->assertStringContainsString('name="txt"', $html);
-        $this->assertRegexp('#<form[^>]+enctype="multipart/form-data"#', $html, $html);
+        $this->assertMatchesRegularExpression('#<form[^>]+enctype="multipart/form-data"#', $html, $html);
     }
 
     /**
@@ -4667,7 +4667,7 @@ public function testAddingPrefixPathsWithBackslashWillLoadNamespacedPlugins()
             $paths = $loader->getPaths('Zf\Foo\\' . ucfirst($type));
             $this->assertTrue(is_array($paths), "Failed for type $type: " . var_export($paths, 1));
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
         }
     }
 
diff --git a/tests/Zend/Layout/LayoutTest.php b/tests/Zend/Layout/LayoutTest.php
index 08eb939b..94db5779 100644
--- a/tests/Zend/Layout/LayoutTest.php
+++ b/tests/Zend/Layout/LayoutTest.php
@@ -300,8 +300,8 @@ public function testRenderWithNoInflection()
             ->setView($view);
         $layout->message = 'Rendered layout';
         $received = $layout->render();
-        $this->assertContains('Testing layouts:', $received);
-        $this->assertContains($layout->message, $received);
+        $this->assertStringContainsString('Testing layouts:', $received);
+        $this->assertStringContainsString($layout->message, $received);
     }
 
     public function testRenderWithDefaultInflection()
@@ -312,8 +312,8 @@ public function testRenderWithDefaultInflection()
             ->setView($view);
         $layout->message = 'Rendered layout';
         $received = $layout->render();
-        $this->assertContains('Testing layouts:', $received);
-        $this->assertContains($layout->message, $received);
+        $this->assertStringContainsString('Testing layouts:', $received);
+        $this->assertStringContainsString($layout->message, $received);
     }
 
     public function testRenderWithCustomInflection()
@@ -327,8 +327,8 @@ public function testRenderWithCustomInflection()
             ->setStaticRule('suffix', 'php');
         $layout->message = 'Rendered layout';
         $received = $layout->render();
-        $this->assertContains('Testing layouts with custom inflection:', $received);
-        $this->assertContains($layout->message, $received);
+        $this->assertStringContainsString('Testing layouts with custom inflection:', $received);
+        $this->assertStringContainsString($layout->message, $received);
     }
 
     public function testGetMvcInstanceReturnsNullWhenStartMvcHasNotBeenCalled()
diff --git a/tests/Zend/Loader/Autoloader/ResourceTest.php b/tests/Zend/Loader/Autoloader/ResourceTest.php
index 5365e9bb..22e38dbb 100644
--- a/tests/Zend/Loader/Autoloader/ResourceTest.php
+++ b/tests/Zend/Loader/Autoloader/ResourceTest.php
@@ -152,7 +152,7 @@ public function testAutoloaderShouldAllowAddingArbitraryResourceTypes()
         $resources = $this->loader->getResourceTypes();
         $this->assertTrue(array_key_exists('models', $resources));
         $this->assertEquals($this->loader->getNamespace() . '_Model', $resources['models']['namespace']);
-        $this->assertContains('/models', $resources['models']['path']);
+        $this->assertStringContainsString('/models', $resources['models']['path']);
     }
 
     public function testAutoloaderShouldAllowAddingResettingResourcePaths()
@@ -160,8 +160,8 @@ public function testAutoloaderShouldAllowAddingResettingResourcePaths()
         $this->loader->addResourceType('models', 'models', 'Model');
         $this->loader->addResourceType('models', 'apis');
         $resources = $this->loader->getResourceTypes();
-        $this->assertNotContains('/models', $resources['models']['path']);
-        $this->assertContains('/apis', $resources['models']['path']);
+        $this->assertStringNotContainsString('/models', $resources['models']['path']);
+        $this->assertStringContainsString('/apis', $resources['models']['path']);
     }
 
     public function testAutoloaderShouldSupportAddingMultipleResourceTypesAtOnce()
diff --git a/tests/Zend/Loader/AutoloaderMultiVersionTest.php b/tests/Zend/Loader/AutoloaderMultiVersionTest.php
index 3ffd1a66..a822a3bd 100644
--- a/tests/Zend/Loader/AutoloaderMultiVersionTest.php
+++ b/tests/Zend/Loader/AutoloaderMultiVersionTest.php
@@ -106,84 +106,84 @@ public function testAutoloadLatestUsesLatestVersion()
     {
         $this->autoloader->setZfPath($this->path, 'latest');
         $actual = $this->autoloader->getZfPath();
-        $this->assertContains($this->latest, $actual);
+        $this->assertStringContainsString($this->latest, $actual);
     }
 
     public function testAutoloadLatestIncludesLibraryInPath()
     {
         $this->autoloader->setZfPath($this->path, 'latest');
         $actual = $this->autoloader->getZfPath();
-        $this->assertRegexp('#' . preg_quote($this->latest) . '[^/\\\]*/library#', $actual);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->latest) . '[^/\\\]*/library#', $actual);
     }
 
     public function testAutoloadLatestAddsPathToIncludePath()
     {
         $this->autoloader->setZfPath($this->path, 'latest');
         $incPath = get_include_path();
-        $this->assertRegexp('#' . preg_quote($this->latest) . '[^/\\\]*/library#', $incPath);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->latest) . '[^/\\\]*/library#', $incPath);
     }
 
     public function testAutoloadMajorRevisionShouldUseLatestFromMajorRevision()
     {
         $this->autoloader->setZfPath($this->path, $this->_getVersion($this->latestMajor, 'major'));
         $actual = $this->autoloader->getZfPath();
-        $this->assertContains($this->latestMajor, $actual);
+        $this->assertStringContainsString($this->latestMajor, $actual);
     }
 
     public function testAutoloadMajorRevisionIncludesLibraryInPath()
     {
         $this->autoloader->setZfPath($this->path, $this->_getVersion($this->latestMajor, 'major'));
         $actual = $this->autoloader->getZfPath();
-        $this->assertRegexp('#' . preg_quote($this->latestMajor) . '[^/\\\]*/library#', $actual);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->latestMajor) . '[^/\\\]*/library#', $actual);
     }
 
     public function testAutoloadMajorRevisionAddsPathToIncludePath()
     {
         $this->autoloader->setZfPath($this->path, $this->_getVersion($this->latestMajor, 'major'));
         $incPath = get_include_path();
-        $this->assertRegexp('#' . preg_quote($this->latestMajor) . '[^/\\\]*/library#', $incPath);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->latestMajor) . '[^/\\\]*/library#', $incPath);
     }
 
     public function testAutoloadMinorRevisionShouldUseLatestFromMinorRevision()
     {
         $this->autoloader->setZfPath($this->path, $this->_getVersion($this->latestMinor, 'minor'));
         $actual = $this->autoloader->getZfPath();
-        $this->assertContains($this->latestMinor, $actual);
+        $this->assertStringContainsString($this->latestMinor, $actual);
     }
 
     public function testAutoloadMinorRevisionIncludesLibraryInPath()
     {
         $this->autoloader->setZfPath($this->path, $this->_getVersion($this->latestMinor, 'minor'));
         $actual = $this->autoloader->getZfPath();
-        $this->assertRegexp('#' . preg_quote($this->latestMinor) . '[^/\\\]*/library#', $actual);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->latestMinor) . '[^/\\\]*/library#', $actual);
     }
 
     public function testAutoloadMinorRevisionAddsPathToIncludePath()
     {
         $this->autoloader->setZfPath($this->path, $this->_getVersion($this->latestMinor, 'minor'));
         $incPath = get_include_path();
-        $this->assertRegexp('#' . preg_quote($this->latestMinor) . '[^/\\\]*/library#', $incPath);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->latestMinor) . '[^/\\\]*/library#', $incPath);
     }
 
     public function testAutoloadSpecificRevisionShouldUseThatVersion()
     {
         $this->autoloader->setZfPath($this->path, $this->specific);
         $actual = $this->autoloader->getZfPath();
-        $this->assertContains($this->specific, $actual);
+        $this->assertStringContainsString($this->specific, $actual);
     }
 
     public function testAutoloadSpecificRevisionIncludesLibraryInPath()
     {
         $this->autoloader->setZfPath($this->path, $this->specific);
         $actual = $this->autoloader->getZfPath();
-        $this->assertRegexp('#' . preg_quote($this->specific) . '[^/\\\]*/library#', $actual);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->specific) . '[^/\\\]*/library#', $actual);
     }
 
     public function testAutoloadSpecificRevisionAddsPathToIncludePath()
     {
         $this->autoloader->setZfPath($this->path, $this->specific);
         $incPath = get_include_path();
-        $this->assertRegexp('#' . preg_quote($this->specific) . '[^/\\\]*/library#', $incPath);
+        $this->assertMatchesRegularExpression('#' . preg_quote($this->specific) . '[^/\\\]*/library#', $incPath);
     }
 
     protected function _getVersion($version, $type)
diff --git a/tests/Zend/Loader/StandardAutoloaderTest.php b/tests/Zend/Loader/StandardAutoloaderTest.php
index b368e6ee..77d10e96 100644
--- a/tests/Zend/Loader/StandardAutoloaderTest.php
+++ b/tests/Zend/Loader/StandardAutoloaderTest.php
@@ -190,17 +190,15 @@ public function testAutoloadsNamespacedClassesWithUnderscores()
 
     public function testZendFrameworkPrefixIsNotLoadedByDefault()
     {
-        $loader = new Zend_Loader_StandardAutoloader();
+        $loader = new Zend_Loader_TestAsset_StandardAutoloader();
         $expected = [];
-        $this->assertAttributeEquals($expected, 'prefixes', $loader);
+        $this->assertSame($expected, $loader->getPrefixes());
     }
 
     public function testCanTellAutoloaderToRegisterZfPrefixAtInstantiation()
     {
-        $loader = new Zend_Loader_StandardAutoloader(['autoregister_zf' => true]);
-        $r = new ReflectionClass($loader);
-        $file = $r->getFileName();
-        $expected = ['Zend_' => dirname($file, 2) . DIRECTORY_SEPARATOR];
-        $this->assertAttributeEquals($expected, 'prefixes', $loader);
+        $loader = new Zend_Loader_TestAsset_StandardAutoloader(['autoregister_zf' => true]);
+        $expected = ['Zend_' => dirname(__DIR__, 3) . '/library/Zend/'];
+        $this->assertSame($expected, $loader->getPrefixes());
     }
 }
diff --git a/tests/Zend/LoaderTest.php b/tests/Zend/LoaderTest.php
index 894bf323..12c799fe 100644
--- a/tests/Zend/LoaderTest.php
+++ b/tests/Zend/LoaderTest.php
@@ -145,7 +145,7 @@ public function testLoaderClassNonexistent()
             Zend_Loader::loadClass('ClassNonexistent', $dir);
             $this->fail('Zend_Exception was expected but never thrown.');
         } catch (Zend_Exception $e) {
-            $this->assertRegExp('/file(.*)does not exist or class(.*)not found/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/file(.*)does not exist or class(.*)not found/i', $e->getMessage());
         }
     }
 
@@ -203,7 +203,7 @@ public function testLoaderClassIllegalFilename()
             Zend_Loader::loadClass('/path/:to/@danger');
             $this->fail('Zend_Exception was expected but never thrown.');
         } catch (Zend_Exception $e) {
-            $this->assertRegExp('/security(.*)filename/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/security(.*)filename/i', $e->getMessage());
         }
     }
 
@@ -253,10 +253,10 @@ public function testLoaderAutoloadLoadsValidClasses()
     {
         $this->setErrorHandler();
         $this->assertEquals(\Zend_Application_Exception::class, Zend_Loader::autoload(\Zend_Application_Exception::class));
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
         $this->error = null;
         $this->assertEquals(\Zend_Acl_Assert_Interface::class, Zend_Loader::autoload(\Zend_Acl_Assert_Interface::class));
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
     }
 
     /**
@@ -266,7 +266,7 @@ public function testLoaderAutoloadFailsOnInvalidClasses()
     {
         $this->setErrorHandler();
         $this->assertFalse(Zend_Loader::autoload('Zend_FooBar_Magic_Abstract'));
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
     }
 
     public function testLoaderRegisterAutoloadRegisters()
@@ -277,7 +277,7 @@ public function testLoaderRegisterAutoloadRegisters()
 
         $this->setErrorHandler();
         Zend_Loader::registerAutoload();
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
 
         $autoloaders = spl_autoload_functions();
         $found = false;
@@ -303,7 +303,7 @@ public function testLoaderRegisterAutoloadExtendedClassNeedsAutoloadMethod()
 
         $this->setErrorHandler();
         Zend_Loader::registerAutoload('Zend_Loader_MyLoader');
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
 
         $autoloaders = spl_autoload_functions();
         $expected = ['Zend_Loader_MyLoader', 'autoload'];
@@ -329,7 +329,7 @@ public function testLoaderRegisterAutoloadExtendedClassWithAutoloadMethod()
 
         $this->setErrorHandler();
         Zend_Loader::registerAutoload('Zend_Loader_MyOverloader');
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
 
         $autoloaders = spl_autoload_functions();
         $found = false;
@@ -390,7 +390,7 @@ public function testLoaderRegisterAutoloadInvalidClass()
             $this->fail('registerAutoload should fail without spl_autoload');
         } catch (Zend_Exception $e) {
             $this->assertEquals('The class "stdClass" does not have an autoload() method', $e->getMessage());
-            $this->assertContains('deprecated', $this->error);
+            $this->assertStringContainsString('deprecated', $this->error);
         }
     }
 
@@ -402,7 +402,7 @@ public function testLoaderUnregisterAutoload()
 
         $this->setErrorHandler();
         Zend_Loader::registerAutoload('Zend_Loader_MyOverloader');
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
 
         $expected = ['Zend_Loader_MyOverloader', 'autoload'];
         $autoloaders = Zend_Loader_Autoloader::getInstance()->getAutoloaders();
@@ -435,7 +435,7 @@ public function testRegisterAutoloadShouldEnableZendLoaderAutoloaderAsFallbackAu
 
         $this->setErrorHandler();
         Zend_Loader::registerAutoload();
-        $this->assertContains('deprecated', $this->error);
+        $this->assertStringContainsString('deprecated', $this->error);
 
         $autoloader = Zend_Loader_Autoloader::getInstance();
         $this->assertTrue($autoloader->isFallbackAutoloader());
diff --git a/tests/Zend/Locale/FormatTest.php b/tests/Zend/Locale/FormatTest.php
index c2b9f9e7..d7ce1102 100644
--- a/tests/Zend/Locale/FormatTest.php
+++ b/tests/Zend/Locale/FormatTest.php
@@ -314,7 +314,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('2006.13.01', ['date_format' => 'dd.MM.yy']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('2006.13.01', ['date_format' => 'dd.MM.yy', 'fix_date' => true]);
@@ -326,7 +326,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('2006.01.13', ['date_format' => 'dd.MM.yy']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('2006.01.13', ['date_format' => 'dd.MM.yy', 'fix_date' => true]);
@@ -358,7 +358,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('November 10 2006', ['date_format' => 'dd.MMM.yy', 'locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('November 10 2006', ['date_format' => 'dd.MMM.yy', 'locale' => 'de_AT', 'fix_date' => true]);
@@ -370,7 +370,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('Nov 10 2006', ['date_format' => 'dd.MMM.yy', 'locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('Nov. 10 2006', ['date_format' => 'dd.MMM.yy', 'locale' => 'de_AT', 'fix_date' => true]);
@@ -382,7 +382,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('2006 10 Nov.', ['date_format' => 'dd.MMM.yy', 'locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('2006 10 Nov.', ['date_format' => 'dd.MMM.yy', 'locale' => 'de_AT', 'fix_date' => true]);
@@ -419,7 +419,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('2006.13.01', ['locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('2006.13.01', ['locale' => 'de_AT', 'fix_date' => true]);
@@ -431,7 +431,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('2006.01.13', ['locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('2006.01.13', ['locale' => 'de_AT', 'fix_date' => true]);
@@ -463,7 +463,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('November 10 2006', ['locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('November 10 2006', ['locale' => 'de_AT', 'fix_date' => true]);
@@ -475,7 +475,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('April 10 2006', ['locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('April 10 2006', ['locale' => 'de_AT', 'fix_date' => true]);
@@ -487,7 +487,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('Nov 10 2006', ['locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('Nov. 10 2006', ['locale' => 'de_AT', 'fix_date' => true]);
@@ -499,7 +499,7 @@ public function testgetDate()
             $value = Zend_Locale_Format::getDate('Nov 10 2006', ['locale' => 'de_AT']);
             $this->fail('exception expected');
         } catch (Zend_Locale_Exception $e) {
-            $this->assertRegexp('/unable.to.parse/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/unable.to.parse/i', $e->getMessage());
             // success
         }
         $value = Zend_Locale_Format::getDate('2006 10 Nov.', ['locale' => 'de_AT', 'fix_date' => true]);
diff --git a/tests/Zend/RegistryTest.php b/tests/Zend/RegistryTest.php
index 87c05a71..dc3e0233 100644
--- a/tests/Zend/RegistryTest.php
+++ b/tests/Zend/RegistryTest.php
@@ -180,7 +180,7 @@ public function testRegistryExceptionClassNotFound()
             $registry = @Zend_Registry::setClassName('classdoesnotexist');
             $this->fail('Expected exception, because we cannot initialize the registry using a non-existent class.');
         } catch (Zend_Exception $e) {
-            $this->assertRegExp('/file .* does not exist or .*/i', $e->getMessage());
+            $this->assertMatchesRegularExpression('/file .* does not exist or .*/i', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Rest/ClientTest.php b/tests/Zend/Rest/ClientTest.php
index c0ccab38..c81e0ded 100644
--- a/tests/Zend/Rest/ClientTest.php
+++ b/tests/Zend/Rest/ClientTest.php
@@ -157,7 +157,7 @@ public function testRestGet()
 
         $response = $this->rest->restGet('/rest/');
         $this->assertTrue($response instanceof Zend_Http_Response);
-        $this->assertContains($expXml, $response->getBody());
+        $this->assertStringContainsString($expXml, $response->getBody());
     }
 
     public function testRestPost()
@@ -178,7 +178,7 @@ public function testRestPost()
         $response = $this->rest->restPost('/rest/', $reqXml);
         $this->assertTrue($response instanceof Zend_Http_Response);
         $body = $response->getBody();
-        $this->assertContains($expXml, $response->getBody());
+        $this->assertStringContainsString($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
         $this->assertStringContainsString($reqXml, $request, $request);
@@ -201,7 +201,7 @@ public function testRestPostWithArrayData()
         $response = $this->rest->restPost('/rest/', ['foo' => 'bar', 'baz' => 'bat']);
         $this->assertTrue($response instanceof Zend_Http_Response);
         $body = $response->getBody();
-        $this->assertContains($expXml, $response->getBody());
+        $this->assertStringContainsString($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
         $this->assertStringContainsString('foo=bar&baz=bat', $request, $request);
@@ -225,7 +225,7 @@ public function testRestPut()
         $response = $this->rest->restPut('/rest/', $reqXml);
         $this->assertTrue($response instanceof Zend_Http_Response);
         $body = $response->getBody();
-        $this->assertContains($expXml, $response->getBody());
+        $this->assertStringContainsString($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
         $this->assertStringContainsString($reqXml, $request, $request);
@@ -249,7 +249,7 @@ public function testRestDelete()
         $response = $this->rest->restDelete('/rest/', $reqXml);
         $this->assertTrue($response instanceof Zend_Http_Response);
         $body = $response->getBody();
-        $this->assertContains($expXml, $response->getBody());
+        $this->assertStringContainsString($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
         $this->assertStringContainsString($reqXml, $request, $request);
diff --git a/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php b/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
index 3b35f453..eb25f4cd 100644
--- a/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
+++ b/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
@@ -256,7 +256,7 @@ public function testDispatchShouldDispatchSpecifiedUrl()
         $content = $response->getBody();
         $this->assertEquals('zend-test-php-unit-foo', $request->getControllerName(), $content);
         $this->assertEquals('bar', $request->getActionName());
-        $this->assertContains('FooController::barAction', $content, $content);
+        $this->assertStringContainsString('FooController::barAction', $content, $content);
     }
 
     public function testModuleAssertionShouldDoNothingForValidComparison()
diff --git a/tests/Zend/UriTest.php b/tests/Zend/UriTest.php
index 376ca57d..e68a1e47 100644
--- a/tests/Zend/UriTest.php
+++ b/tests/Zend/UriTest.php
@@ -138,7 +138,7 @@ public function testToStringRaisesWarningWhenExceptionCaught()
 
         $this->assertTrue(empty($text));
         $this->assertTrue(isset($this->error));
-        $this->assertContains('Exception in getUri()', $this->error);
+        $this->assertStringContainsString('Exception in getUri()', $this->error);
     }
 
     /**
@@ -170,7 +170,7 @@ protected function _testInvalidUri($uri, $regex)
         try {
             $uri = Zend_Uri::factory($uri);
         } catch (Zend_Uri_Exception $e) {
-            $this->assertRegExp($regex, $e->getMessage());
+            $this->assertMatchesRegularExpression($regex, $e->getMessage());
 
             return;
         }
diff --git a/tests/Zend/Validate/AbstractTest.php b/tests/Zend/Validate/AbstractTest.php
index 43f428e2..6645db64 100644
--- a/tests/Zend/Validate/AbstractTest.php
+++ b/tests/Zend/Validate/AbstractTest.php
@@ -141,8 +141,8 @@ public function testErrorMessagesAreTranslatedWhenTranslatorPresent()
         $this->assertFalse($this->validator->isValid('bar'));
         $messages = $this->validator->getMessages();
         $this->assertTrue(array_key_exists('fooMessage', $messages));
-        $this->assertContains('bar', $messages['fooMessage']);
-        $this->assertContains('This is the translated message for ', $messages['fooMessage']);
+        $this->assertStringContainsString('bar', $messages['fooMessage']);
+        $this->assertStringContainsString('This is the translated message for ', $messages['fooMessage']);
     }
 
     public function testCanTranslateMessagesInsteadOfKeys()
@@ -156,8 +156,8 @@ public function testCanTranslateMessagesInsteadOfKeys()
         $this->assertFalse($this->validator->isValid('bar'));
         $messages = $this->validator->getMessages();
         $this->assertTrue(array_key_exists('fooMessage', $messages));
-        $this->assertContains('bar', $messages['fooMessage']);
-        $this->assertContains('This is the translated message for ', $messages['fooMessage']);
+        $this->assertStringContainsString('bar', $messages['fooMessage']);
+        $this->assertStringContainsString('This is the translated message for ', $messages['fooMessage']);
     }
 
     public function testObscureValueFlagFalseByDefault()
@@ -181,8 +181,8 @@ public function testValueIsObfuscatedWheObscureValueFlagIsTrue()
         $messages = $this->validator->getMessages();
         $this->assertTrue(isset($messages['fooMessage']));
         $message = $messages['fooMessage'];
-        $this->assertNotContains('foobar', $message);
-        $this->assertContains('******', $message);
+        $this->assertStringNotContainsString('foobar', $message);
+        $this->assertStringContainsString('******', $message);
     }
 
     /**
@@ -218,8 +218,8 @@ public function testCanDisableTranslator()
         $this->assertFalse($this->validator->isValid('bar'));
         $messages = $this->validator->getMessages();
         $this->assertTrue(array_key_exists('fooMessage', $messages));
-        $this->assertContains('bar', $messages['fooMessage']);
-        $this->assertContains('This is the translated message for ', $messages['fooMessage']);
+        $this->assertStringContainsString('bar', $messages['fooMessage']);
+        $this->assertStringContainsString('This is the translated message for ', $messages['fooMessage']);
 
         $this->validator->setDisableTranslator(true);
         $this->assertTrue($this->validator->translatorIsDisabled());
@@ -227,8 +227,8 @@ public function testCanDisableTranslator()
         $this->assertFalse($this->validator->isValid('bar'));
         $messages = $this->validator->getMessages();
         $this->assertTrue(array_key_exists('fooMessage', $messages));
-        $this->assertContains('bar', $messages['fooMessage']);
-        $this->assertContains('bar was passed', $messages['fooMessage']);
+        $this->assertStringContainsString('bar', $messages['fooMessage']);
+        $this->assertStringContainsString('bar was passed', $messages['fooMessage']);
     }
 
     public function testGetMessageTemplates()
diff --git a/tests/Zend/Validate/BarcodeTest.php b/tests/Zend/Validate/BarcodeTest.php
index 6110af1e..287cff5d 100644
--- a/tests/Zend/Validate/BarcodeTest.php
+++ b/tests/Zend/Validate/BarcodeTest.php
@@ -47,7 +47,7 @@ public function testNoneExisting()
             $barcode = new Zend_Validate_Barcode('Zend_Validate_BarcodeTest_NonExistentClassName');
             $this->fail("'Zend_Validate_BarcodeTest_NonExistentClassName' is not a valid barcode type'");
         } catch (Exception $e) {
-            $this->assertRegExp('#not found|No such file#', $e->getMessage());
+            $this->assertMatchesRegularExpression('#not found|No such file#', $e->getMessage());
         }
     }
 
@@ -432,6 +432,6 @@ public function testArrayLengthMessage()
         $this->assertFalse($barcode->isValid('123'));
         $message = $barcode->getMessages();
         $this->assertTrue(array_key_exists('barcodeInvalidLength', $message));
-        $this->assertContains('length of 7/8 characters', $message['barcodeInvalidLength']);
+        $this->assertStringContainsString('length of 7/8 characters', $message['barcodeInvalidLength']);
     }
 }
diff --git a/tests/Zend/Validate/CreditCardTest.php b/tests/Zend/Validate/CreditCardTest.php
index e6af43b5..b9fe648c 100644
--- a/tests/Zend/Validate/CreditCardTest.php
+++ b/tests/Zend/Validate/CreditCardTest.php
@@ -228,7 +228,7 @@ public function testMultiInstitute()
         $validator = new Zend_Validate_CreditCard(['type' => Zend_Validate_CreditCard::MASTERCARD]);
         $this->assertFalse($validator->isValid('4111111111111111'));
         $message = $validator->getMessages();
-        $this->assertContains('not from an allowed institute', current($message));
+        $this->assertStringContainsString('not from an allowed institute', current($message));
     }
 
     public static function staticCallback($value)
diff --git a/tests/Zend/Validate/EmailAddressTest.php b/tests/Zend/Validate/EmailAddressTest.php
index 3ac410ec..5c9d3cf8 100644
--- a/tests/Zend/Validate/EmailAddressTest.php
+++ b/tests/Zend/Validate/EmailAddressTest.php
@@ -103,7 +103,7 @@ public function testLocalPartMissing()
         $this->assertFalse($this->_validator->isValid('@example.com'));
         $messages = $this->_validator->getMessages();
         $this->assertEquals(1, count($messages));
-        $this->assertContains('local-part@hostname', current($messages));
+        $this->assertStringContainsString('local-part@hostname', current($messages));
     }
 
     /**
@@ -117,14 +117,14 @@ public function testLocalPartInvalid()
 
         $this->assertEquals(3, count($messages));
 
-        $this->assertContains('Some User', current($messages));
-        $this->assertContains('dot-atom', current($messages));
+        $this->assertStringContainsString('Some User', current($messages));
+        $this->assertStringContainsString('dot-atom', current($messages));
 
-        $this->assertContains('Some User', next($messages));
-        $this->assertContains('quoted-string', current($messages));
+        $this->assertStringContainsString('Some User', next($messages));
+        $this->assertStringContainsString('quoted-string', current($messages));
 
-        $this->assertContains('Some User', next($messages));
-        $this->assertContains('not a valid local part', current($messages));
+        $this->assertStringContainsString('Some User', next($messages));
+        $this->assertStringContainsString('not a valid local part', current($messages));
     }
 
     /**
@@ -148,7 +148,7 @@ public function testHostnameInvalid()
         $this->assertFalse($this->_validator->isValid('username@ example . com'));
         $messages = $this->_validator->getMessages();
         $this->assertThat(count($messages), $this->greaterThanOrEqual(1));
-        $this->assertContains('not a valid hostname', current($messages));
+        $this->assertStringContainsString('not a valid hostname', current($messages));
     }
 
     /**
@@ -212,9 +212,9 @@ public function testEmailDisplay()
         $this->assertFalse($this->_validator->isValid('User Name <username@example.com>'));
         $messages = $this->_validator->getMessages();
         $this->assertThat(count($messages), $this->greaterThanOrEqual(3));
-        $this->assertContains('not a valid hostname', current($messages));
-        $this->assertContains('cannot match TLD', next($messages));
-        $this->assertContains('does not appear to be a valid local network name', next($messages));
+        $this->assertStringContainsString('not a valid hostname', current($messages));
+        $this->assertStringContainsString('cannot match TLD', next($messages));
+        $this->assertStringContainsString('does not appear to be a valid local network name', next($messages));
     }
 
     /**
diff --git a/tests/Zend/Validate/File/FilesSizeTest.php b/tests/Zend/Validate/File/FilesSizeTest.php
index 1855c5ae..edef7a8c 100644
--- a/tests/Zend/Validate/File/FilesSizeTest.php
+++ b/tests/Zend/Validate/File/FilesSizeTest.php
@@ -179,16 +179,16 @@ public function testFailureMessage()
             __DIR__ . '/_files/testsize.mo',
             __DIR__ . '/_files/testsize.mo',
             __DIR__ . '/_files/testsize2.mo', ]));
-        $this->assertContains('9.76kB', current($validator->getMessages()));
-        $this->assertContains('1.55kB', current($validator->getMessages()));
+        $this->assertStringContainsString('9.76kB', current($validator->getMessages()));
+        $this->assertStringContainsString('1.55kB', current($validator->getMessages()));
 
         $validator = new Zend_Validate_File_FilesSize(['min' => 9999, 'max' => 10000, 'bytestring' => false]);
         $this->assertFalse($validator->isValid([
             __DIR__ . '/_files/testsize.mo',
             __DIR__ . '/_files/testsize.mo',
             __DIR__ . '/_files/testsize2.mo', ]));
-        $this->assertContains('9999', current($validator->getMessages()));
-        $this->assertContains('1588', current($validator->getMessages()));
+        $this->assertStringContainsString('9999', current($validator->getMessages()));
+        $this->assertStringContainsString('1588', current($validator->getMessages()));
     }
 
     public function errorHandler($errno, $errstr)
diff --git a/tests/Zend/Validate/File/ImageSizeTest.php b/tests/Zend/Validate/File/ImageSizeTest.php
index 05a3e52f..745f0b8b 100644
--- a/tests/Zend/Validate/File/ImageSizeTest.php
+++ b/tests/Zend/Validate/File/ImageSizeTest.php
@@ -66,18 +66,18 @@ public function testBasic()
         $validator = new Zend_Validate_File_ImageSize(['minwidth' => 0, 'minheight' => 10, 'maxwidth' => 1000, 'maxheight' => 2000]);
         $this->assertEquals(false, $validator->isValid(__DIR__ . '/_files/nofile.jpg'));
         $failures = $validator->getMessages();
-        $this->assertContains('is not readable', $failures['fileImageSizeNotReadable']);
+        $this->assertStringContainsString('is not readable', $failures['fileImageSizeNotReadable']);
 
         $file['name'] = 'TestName';
         $validator = new Zend_Validate_File_ImageSize(['minwidth' => 0, 'minheight' => 10, 'maxwidth' => 1000, 'maxheight' => 2000]);
         $this->assertEquals(false, $validator->isValid(__DIR__ . '/_files/nofile.jpg', $file));
         $failures = $validator->getMessages();
-        $this->assertContains('TestName', $failures['fileImageSizeNotReadable']);
+        $this->assertStringContainsString('TestName', $failures['fileImageSizeNotReadable']);
 
         $validator = new Zend_Validate_File_ImageSize(['minwidth' => 0, 'minheight' => 10, 'maxwidth' => 1000, 'maxheight' => 2000]);
         $this->assertEquals(false, $validator->isValid(__DIR__ . '/_files/badpicture.jpg'));
         $failures = $validator->getMessages();
-        $this->assertContains('could not be detected', $failures['fileImageSizeNotDetected']);
+        $this->assertStringContainsString('could not be detected', $failures['fileImageSizeNotDetected']);
     }
 
     /**
diff --git a/tests/Zend/Validate/File/SizeTest.php b/tests/Zend/Validate/File/SizeTest.php
index 98760e34..6517f257 100644
--- a/tests/Zend/Validate/File/SizeTest.php
+++ b/tests/Zend/Validate/File/SizeTest.php
@@ -177,12 +177,12 @@ public function testFailureMessage()
     {
         $validator = new Zend_Validate_File_Size(['min' => 9999, 'max' => 10000]);
         $this->assertFalse($validator->isValid(__DIR__ . '/_files/testsize.mo'));
-        $this->assertContains('9.76kB', current($validator->getMessages()));
-        $this->assertContains('794B', current($validator->getMessages()));
+        $this->assertStringContainsString('9.76kB', current($validator->getMessages()));
+        $this->assertStringContainsString('794B', current($validator->getMessages()));
 
         $validator = new Zend_Validate_File_Size(['min' => 9999, 'max' => 10000, 'bytestring' => false]);
         $this->assertFalse($validator->isValid(__DIR__ . '/_files/testsize.mo'));
-        $this->assertContains('9999', current($validator->getMessages()));
-        $this->assertContains('794', current($validator->getMessages()));
+        $this->assertStringContainsString('9999', current($validator->getMessages()));
+        $this->assertStringContainsString('794', current($validator->getMessages()));
     }
 }
diff --git a/tests/Zend/Validate/NotEmptyTest.php b/tests/Zend/Validate/NotEmptyTest.php
index 5717b5cc..3e9d74ed 100644
--- a/tests/Zend/Validate/NotEmptyTest.php
+++ b/tests/Zend/Validate/NotEmptyTest.php
@@ -510,7 +510,7 @@ public function testZF8767()
         $this->assertFalse($valid->isValid(''));
         $messages = $valid->getMessages();
         $this->assertTrue(array_key_exists('isEmpty', $messages));
-        $this->assertContains("can't be empty", $messages['isEmpty']);
+        $this->assertStringContainsString("can't be empty", $messages['isEmpty']);
     }
 
     public function testObjects()
diff --git a/tests/Zend/Validate/PostCodeTest.php b/tests/Zend/Validate/PostCodeTest.php
index 1a5333f6..de8dfb8e 100644
--- a/tests/Zend/Validate/PostCodeTest.php
+++ b/tests/Zend/Validate/PostCodeTest.php
@@ -158,6 +158,6 @@ public function testErrorMessageText()
     {
         $this->assertFalse($this->_validator->isValid('hello'));
         $message = $this->_validator->getMessages();
-        $this->assertContains('not appear to be a postal code', $message['postcodeNoMatch']);
+        $this->assertStringContainsString('not appear to be a postal code', $message['postcodeNoMatch']);
     }
 }
diff --git a/tests/Zend/Validate/Sitemap/ChangefreqTest.php b/tests/Zend/Validate/Sitemap/ChangefreqTest.php
index 74d96b81..d28ee471 100644
--- a/tests/Zend/Validate/Sitemap/ChangefreqTest.php
+++ b/tests/Zend/Validate/Sitemap/ChangefreqTest.php
@@ -78,7 +78,7 @@ public function testInvalidStrings()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('is not a valid', current($messages));
+            $this->assertStringContainsString('is not a valid', current($messages));
         }
     }
 
@@ -94,7 +94,7 @@ public function testNotString()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('String expected', current($messages));
+            $this->assertStringContainsString('String expected', current($messages));
         }
     }
 }
diff --git a/tests/Zend/Validate/Sitemap/LastmodTest.php b/tests/Zend/Validate/Sitemap/LastmodTest.php
index bbf84fe3..8fd70c0a 100644
--- a/tests/Zend/Validate/Sitemap/LastmodTest.php
+++ b/tests/Zend/Validate/Sitemap/LastmodTest.php
@@ -90,7 +90,7 @@ public function testInvalidStrings()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('is not a valid', current($messages));
+            $this->assertStringContainsString('is not a valid', current($messages));
         }
     }
 
@@ -106,7 +106,7 @@ public function testNotString()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('String expected', current($messages));
+            $this->assertStringContainsString('String expected', current($messages));
         }
     }
 }
diff --git a/tests/Zend/Validate/Sitemap/LocTest.php b/tests/Zend/Validate/Sitemap/LocTest.php
index 0e554271..a03124b7 100644
--- a/tests/Zend/Validate/Sitemap/LocTest.php
+++ b/tests/Zend/Validate/Sitemap/LocTest.php
@@ -85,7 +85,7 @@ public function testInvalidLocs()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('is not a valid', current($messages));
+            $this->assertStringContainsString('is not a valid', current($messages));
         }
     }
 
@@ -101,7 +101,7 @@ public function testNotStrings()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('String expected', current($messages));
+            $this->assertStringContainsString('String expected', current($messages));
         }
     }
 }
diff --git a/tests/Zend/Validate/Sitemap/PriorityTest.php b/tests/Zend/Validate/Sitemap/PriorityTest.php
index d5992b8f..a2a6baa0 100644
--- a/tests/Zend/Validate/Sitemap/PriorityTest.php
+++ b/tests/Zend/Validate/Sitemap/PriorityTest.php
@@ -77,7 +77,7 @@ public function testInvalidPriorities()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('is not a valid', current($messages));
+            $this->assertStringContainsString('is not a valid', current($messages));
         }
     }
 
@@ -93,7 +93,7 @@ public function testNotNumbers()
         foreach ($values as $value) {
             $this->assertSame(false, $this->_validator->isValid($value));
             $messages = $this->_validator->getMessages();
-            $this->assertContains('integer or float expected', current($messages));
+            $this->assertStringContainsString('integer or float expected', current($messages));
         }
     }
 }
diff --git a/tests/Zend/View/Helper/ActionTest.php b/tests/Zend/View/Helper/ActionTest.php
index c8fcfc22..4ee18a6a 100644
--- a/tests/Zend/View/Helper/ActionTest.php
+++ b/tests/Zend/View/Helper/ActionTest.php
@@ -276,6 +276,6 @@ public function testActionReturnsViewRendererToOriginalState()
     public function testActionCalledWithinActionResetsResponseState()
     {
         $value = $this->helper->action('bar-one', 'baz', 'foo');
-        $this->assertRegexp('/Baz-Three-View-Script\s+Baz-Two-View-Script\s+Baz-One-View-Script/s', $value);
+        $this->assertMatchesRegularExpression('/Baz-Three-View-Script\s+Baz-Two-View-Script\s+Baz-One-View-Script/s', $value);
     }
 }
diff --git a/tests/Zend/View/Helper/FieldsetTest.php b/tests/Zend/View/Helper/FieldsetTest.php
index 5c3abe0a..77579615 100644
--- a/tests/Zend/View/Helper/FieldsetTest.php
+++ b/tests/Zend/View/Helper/FieldsetTest.php
@@ -61,7 +61,7 @@ public function tearDown(): void
     public function testFieldsetHelperCreatesFieldsetWithProvidedContent()
     {
         $html = $this->helper->fieldset('foo', 'foobar');
-        $this->assertRegexp('#<fieldset[^>]+id="foo".*?>#', $html);
+        $this->assertMatchesRegularExpression('#<fieldset[^>]+id="foo".*?>#', $html);
         $this->assertStringContainsString('</fieldset>', $html);
         $this->assertStringContainsString('foobar', $html);
     }
@@ -69,7 +69,7 @@ public function testFieldsetHelperCreatesFieldsetWithProvidedContent()
     public function testProvidingLegendOptionToFieldsetCreatesLegendTag()
     {
         $html = $this->helper->fieldset('foo', 'foobar', ['legend' => 'Great Scott!']);
-        $this->assertRegexp('#<legend>Great Scott!</legend>#', $html);
+        $this->assertMatchesRegularExpression('#<legend>Great Scott!</legend>#', $html);
     }
 
     /**
@@ -89,6 +89,6 @@ public function testEmptyLegendShouldNotRenderLegendTag()
     public function testHelperShouldAllowDisablingEscapingOfLegend()
     {
         $html = $this->helper->fieldset('foo', 'foobar', ['legend' => '<b>Great Scott!</b>', 'escape' => false]);
-        $this->assertRegexp('#<legend><b>Great Scott!</b></legend>#', $html, $html);
+        $this->assertMatchesRegularExpression('#<legend><b>Great Scott!</b></legend>#', $html, $html);
     }
 }
diff --git a/tests/Zend/View/Helper/FormButtonTest.php b/tests/Zend/View/Helper/FormButtonTest.php
index f2e1df0e..bd2226e7 100644
--- a/tests/Zend/View/Helper/FormButtonTest.php
+++ b/tests/Zend/View/Helper/FormButtonTest.php
@@ -61,9 +61,9 @@ protected function tearDown(): void
     public function testFormButtonRendersButtonXhtml()
     {
         $button = $this->helper->formButton('foo', 'bar');
-        $this->assertRegexp('/<button[^>]*?value="bar"/', $button);
-        $this->assertRegexp('/<button[^>]*?name="foo"/', $button);
-        $this->assertRegexp('/<button[^>]*?id="foo"/', $button);
+        $this->assertMatchesRegularExpression('/<button[^>]*?value="bar"/', $button);
+        $this->assertMatchesRegularExpression('/<button[^>]*?name="foo"/', $button);
+        $this->assertMatchesRegularExpression('/<button[^>]*?id="foo"/', $button);
         $this->assertStringContainsString('</button>', $button);
     }
 
@@ -92,7 +92,7 @@ public function testCanDisableContentEscaping()
     public function testValueUsedForContentWhenNoContentProvided()
     {
         $button = $this->helper->formButton(['name' => 'foo', 'value' => 'bar']);
-        $this->assertRegexp('#<button[^>]*?value="bar"[^>]*>bar</button>#', $button);
+        $this->assertMatchesRegularExpression('#<button[^>]*?value="bar"[^>]*>bar</button>#', $button);
     }
 
     public function testButtonTypeIsButtonByDefault()
diff --git a/tests/Zend/View/Helper/FormCheckboxTest.php b/tests/Zend/View/Helper/FormCheckboxTest.php
index 599c5f23..04d3fbd1 100644
--- a/tests/Zend/View/Helper/FormCheckboxTest.php
+++ b/tests/Zend/View/Helper/FormCheckboxTest.php
@@ -77,7 +77,7 @@ public function testCanDisableCheckbox()
             'value' => 'bar',
             'attribs' => ['disable' => true],
         ]);
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html);
     }
 
     /**
@@ -100,7 +100,7 @@ public function testCanSelectCheckbox()
             'value' => 'bar',
             'attribs' => ['checked' => true],
         ]);
-        $this->assertRegexp('/<input[^>]*?(checked="checked")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(checked="checked")/', $html);
         $count = substr_count($html, 'checked');
         $this->assertEquals(2, $count);
     }
@@ -114,19 +114,19 @@ public function testNameBracketsStrippedWhenCreatingId()
             'name' => 'foo[]',
             'value' => 'bar',
         ]);
-        $this->assertRegexp('/<input[^>]*?(id="foo")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(id="foo")/', $html);
 
         $html = $this->helper->formCheckbox([
             'name' => 'foo[bar]',
             'value' => 'bar',
         ]);
-        $this->assertRegexp('/<input[^>]*?(id="foo-bar")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(id="foo-bar")/', $html);
 
         $html = $this->helper->formCheckbox([
             'name' => 'foo[bar][baz]',
             'value' => 'bar',
         ]);
-        $this->assertRegexp('/<input[^>]*?(id="foo-bar-baz")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(id="foo-bar-baz")/', $html);
     }
 
     /**
@@ -138,7 +138,7 @@ public function testDoesNotRenderHiddenElementsForCheckboxArray()
             'name' => 'foo[]',
             'value' => 'bar',
         ]);
-        $this->assertNotRegexp('/<input[^>]*?(type="hidden")/', $html);
+        $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(type="hidden")/', $html);
     }
 
     /**
@@ -189,10 +189,10 @@ public function testShouldRenderHiddenElementShowingUncheckedOptionForNonArrayNa
             $this->assertEquals(2, is_countable($matches[1]) ? count($matches[1]) : 0);
             foreach ($matches[1] as $element) {
                 if (strstr($element, 'hidden')) {
-                    $this->assertContains('baz', $element, 'Failed using ' . $html);
+                    $this->assertStringContainsString('baz', $element, 'Failed using ' . $html);
                 } else {
-                    $this->assertContains('bar', $element, 'Failed using ' . $html);
-                    $this->assertContains('checked', $element, 'Failed using ' . $html);
+                    $this->assertStringContainsString('bar', $element, 'Failed using ' . $html);
+                    $this->assertStringContainsString('checked', $element, 'Failed using ' . $html);
                 }
             }
         }
diff --git a/tests/Zend/View/Helper/FormFileTest.php b/tests/Zend/View/Helper/FormFileTest.php
index 713dc0c0..61242711 100644
--- a/tests/Zend/View/Helper/FormFileTest.php
+++ b/tests/Zend/View/Helper/FormFileTest.php
@@ -77,7 +77,7 @@ public function testCanDisableElement()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html);
     }
 
     /**
@@ -90,7 +90,7 @@ public function testDisablingElementDoesNotRenderHiddenElements()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertNotRegexp('/<input[^>]*?(type="hidden")/', $html);
+        $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(type="hidden")/', $html);
     }
 
     public function testRendersAsHtmlByDefault()
diff --git a/tests/Zend/View/Helper/FormImageTest.php b/tests/Zend/View/Helper/FormImageTest.php
index 3fada40a..478b5753 100644
--- a/tests/Zend/View/Helper/FormImageTest.php
+++ b/tests/Zend/View/Helper/FormImageTest.php
@@ -63,18 +63,18 @@ protected function tearDown(): void
     public function testFormImageRendersFormImageXhtml()
     {
         $button = $this->helper->formImage('foo', 'bar');
-        $this->assertRegexp('/<input[^>]*?src="bar"/', $button);
-        $this->assertRegexp('/<input[^>]*?name="foo"/', $button);
-        $this->assertRegexp('/<input[^>]*?type="image"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?src="bar"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?name="foo"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?type="image"/', $button);
     }
 
     public function testDisablingFormImageRendersImageInputWithDisableAttribute()
     {
         $button = $this->helper->formImage('foo', 'bar', ['disable' => true]);
-        $this->assertRegexp('/<input[^>]*?disabled="disabled"/', $button);
-        $this->assertRegexp('/<input[^>]*?src="bar"/', $button);
-        $this->assertRegexp('/<input[^>]*?name="foo"/', $button);
-        $this->assertRegexp('/<input[^>]*?type="image"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?disabled="disabled"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?src="bar"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?name="foo"/', $button);
+        $this->assertMatchesRegularExpression('/<input[^>]*?type="image"/', $button);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/FormMultiCheckboxTest.php b/tests/Zend/View/Helper/FormMultiCheckboxTest.php
index a1cd014a..8736abae 100644
--- a/tests/Zend/View/Helper/FormMultiCheckboxTest.php
+++ b/tests/Zend/View/Helper/FormMultiCheckboxTest.php
@@ -80,10 +80,10 @@ public function testMultiCheckboxHelperRendersLabelledCheckboxesForEachOption()
             if (!preg_match($pattern, $html, $matches)) {
                 $this->fail('Failed to match ' . $pattern . ': ' . $html);
             }
-            $this->assertContains($value, $matches[5], var_export($matches, 1));
-            $this->assertContains('type="checkbox"', $matches[3], var_export($matches, 1));
-            $this->assertContains('name="foo[]"', $matches[3], var_export($matches, 1));
-            $this->assertContains('value="' . $key . '"', $matches[3], var_export($matches, 1));
+            $this->assertStringContainsString($value, $matches[5], var_export($matches, 1));
+            $this->assertStringContainsString('type="checkbox"', $matches[3], var_export($matches, 1));
+            $this->assertStringContainsString('name="foo[]"', $matches[3], var_export($matches, 1));
+            $this->assertStringContainsString('value="' . $key . '"', $matches[3], var_export($matches, 1));
         }
     }
 
@@ -104,7 +104,7 @@ public function testRendersAsHtmlByDefault()
             if (!preg_match($pattern, $html, $matches)) {
                 $this->fail('Failed to match ' . $pattern . ': ' . $html);
             }
-            $this->assertNotContains(' />', $matches[1]);
+            $this->assertStringNotContainsString(' />', $matches[1]);
         }
     }
 
@@ -126,7 +126,7 @@ public function testCanRendersAsXHtml()
             if (!preg_match($pattern, $html, $matches)) {
                 $this->fail('Failed to match ' . $pattern . ': ' . $html);
             }
-            $this->assertContains(' />', $matches[1]);
+            $this->assertStringContainsString(' />', $matches[1]);
         }
     }
 }
diff --git a/tests/Zend/View/Helper/FormPasswordTest.php b/tests/Zend/View/Helper/FormPasswordTest.php
index 9202de78..8ac1c628 100644
--- a/tests/Zend/View/Helper/FormPasswordTest.php
+++ b/tests/Zend/View/Helper/FormPasswordTest.php
@@ -68,7 +68,7 @@ public function testCanDisableElement()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html);
     }
 
     /**
@@ -82,7 +82,7 @@ public function testDisablingElementDoesNotRenderHiddenElements()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertNotRegexp('/<input[^>]*?(type="hidden")/', $html);
+        $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(type="hidden")/', $html);
     }
 
     public function testShouldRenderAsHtmlByDefault()
diff --git a/tests/Zend/View/Helper/FormRadioTest.php b/tests/Zend/View/Helper/FormRadioTest.php
index ef435537..183bc585 100644
--- a/tests/Zend/View/Helper/FormRadioTest.php
+++ b/tests/Zend/View/Helper/FormRadioTest.php
@@ -62,8 +62,8 @@ public function testRendersRadioLabelsWhenRenderingMultipleOptions()
             'options' => $options,
         ]);
         foreach ($options as $key => $value) {
-            $this->assertRegexp('#<label.*?>.*?' . $value . '.*?</label>#', $html, $html);
-            $this->assertRegexp('#<label.*?>.*?<input.*?</label>#', $html, $html);
+            $this->assertMatchesRegularExpression('#<label.*?>.*?' . $value . '.*?</label>#', $html, $html);
+            $this->assertMatchesRegularExpression('#<label.*?>.*?<input.*?</label>#', $html, $html);
         }
     }
 
@@ -81,7 +81,7 @@ public function testCanSpecifyRadioLabelPlacement()
             'attribs' => ['labelPlacement' => 'append'],
         ]);
         foreach ($options as $key => $value) {
-            $this->assertRegexp('#<label.*?>.*?<input .*?' . $value . '</label>#', $html, $html);
+            $this->assertMatchesRegularExpression('#<label.*?>.*?<input .*?' . $value . '</label>#', $html, $html);
         }
 
         $html = $this->helper->formRadio([
@@ -91,7 +91,7 @@ public function testCanSpecifyRadioLabelPlacement()
             'attribs' => ['labelPlacement' => 'prepend'],
         ]);
         foreach ($options as $key => $value) {
-            $this->assertRegexp('#<label.*?>' . $value . '<input .*?</label>#', $html, $html);
+            $this->assertMatchesRegularExpression('#<label.*?>' . $value . '<input .*?</label>#', $html, $html);
         }
     }
 
@@ -111,7 +111,7 @@ public function testSpecifyingLabelPlacementShouldNotOverwriteValue()
                 'labelPlacement' => 'append',
             ],
         ]);
-        $this->assertRegexp('#<input[^>]*(checked="checked")#', $html, $html);
+        $this->assertMatchesRegularExpression('#<input[^>]*(checked="checked")#', $html, $html);
     }
 
     public function testCanSpecifyRadioLabelAttribs()
@@ -129,8 +129,8 @@ public function testCanSpecifyRadioLabelAttribs()
         ]);
 
         foreach ($options as $key => $value) {
-            $this->assertRegexp('#<label[^>]*?class="testclass"[^>]*>.*?' . $value . '#', $html, $html);
-            $this->assertRegexp('#<label[^>]*?id="testid"[^>]*>.*?' . $value . '#', $html, $html);
+            $this->assertMatchesRegularExpression('#<label[^>]*?class="testclass"[^>]*>.*?' . $value . '#', $html, $html);
+            $this->assertMatchesRegularExpression('#<label[^>]*?id="testid"[^>]*>.*?' . $value . '#', $html, $html);
         }
     }
 
@@ -170,7 +170,7 @@ public function testCanDisableAllRadios()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html, $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html, $html);
         $count = substr_count($html, 'disabled="disabled"');
         $this->assertEquals(3, $count);
     }
@@ -192,7 +192,7 @@ public function testCanDisableIndividualRadios()
             'attribs' => ['disable' => ['bar']],
         ]);
 
-        $this->assertRegexp('/<input[^>]*?(value="bar")[^>]*(disabled="disabled")/', $html, $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(value="bar")[^>]*(disabled="disabled")/', $html, $html);
         $count = substr_count($html, 'disabled="disabled"');
         $this->assertEquals(1, $count);
     }
@@ -215,9 +215,9 @@ public function testCanDisableMultipleRadios()
         ]);
 
         foreach (['foo', 'baz'] as $test) {
-            $this->assertRegexp('/<input[^>]*?(value="' . $test . '")[^>]*?(disabled="disabled")/', $html, $html);
+            $this->assertMatchesRegularExpression('/<input[^>]*?(value="' . $test . '")[^>]*?(disabled="disabled")/', $html, $html);
         }
-        $this->assertNotRegexp('/<input[^>]*?(value="bar")[^>]*?(disabled="disabled")/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(value="bar")[^>]*?(disabled="disabled")/', $html, $html);
         $count = substr_count($html, 'disabled="disabled"');
         $this->assertEquals(2, $count);
     }
@@ -265,7 +265,7 @@ public function testDoesNotRenderHiddenElements()
             'options' => $options,
         ]);
 
-        $this->assertNotRegexp('/<input[^>]*?(type="hidden")/', $html);
+        $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(type="hidden")/', $html);
     }
 
     public function testSpecifyingAValueThatMatchesAnOptionChecksIt()
@@ -284,7 +284,7 @@ public function testSpecifyingAValueThatMatchesAnOptionChecksIt()
         if (!preg_match('/(<input[^>]*?(value="bar")[^>]*>)/', $html, $matches)) {
             $this->fail('Radio for a given option was not found?');
         }
-        $this->assertContains('checked="checked"', $matches[1], var_export($matches, 1));
+        $this->assertStringContainsString('checked="checked"', $matches[1], var_export($matches, 1));
     }
 
     public function testOptionsWithMatchesInAnArrayOfValuesAreChecked()
@@ -304,7 +304,7 @@ public function testOptionsWithMatchesInAnArrayOfValuesAreChecked()
             if (!preg_match('/(<input[^>]*?(value="' . $value . '")[^>]*>)/', $html, $matches)) {
                 $this->fail('Radio for a given option was not found?');
             }
-            $this->assertContains('checked="checked"', $matches[1], var_export($matches, 1));
+            $this->assertStringContainsString('checked="checked"', $matches[1], var_export($matches, 1));
         }
     }
 
@@ -325,7 +325,7 @@ public function testEachRadioShouldHaveIdCreatedByAppendingFilteredValue()
         $filter = new Zend_Filter_Alnum();
         foreach ($options as $key => $value) {
             $id = 'foo-' . $filter->filter($key);
-            $this->assertRegexp('/<input([^>]*)(id="' . $id . '")/', $html);
+            $this->assertMatchesRegularExpression('/<input([^>]*)(id="' . $id . '")/', $html);
         }
     }
 
@@ -347,7 +347,7 @@ public function testEachRadioShouldUseAttributeIdWhenSpecified()
         $filter = new Zend_Filter_Alnum();
         foreach ($options as $key => $value) {
             $id = 'foo-bar-' . $filter->filter($key);
-            $this->assertRegexp('/<input([^>]*)(id="' . $id . '")/', $html);
+            $this->assertMatchesRegularExpression('/<input([^>]*)(id="' . $id . '")/', $html);
         }
     }
 
@@ -408,11 +408,11 @@ public function testDashesShouldNotBeFilteredFromId()
         $html = $formRadio->formRadio($name, -1, null, $options);
         foreach ($options as $key => $value) {
             $fid = "{$name}-{$key}";
-            $this->assertRegExp('/<input([^>]*)(id="' . $fid . '")/', $html);
+            $this->assertMatchesRegularExpression('/<input([^>]*)(id="' . $fid . '")/', $html);
         }
 
         // Assert that radio for value -1 is the selected one
-        $this->assertRegExp('/<input([^>]*)(id="' . $name . '--1")([^>]*)(checked="checked")/', $html);
+        $this->assertMatchesRegularExpression('/<input([^>]*)(id="' . $name . '--1")([^>]*)(checked="checked")/', $html);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/FormResetTest.php b/tests/Zend/View/Helper/FormResetTest.php
index 4ab6bc3b..c2b4f79f 100644
--- a/tests/Zend/View/Helper/FormResetTest.php
+++ b/tests/Zend/View/Helper/FormResetTest.php
@@ -68,7 +68,7 @@ public function testShouldRenderResetInput()
             'name' => 'foo',
             'value' => 'Reset',
         ]);
-        $this->assertRegexp('/<input[^>]*?(type="reset")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(type="reset")/', $html);
     }
 
     /**
@@ -81,7 +81,7 @@ public function testShouldAllowDisabling()
             'value' => 'Reset',
             'attribs' => ['disable' => true],
         ]);
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html);
     }
 
     public function testShouldRenderAsHtmlByDefault()
diff --git a/tests/Zend/View/Helper/FormSelectTest.php b/tests/Zend/View/Helper/FormSelectTest.php
index 1f6db51e..a07503a2 100644
--- a/tests/Zend/View/Helper/FormSelectTest.php
+++ b/tests/Zend/View/Helper/FormSelectTest.php
@@ -86,7 +86,7 @@ public function testRenderingWithOptions()
     public function testFormSelectWithNameOnlyCreatesEmptySelect()
     {
         $html = $this->helper->formSelect('foo');
-        $this->assertRegExp('#<select[^>]+name="foo"#', $html);
+        $this->assertMatchesRegularExpression('#<select[^>]+name="foo"#', $html);
         $this->assertStringContainsString('</select>', $html);
         $this->assertStringNotContainsString('<option', $html);
     }
@@ -94,31 +94,31 @@ public function testFormSelectWithNameOnlyCreatesEmptySelect()
     public function testFormSelectWithOptionsCreatesPopulatedSelect()
     {
         $html = $this->helper->formSelect('foo', null, null, ['foo' => 'Foobar', 'baz' => 'Bazbat']);
-        $this->assertRegExp('#<select[^>]+name="foo"#', $html);
+        $this->assertMatchesRegularExpression('#<select[^>]+name="foo"#', $html);
         $this->assertStringContainsString('</select>', $html);
-        $this->assertRegExp('#<option[^>]+value="foo".*?>Foobar</option>#', $html);
-        $this->assertRegExp('#<option[^>]+value="baz".*?>Bazbat</option>#', $html);
+        $this->assertMatchesRegularExpression('#<option[^>]+value="foo".*?>Foobar</option>#', $html);
+        $this->assertMatchesRegularExpression('#<option[^>]+value="baz".*?>Bazbat</option>#', $html);
         $this->assertEquals(2, substr_count($html, '<option'));
     }
 
     public function testFormSelectWithOptionsAndValueSelectsAppropriateValue()
     {
         $html = $this->helper->formSelect('foo', 'baz', null, ['foo' => 'Foobar', 'baz' => 'Bazbat']);
-        $this->assertRegExp('#<option[^>]+value="baz"[^>]*selected.*?>Bazbat</option>#', $html);
+        $this->assertMatchesRegularExpression('#<option[^>]+value="baz"[^>]*selected.*?>Bazbat</option>#', $html);
     }
 
     public function testFormSelectWithMultipleAttributeCreatesMultiSelect()
     {
         $html = $this->helper->formSelect('foo', null, ['multiple' => true], ['foo' => 'Foobar', 'baz' => 'Bazbat']);
-        $this->assertRegExp('#<select[^>]+name="foo\[\]"#', $html);
-        $this->assertRegExp('#<select[^>]+multiple="multiple"#', $html);
+        $this->assertMatchesRegularExpression('#<select[^>]+name="foo\[\]"#', $html);
+        $this->assertMatchesRegularExpression('#<select[^>]+multiple="multiple"#', $html);
     }
 
     public function testFormSelectWithMultipleAttributeAndValuesCreatesMultiSelectWithSelectedValues()
     {
         $html = $this->helper->formSelect('foo', ['foo', 'baz'], ['multiple' => true], ['foo' => 'Foobar', 'baz' => 'Bazbat']);
-        $this->assertRegExp('#<option[^>]+value="foo"[^>]*selected.*?>Foobar</option>#', $html);
-        $this->assertRegExp('#<option[^>]+value="baz"[^>]*selected.*?>Bazbat</option>#', $html);
+        $this->assertMatchesRegularExpression('#<option[^>]+value="foo"[^>]*selected.*?>Foobar</option>#', $html);
+        $this->assertMatchesRegularExpression('#<option[^>]+value="baz"[^>]*selected.*?>Bazbat</option>#', $html);
     }
 
     /**
@@ -127,7 +127,7 @@ public function testFormSelectWithMultipleAttributeAndValuesCreatesMultiSelectWi
     public function testFormSelectWithZeroValueSelectsValue()
     {
         $html = $this->helper->formSelect('foo', 0, null, ['foo' => 'Foobar', 0 => 'Bazbat']);
-        $this->assertRegExp('#<option[^>]+value="0"[^>]*selected.*?>Bazbat</option>#', $html);
+        $this->assertMatchesRegularExpression('#<option[^>]+value="0"[^>]*selected.*?>Bazbat</option>#', $html);
     }
 
     /**
@@ -145,8 +145,8 @@ public function testCanDisableEntireSelect()
                 'disable' => true,
             ],
         ]);
-        $this->assertRegexp('/<select[^>]*?disabled/', $html, $html);
-        $this->assertNotRegexp('/<option[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertMatchesRegularExpression('/<select[^>]*?disabled/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<option[^>]*?disabled="disabled"/', $html, $html);
     }
 
     /**
@@ -164,8 +164,8 @@ public function testCanDisableIndividualSelectOptionsOnly()
                 'disable' => ['bar'],
             ],
         ]);
-        $this->assertNotRegexp('/<select[^>]*?disabled/', $html, $html);
-        $this->assertRegexp('/<option value="bar"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?disabled/', $html, $html);
+        $this->assertMatchesRegularExpression('/<option value="bar"[^>]*?disabled="disabled"/', $html, $html);
 
         $html = $this->helper->formSelect(
             'baz',
@@ -178,8 +178,8 @@ public function testCanDisableIndividualSelectOptionsOnly()
                 'bar' => 'Bar',
             ]
         );
-        $this->assertNotRegexp('/<select[^>]*?disabled/', $html, $html);
-        $this->assertRegexp('/<option value="bar"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?disabled/', $html, $html);
+        $this->assertMatchesRegularExpression('/<option value="bar"[^>]*?disabled="disabled"/', $html, $html);
     }
 
     /**
@@ -198,9 +198,9 @@ public function testCanDisableMultipleSelectOptions()
                 'disable' => ['foo', 'baz'],
             ],
         ]);
-        $this->assertNotRegexp('/<select[^>]*?disabled/', $html, $html);
-        $this->assertRegexp('/<option value="foo"[^>]*?disabled="disabled"/', $html, $html);
-        $this->assertRegexp('/<option value="baz"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?disabled/', $html, $html);
+        $this->assertMatchesRegularExpression('/<option value="foo"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertMatchesRegularExpression('/<option value="baz"[^>]*?disabled="disabled"/', $html, $html);
     }
 
     /**
@@ -222,10 +222,10 @@ public function testCanDisableOptGroups()
                 'disable' => ['bar'],
             ],
         ]);
-        $this->assertNotRegexp('/<select[^>]*?disabled/', $html, $html);
-        $this->assertRegexp('/<optgroup[^>]*?disabled="disabled"[^>]*?"bar"[^>]*?/', $html, $html);
-        $this->assertNotRegexp('/<option value="1"[^>]*?disabled="disabled"/', $html, $html);
-        $this->assertNotRegexp('/<option value="2"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?disabled/', $html, $html);
+        $this->assertMatchesRegularExpression('/<optgroup[^>]*?disabled="disabled"[^>]*?"bar"[^>]*?/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<option value="1"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<option value="2"[^>]*?disabled="disabled"/', $html, $html);
     }
 
     /**
@@ -247,10 +247,10 @@ public function testCanDisableOptGroupOptions()
                 'disable' => ['2'],
             ],
         ]);
-        $this->assertNotRegexp('/<select[^>]*?disabled/', $html, $html);
-        $this->assertNotRegexp('/<optgroup[^>]*?disabled="disabled"[^>]*?"bar"[^>]*?/', $html, $html);
-        $this->assertNotRegexp('/<option value="1"[^>]*?disabled="disabled"/', $html, $html);
-        $this->assertRegexp('/<option value="2"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?disabled/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<optgroup[^>]*?disabled="disabled"[^>]*?"bar"[^>]*?/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<option value="1"[^>]*?disabled="disabled"/', $html, $html);
+        $this->assertMatchesRegularExpression('/<option value="2"[^>]*?disabled="disabled"/', $html, $html);
     }
 
     public function testCanSpecifySelectMultipleThroughAttribute()
@@ -266,7 +266,7 @@ public function testCanSpecifySelectMultipleThroughAttribute()
                 'multiple' => true,
             ],
         ]);
-        $this->assertRegexp('/<select[^>]*?(multiple="multiple")/', $html, $html);
+        $this->assertMatchesRegularExpression('/<select[^>]*?(multiple="multiple")/', $html, $html);
     }
 
     public function testSpecifyingSelectMultipleThroughAttributeAppendsNameWithBrackets()
@@ -282,7 +282,7 @@ public function testSpecifyingSelectMultipleThroughAttributeAppendsNameWithBrack
                 'multiple' => true,
             ],
         ]);
-        $this->assertRegexp('/<select[^>]*?(name="baz\[\]")/', $html, $html);
+        $this->assertMatchesRegularExpression('/<select[^>]*?(name="baz\[\]")/', $html, $html);
     }
 
     public function testCanSpecifySelectMultipleThroughName()
@@ -295,7 +295,7 @@ public function testCanSpecifySelectMultipleThroughName()
                 'baz' => 'Baz,',
             ],
         ]);
-        $this->assertRegexp('/<select[^>]*?(multiple="multiple")/', $html, $html);
+        $this->assertMatchesRegularExpression('/<select[^>]*?(multiple="multiple")/', $html, $html);
     }
 
     /**
@@ -314,8 +314,8 @@ public function testNameCanContainBracketsButNotBeMultiple()
                 'multiple' => false,
             ],
         ]);
-        $this->assertRegexp('/<select[^>]*?(name="baz\[\]")/', $html, $html);
-        $this->assertNotRegexp('/<select[^>]*?(multiple="multiple")/', $html, $html);
+        $this->assertMatchesRegularExpression('/<select[^>]*?(name="baz\[\]")/', $html, $html);
+        $this->assertDoesNotMatchRegularExpression('/<select[^>]*?(multiple="multiple")/', $html, $html);
     }
 
     /**
@@ -334,7 +334,7 @@ public function testOptGroupHasAnId()
                 'baz' => 'Baz,',
             ],
         ]);
-        $this->assertRegexp('/<optgroup[^>]*?id="baz-optgroup-bar"[^>]*?"bar"[^>]*?/', $html, $html);
+        $this->assertMatchesRegularExpression('/<optgroup[^>]*?id="baz-optgroup-bar"[^>]*?"bar"[^>]*?/', $html, $html);
     }
 
     public function testCanApplyOptionClasses()
@@ -353,7 +353,7 @@ public function testCanApplyOptionClasses()
                     'baz' => 'bazClass', ],
             ],
         ]);
-        $this->assertRegexp('/.*<option[^>]*?(value="foo")?(class="fooClass").*/', $html, $html);
-        $this->assertRegexp('/.*<option[^>]*?(value="bar")?(class="barClass").*/', $html, $html);
+        $this->assertMatchesRegularExpression('/.*<option[^>]*?(value="foo")?(class="fooClass").*/', $html, $html);
+        $this->assertMatchesRegularExpression('/.*<option[^>]*?(value="bar")?(class="barClass").*/', $html, $html);
     }
 }
diff --git a/tests/Zend/View/Helper/FormSubmitTest.php b/tests/Zend/View/Helper/FormSubmitTest.php
index 3e0b95eb..955e5ceb 100644
--- a/tests/Zend/View/Helper/FormSubmitTest.php
+++ b/tests/Zend/View/Helper/FormSubmitTest.php
@@ -68,7 +68,7 @@ public function testRendersSubmitInput()
             'name' => 'foo',
             'value' => 'Submit!',
         ]);
-        $this->assertRegexp('/<input[^>]*?(type="submit")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(type="submit")/', $html);
     }
 
     /**
@@ -81,7 +81,7 @@ public function testCanDisableSubmitButton()
             'value' => 'Submit!',
             'attribs' => ['disable' => true],
         ]);
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html);
     }
 
     /**
@@ -93,7 +93,7 @@ public function testValueAttributeIsAlwaysRendered()
             'name' => 'foo',
             'value' => '',
         ]);
-        $this->assertRegexp('/<input[^>]*?(value="")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(value="")/', $html);
     }
 
     public function testRendersAsHtmlByDefault()
diff --git a/tests/Zend/View/Helper/FormTest.php b/tests/Zend/View/Helper/FormTest.php
index db9f6657..9a343b84 100644
--- a/tests/Zend/View/Helper/FormTest.php
+++ b/tests/Zend/View/Helper/FormTest.php
@@ -61,15 +61,15 @@ protected function tearDown(): void
     public function testFormWithSaneInput()
     {
         $form = $this->helper->form('foo', ['action' => '/foo', 'method' => 'get']);
-        $this->assertRegexp('/<form[^>]*(id="foo")/', $form);
-        $this->assertRegexp('/<form[^>]*(action="\/foo")/', $form);
-        $this->assertRegexp('/<form[^>]*(method="get")/', $form);
+        $this->assertMatchesRegularExpression('/<form[^>]*(id="foo")/', $form);
+        $this->assertMatchesRegularExpression('/<form[^>]*(action="\/foo")/', $form);
+        $this->assertMatchesRegularExpression('/<form[^>]*(method="get")/', $form);
     }
 
     public function testFormWithInputNeedingEscapesUsesViewEscaping()
     {
         $form = $this->helper->form('<&foo');
-        $this->assertContains($this->view->escape('<&foo'), $form);
+        $this->assertStringContainsString($this->view->escape('<&foo'), $form);
     }
 
     /**
@@ -78,9 +78,9 @@ public function testFormWithInputNeedingEscapesUsesViewEscaping()
     public function testEmptyIdShouldNotRenderIdAttribute()
     {
         $form = $this->helper->form('', ['action' => '/foo', 'method' => 'get']);
-        $this->assertNotRegexp('/<form[^>]*(id="")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(id="")/', $form);
         $form = $this->helper->form('', ['action' => '/foo', 'method' => 'get', 'id' => null]);
-        $this->assertNotRegexp('/<form[^>]*(id="")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(id="")/', $form);
     }
 
     /**
@@ -89,8 +89,8 @@ public function testEmptyIdShouldNotRenderIdAttribute()
     public function testPassingNameAsAttributeShouldOverrideFormName()
     {
         $form = $this->helper->form('OrigName', ['action' => '/foo', 'method' => 'get', 'name' => 'SomeNameAttr']);
-        $this->assertNotRegexp('/<form[^>]*(name="OrigName")/', $form);
-        $this->assertRegexp('/<form[^>]*(name="SomeNameAttr")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(name="OrigName")/', $form);
+        $this->assertMatchesRegularExpression('/<form[^>]*(name="SomeNameAttr")/', $form);
     }
 
     /**
@@ -99,7 +99,7 @@ public function testPassingNameAsAttributeShouldOverrideFormName()
     public function testNotSpecifyingFormNameShouldNotRenderNameAttrib()
     {
         $form = $this->helper->form('', ['action' => '/foo', 'method' => 'get']);
-        $this->assertNotRegexp('/<form[^>]*(name=".*")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(name=".*")/', $form);
     }
 
     /**
@@ -108,7 +108,7 @@ public function testNotSpecifyingFormNameShouldNotRenderNameAttrib()
     public function testSpecifyingFormNameShouldRenderNameAttrib()
     {
         $form = $this->helper->form('FormName', ['action' => '/foo', 'method' => 'get']);
-        $this->assertRegexp('/<form[^>]*(name="FormName")/', $form);
+        $this->assertMatchesRegularExpression('/<form[^>]*(name="FormName")/', $form);
     }
 
     /**
@@ -117,7 +117,7 @@ public function testSpecifyingFormNameShouldRenderNameAttrib()
     public function testPassingEmptyNameAttributeToUnnamedFormShouldNotRenderNameAttrib()
     {
         $form = $this->helper->form('', ['action' => '/foo', 'method' => 'get', 'name' => null]);
-        $this->assertNotRegexp('/<form[^>]*(name=".*")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(name=".*")/', $form);
     }
 
     /**
@@ -126,7 +126,7 @@ public function testPassingEmptyNameAttributeToUnnamedFormShouldNotRenderNameAtt
     public function testPassingEmptyNameAttributeToNamedFormShouldNotOverrideNameAttrib()
     {
         $form = $this->helper->form('RealName', ['action' => '/foo', 'method' => 'get', 'name' => null]);
-        $this->assertRegexp('/<form[^>]*(name="RealName")/', $form);
+        $this->assertMatchesRegularExpression('/<form[^>]*(name="RealName")/', $form);
     }
 
     /**
@@ -136,7 +136,7 @@ public function testNameAttributeShouldBeOmittedWhenUsingXhtml1Strict()
     {
         $this->view->doctype('XHTML1_STRICT');
         $form = $this->helper->form('FormName', ['action' => '/foo', 'method' => 'get']);
-        $this->assertNotRegexp('/<form[^>]*(name="FormName")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(name="FormName")/', $form);
     }
 
     /**
@@ -146,17 +146,17 @@ public function testNameAttributeShouldBeOmittedWhenUsingXhtml11()
     {
         $this->view->doctype('XHTML11');
         $form = $this->helper->form('FormName', ['action' => '/foo', 'method' => 'get']);
-        $this->assertNotRegexp('/<form[^>]*(name="FormName")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(name="FormName")/', $form);
     }
 
     public function testEmptyActionShouldNotRenderActionAttributeInHTML5()
     {
         $this->view->doctype(Zend_View_Helper_Doctype::HTML5);
         $form = $this->helper->form('', ['action' => '']);
-        $this->assertNotRegexp('/<form[^>]*(action="")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(action="")/', $form);
         $form = $this->helper->form('', ['action' => null]);
-        $this->assertNotRegexp('/<form[^>]*(action="")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(action="")/', $form);
         $form = $this->helper->form('');
-        $this->assertNotRegexp('/<form[^>]*(action="")/', $form);
+        $this->assertDoesNotMatchRegularExpression('/<form[^>]*(action="")/', $form);
     }
 }
diff --git a/tests/Zend/View/Helper/FormTextTest.php b/tests/Zend/View/Helper/FormTextTest.php
index dab23800..60c029ae 100644
--- a/tests/Zend/View/Helper/FormTextTest.php
+++ b/tests/Zend/View/Helper/FormTextTest.php
@@ -95,7 +95,7 @@ public function testCanDisableElement()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertRegexp('/<input[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<input[^>]*?(disabled="disabled")/', $html);
     }
 
     /**
@@ -109,7 +109,7 @@ public function testDisablingElementDoesNotRenderHiddenElements()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertNotRegexp('/<input[^>]*?(type="hidden")/', $html);
+        $this->assertDoesNotMatchRegularExpression('/<input[^>]*?(type="hidden")/', $html);
     }
 
     public function testRendersAsHtmlByDefault()
diff --git a/tests/Zend/View/Helper/FormTextareaTest.php b/tests/Zend/View/Helper/FormTextareaTest.php
index 170816f0..5df99b7a 100644
--- a/tests/Zend/View/Helper/FormTextareaTest.php
+++ b/tests/Zend/View/Helper/FormTextareaTest.php
@@ -65,7 +65,7 @@ public function testCanDisableElement()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertRegexp('/<textarea[^>]*?(disabled="disabled")/', $html);
+        $this->assertMatchesRegularExpression('/<textarea[^>]*?(disabled="disabled")/', $html);
     }
 
     /**
@@ -79,6 +79,6 @@ public function testDisablingElementDoesNotRenderHiddenElements()
             'attribs' => ['disable' => true],
         ]);
 
-        $this->assertNotRegexp('/<textarea[^>]*?(type="hidden")/', $html);
+        $this->assertDoesNotMatchRegularExpression('/<textarea[^>]*?(type="hidden")/', $html);
     }
 }
diff --git a/tests/Zend/View/Helper/GravatarTest.php b/tests/Zend/View/Helper/GravatarTest.php
index 43b46281..507c30cc 100644
--- a/tests/Zend/View/Helper/GravatarTest.php
+++ b/tests/Zend/View/Helper/GravatarTest.php
@@ -83,7 +83,7 @@ protected function tearDown(): void
      */
     public function testGravataXHTMLDoctype()
     {
-        $this->assertRegExp('/\/>$/',
+        $this->assertMatchesRegularExpression('/\/>$/',
             $this->_object->gravatar('example@example.com')->__toString());
     }
 
@@ -97,7 +97,7 @@ public function testGravatarHTMLDoctype()
         $view->doctype()->setDoctype(strtoupper('HTML5'));
         $object->setView($view);
 
-        $this->assertRegExp('/[^\/]>$/',
+        $this->assertMatchesRegularExpression('/[^\/]>$/',
             $this->_object->gravatar('example@example.com')->__toString());
     }
 
@@ -178,7 +178,7 @@ public function testSetSecure()
      */
     public function testHttpsSource()
     {
-        $this->assertRegExp('/src="https:\/\/secure.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
+        $this->assertMatchesRegularExpression('/src="https:\/\/secure.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
                 $this->_object->gravatar('example@example.com', ['secure' => true])->__toString());
     }
 
@@ -187,7 +187,7 @@ public function testHttpsSource()
      */
     public function testImgAttribs()
     {
-        $this->assertRegExp('/class="gravatar" title="Gravatar"/',
+        $this->assertMatchesRegularExpression('/class="gravatar" title="Gravatar"/',
                 $this->_object->gravatar('example@example.com', [],
                         ['class' => 'gravatar', 'title' => 'Gravatar'])
                     ->__toString()
@@ -199,7 +199,7 @@ public function testImgAttribs()
      */
     public function testGravatarOptions()
     {
-        $this->assertRegExp('/src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}\?s=125&amp;d=wavatar&amp;r=pg"/',
+        $this->assertMatchesRegularExpression('/src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}\?s=125&amp;d=wavatar&amp;r=pg"/',
                 $this->_object->gravatar('example@example.com',
                         ['rating' => 'pg', 'imgSize' => 125, 'defaultImg' => 'wavatar',
                             'secure' => false, ])
@@ -217,7 +217,7 @@ public function testAutoDetectLocation()
 
         foreach ($values as $value) {
             $_SERVER['HTTPS'] = $value;
-            $this->assertRegExp('/src="https:\/\/secure.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
+            $this->assertMatchesRegularExpression('/src="https:\/\/secure.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
                     $this->_object->gravatar('example@example.com')->__toString());
         }
     }
@@ -229,7 +229,7 @@ public function testAutoDetectLocationOnIis()
     {
         $_SERVER['HTTPS'] = 'off';
 
-        $this->assertRegExp('/src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
+        $this->assertMatchesRegularExpression('/src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
                 $this->_object->gravatar('example@example.com')->__toString());
     }
 
@@ -243,19 +243,19 @@ public function testSetAttribsWithSrcKey()
             'id' => 'gravatarID',
         ]);
 
-        $this->assertRegExp('/src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
+        $this->assertMatchesRegularExpression('/src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}.+"/',
                             $this->_object->getImgTag());
     }
 
     public function testForgottenEmailParameter()
     {
-        $this->assertRegExp('/(src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}.+")/',
+        $this->assertMatchesRegularExpression('/(src="http:\/\/www.gravatar.com\/avatar\/[a-z0-9]{32}.+")/',
                             $this->_object->getImgTag());
     }
 
     public function testReturnImgTag()
     {
-        $this->assertRegExp("/^<img\s.+/",
+        $this->assertMatchesRegularExpression("/^<img\s.+/",
         $this->_object->gravatar('example@example.com')->__toString());
     }
 
diff --git a/tests/Zend/View/Helper/HeadMetaTest.php b/tests/Zend/View/Helper/HeadMetaTest.php
index 0abfbf49..49ae1352 100644
--- a/tests/Zend/View/Helper/HeadMetaTest.php
+++ b/tests/Zend/View/Helper/HeadMetaTest.php
@@ -521,8 +521,8 @@ public function testConditional()
     {
         $html = $this->helper->appendHttpEquiv('foo', 'bar', ['conditional' => 'lt IE 7'])->toString();
 
-        $this->assertRegExp("|^<!--\[if lt IE 7\]>|", $html);
-        $this->assertRegExp("|<!\[endif\]-->$|", $html);
+        $this->assertMatchesRegularExpression("|^<!--\[if lt IE 7\]>|", $html);
+        $this->assertMatchesRegularExpression("|<!\[endif\]-->$|", $html);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/HeadScriptTest.php b/tests/Zend/View/Helper/HeadScriptTest.php
index 7c0f7e6f..28383d57 100644
--- a/tests/Zend/View/Helper/HeadScriptTest.php
+++ b/tests/Zend/View/Helper/HeadScriptTest.php
@@ -327,7 +327,7 @@ public function testCapturingCapturesToObject()
         $values = $this->helper->getArrayCopy();
         $this->assertEquals(1, is_countable($values) ? count($values) : 0, var_export($values, 1));
         $item = array_shift($values);
-        $this->assertContains('foobar', $item->source);
+        $this->assertStringContainsString('foobar', $item->source);
     }
 
     public function testIndentationIsHonored()
diff --git a/tests/Zend/View/Helper/HeadStyleTest.php b/tests/Zend/View/Helper/HeadStyleTest.php
index 3055908a..3480d736 100644
--- a/tests/Zend/View/Helper/HeadStyleTest.php
+++ b/tests/Zend/View/Helper/HeadStyleTest.php
@@ -220,7 +220,7 @@ public function testRenderedStyleTagsContainsDefaultMedia()
         $this->helper->setStyle('a {}', [
         ]);
         $value = $this->helper->toString();
-        $this->assertRegexp('#<style [^>]*?media="screen"#', $value, $value);
+        $this->assertMatchesRegularExpression('#<style [^>]*?media="screen"#', $value, $value);
     }
 
     /**
@@ -280,7 +280,7 @@ public function testCapturingCapturesToObject()
         $values = $this->helper->getArrayCopy();
         $this->assertEquals(1, is_countable($values) ? count($values) : 0);
         $item = array_shift($values);
-        $this->assertContains('foobar', $item->content);
+        $this->assertStringContainsString('foobar', $item->content);
     }
 
     public function testOverloadingOffsetSetWritesToSpecifiedIndex()
@@ -290,7 +290,7 @@ public function testOverloadingOffsetSetWritesToSpecifiedIndex()
         $this->assertEquals(1, is_countable($values) ? count($values) : 0);
         $this->assertTrue(isset($values[100]));
         $item = $values[100];
-        $this->assertContains('foobar', $item->content);
+        $this->assertStringContainsString('foobar', $item->content);
     }
 
     public function testInvalidMethodRaisesException()
diff --git a/tests/Zend/View/Helper/HtmlListTest.php b/tests/Zend/View/Helper/HtmlListTest.php
index 796807db..eeb5b97d 100644
--- a/tests/Zend/View/Helper/HtmlListTest.php
+++ b/tests/Zend/View/Helper/HtmlListTest.php
@@ -196,7 +196,7 @@ public function testAttribsPassedIntoMultidimensionalLists()
         $list = $this->helper->htmlList($items, false, ['class' => 'foo']);
 
         foreach ($items[1] as $item) {
-            $this->assertRegexp('#<ul[^>]*?class="foo"[^>]*>.*?(<li>' . $item . ')#s', $list);
+            $this->assertMatchesRegularExpression('#<ul[^>]*?class="foo"[^>]*>.*?(<li>' . $item . ')#s', $list);
         }
     }
 
@@ -224,8 +224,8 @@ public function testAttribsPassedIntoMultidimensionalLists()
 
         $list = $this->helper->htmlList($items, false, false, false);
 
-        $this->assertContains('<ul>', $list);
-        $this->assertContains('</ul>', $list);
+        $this->assertStringContainsString('<ul>', $list);
+        $this->assertStringContainsString('</ul>', $list);
 
         $this->markTestSkipped('Wrong array_walk_recursive behavior.');
 
@@ -234,6 +234,6 @@ public function testAttribsPassedIntoMultidimensionalLists()
 
     public function validateItems($value, $key, $userdata)
     {
-        $this->assertContains('<li>' . $value, $userdata);
+        $this->assertStringContainsString('<li>' . $value, $userdata);
     }
 }
diff --git a/tests/Zend/View/Helper/Navigation/NavigationTest.php b/tests/Zend/View/Helper/Navigation/NavigationTest.php
index debea786..0165c686 100644
--- a/tests/Zend/View/Helper/Navigation/NavigationTest.php
+++ b/tests/Zend/View/Helper/Navigation/NavigationTest.php
@@ -338,7 +338,7 @@ public function testMagicToStringShouldNotThrowException()
         $this->_helper->__toString();
         restore_error_handler();
 
-        $this->assertContains('array must contain two values', $this->_errorMessage);
+        $this->assertStringContainsString('array must contain two values', $this->_errorMessage);
     }
 
     public function testPageIdShouldBeNormalized()
diff --git a/tests/Zend/View/Helper/Placeholder/ContainerTest.php b/tests/Zend/View/Helper/Placeholder/ContainerTest.php
index 4d3a62e5..63fdba5c 100644
--- a/tests/Zend/View/Helper/Placeholder/ContainerTest.php
+++ b/tests/Zend/View/Helper/Placeholder/ContainerTest.php
@@ -149,7 +149,7 @@ public function testCapturingToPlaceholderStoresContent()
         $this->container->captureEnd();
 
         $value = $this->container->getValue();
-        $this->assertContains('This is content intended for capture', $value);
+        $this->assertStringContainsString('This is content intended for capture', $value);
     }
 
     public function testCapturingToPlaceholderAppendsContent()
@@ -167,7 +167,7 @@ public function testCapturingToPlaceholderAppendsContent()
         $keys = array_keys($value);
         $lastIndex = array_pop($keys);
         $this->assertEquals('foo', $value[$lastIndex - 1]);
-        $this->assertContains('This is content intended for capture', $value[$lastIndex]);
+        $this->assertStringContainsString('This is content intended for capture', $value[$lastIndex]);
     }
 
     public function testCapturingToPlaceholderUsingPrependPrependsContent()
@@ -185,7 +185,7 @@ public function testCapturingToPlaceholderUsingPrependPrependsContent()
         $keys = array_keys($value);
         $lastIndex = array_pop($keys);
         $this->assertEquals('foo', $value[$lastIndex]);
-        $this->assertContains('This is content intended for capture', $value[$lastIndex - 1]);
+        $this->assertStringContainsString('This is content intended for capture', $value[$lastIndex - 1]);
     }
 
     public function testCapturingToPlaceholderUsingSetOverwritesContent()
@@ -198,7 +198,7 @@ public function testCapturingToPlaceholderUsingSetOverwritesContent()
         $this->assertEquals(1, count($this->container));
 
         $value = $this->container->getValue();
-        $this->assertContains('This is content intended for capture', $value);
+        $this->assertStringContainsString('This is content intended for capture', $value);
     }
 
     public function testCapturingToPlaceholderKeyUsingSetCapturesContent()
@@ -210,7 +210,7 @@ public function testCapturingToPlaceholderKeyUsingSetCapturesContent()
         $this->assertEquals(1, count($this->container));
         $this->assertTrue(isset($this->container['key']));
         $value = $this->container['key'];
-        $this->assertContains('This is content intended for capture', $value);
+        $this->assertStringContainsString('This is content intended for capture', $value);
     }
 
     public function testCapturingToPlaceholderKeyUsingSetReplacesContentAtKey()
diff --git a/tests/Zend/ViewTest.php b/tests/Zend/ViewTest.php
index 15d61c1e..9ba06bc3 100644
--- a/tests/Zend/ViewTest.php
+++ b/tests/Zend/ViewTest.php
@@ -555,7 +555,7 @@ public function testHelperPathWithPrefixAndRelativePath()
         $this->assertSame($view, $status);
         $helperPaths = $view->getHelperPaths();
         $this->assertTrue(array_key_exists('My_View_Helper_', $helperPaths));
-        $this->assertContains($this->_filterPath('Zend/View/_stubs/HelperDir1/'), $this->_filterPath(current($helperPaths['My_View_Helper_'])));
+        $this->assertStringContainsString($this->_filterPath('Zend/View/_stubs/HelperDir1/'), $this->_filterPath(current($helperPaths['My_View_Helper_'])));
     }
 
     public function testFilterPathWithPrefix()
@@ -903,10 +903,10 @@ public function testGetHelperIsCaseInsensitive()
         $this->assertStringContainsString('<input type="hidden"', $hidden);
 
         $hidden = $view->getHelper('formHidden')->formHidden('foo', 'bar');
-        $this->assertContains('<input type="hidden"', $hidden);
+        $this->assertStringContainsString('<input type="hidden"', $hidden);
 
         $hidden = $view->getHelper('FormHidden')->formHidden('foo', 'bar');
-        $this->assertContains('<input type="hidden"', $hidden);
+        $this->assertStringContainsString('<input type="hidden"', $hidden);
     }
 
     public function testGetHelperUsingDifferentCasesReturnsSameInstance()
diff --git a/tests/ZendX/JQuery/View/DatePickerTest.php b/tests/ZendX/JQuery/View/DatePickerTest.php
index 7b2749e0..2849c788 100644
--- a/tests/ZendX/JQuery/View/DatePickerTest.php
+++ b/tests/ZendX/JQuery/View/DatePickerTest.php
@@ -36,8 +36,8 @@ public function testShouldAppendToJqueryHelper()
         $element = $this->view->datePicker('elem1', '', ['option' => 'true']);
 
         $jquery = $this->view->jQuery()->__toString();
-        $this->assertContains('datepicker(', $jquery);
-        $this->assertContains('"option":"true"', $jquery);
+        $this->assertStringContainsString('datepicker(', $jquery);
+        $this->assertStringContainsString('"option":"true"', $jquery);
     }
 
     public function testShouldCreateInputField()
@@ -45,9 +45,9 @@ public function testShouldCreateInputField()
         $element = $this->view->datePicker('elem1', '01.01.2007');
 
         $this->assertEquals(['$("#elem1").datepicker({});'], $this->view->jQuery()->getOnLoadActions());
-        $this->assertContains('<input', $element);
-        $this->assertContains('id="elem1"', $element);
-        $this->assertContains('value="01.01.2007"', $element);
+        $this->assertStringContainsString('<input', $element);
+        $this->assertStringContainsString('id="elem1"', $element);
+        $this->assertStringContainsString('value="01.01.2007"', $element);
     }
 
     public function testDatePickerSupportsLocaleDe()
diff --git a/tests/ZendX/JQuery/View/TabContainerTest.php b/tests/ZendX/JQuery/View/TabContainerTest.php
index 5b42aaa6..db299670 100644
--- a/tests/ZendX/JQuery/View/TabContainerTest.php
+++ b/tests/ZendX/JQuery/View/TabContainerTest.php
@@ -84,7 +84,7 @@ public function testShouldAllowCaptureTabContent()
         $this->assertStringContainsString('elem2', $tabs);
         $this->assertStringContainsString('Lorem Ipsum!', $tabs);
         $this->assertStringContainsString('href="foo.html"', $tabs);
-        $this->assertNotContains('This is captured, but not displayed: contentUrl overrides this output.', $tabs);
+        $this->assertStringNotContainsString('This is captured, but not displayed: contentUrl overrides this output.', $tabs);
     }
 
     public function testShouldAllowUsingTabPane()
@@ -99,7 +99,7 @@ public function testShouldAllowUsingTabPane()
         $this->assertStringContainsString('elem2', $tabs);
         $this->assertStringContainsString('Lorem Ipsum!', $tabs);
         $this->assertStringContainsString('href="foo.html"', $tabs);
-        $this->assertNotContains('This is captured, but not displayed: contentUrl overrides this output.', $tabs);
+        $this->assertStringNotContainsString('This is captured, but not displayed: contentUrl overrides this output.', $tabs);
     }
 
     public function testPaneCaptureLockExceptionNoNestingAllowed()