Fix tests according to changed deprecation message

61 files changed, 576 insertions, 576 deletions

diff --git a/ext/mcrypt/tests/blowfish.phpt b/ext/mcrypt/tests/blowfish.phpt
index 29e6e04bbe..8b06d6ec7a 100644
--- a/ext/mcrypt/tests/blowfish.phpt
+++ b/ext/mcrypt/tests/blowfish.phpt
@@ -55,177 +55,177 @@ echo "\n", $guess, "\n";
 --EXPECTF--
 key               plain             crypt             guess             stat
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_module_open() is deprecated in %s%eblowfish.php on line %d
 0000000000000000  0000000000000000  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 4ef997456198dd78  4ef997456198dd78  OK
 FFFFFFFFFFFFFFFF  FFFFFFFFFFFFFFFF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 51866fd5b85ecb8a  51866fd5b85ecb8a  OK
 3000000000000000  1000000000000001  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 7d856f9a613063f2  7d856f9a613063f2  OK
 1111111111111111  1111111111111111  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 2466dd878b963c9d  2466dd878b963c9d  OK
 0123456789ABCDEF  1111111111111111  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 61f9c3802281b096  61f9c3802281b096  OK
 1111111111111111  0123456789ABCDEF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 7d0cc630afda1ec7  7d0cc630afda1ec7  OK
 FEDCBA9876543210  0123456789ABCDEF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 0aceab0fc6a0a28d  0aceab0fc6a0a28d  OK
 7CA110454A1A6E57  01A1D6D039776742  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 59c68245eb05282b  59c68245eb05282b  OK
 0131D9619DC1376E  5CD54CA83DEF57DA  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 b1b8cc0b250f09a0  b1b8cc0b250f09a0  OK
 07A1133E4A0B2686  0248D43806F67172  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 1730e5778bea1da4  1730e5778bea1da4  OK
 3849674C2602319E  51454B582DDF440A  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 a25e7856cf2651eb  a25e7856cf2651eb  OK
 04B915BA43FEB5B6  42FD443059577FA2  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 353882b109ce8f1a  353882b109ce8f1a  OK
 0113B970FD34F2CE  059B5E0851CF143A  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 48f4d0884c379918  48f4d0884c379918  OK
 0170F175468FB5E6  0756D8E0774761D2  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 432193b78951fc98  432193b78951fc98  OK
 43297FAD38E373FE  762514B829BF486A  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 13f04154d69d1ae5  13f04154d69d1ae5  OK
 07A7137045DA2A16  3BDD119049372802  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 2eedda93ffd39c79  2eedda93ffd39c79  OK
 04689104C2FD3B2F  26955F6835AF609A  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 d887e0393c2da6e3  d887e0393c2da6e3  OK
 37D06BB516CB7546  164D5E404F275232  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 5f99d04f5b163969  5f99d04f5b163969  OK
 1F08260D1AC2465E  6B056E18759F5CCA  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 4a057a3b24d3977b  4a057a3b24d3977b  OK
 584023641ABA6176  004BD6EF09176062  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 452031c1e4fada8e  452031c1e4fada8e  OK
 025816164629B007  480D39006EE762F2  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 7555ae39f59b87bd  7555ae39f59b87bd  OK
 49793EBC79B3258F  437540C8698F3CFA  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 53c55f9cb49fc019  53c55f9cb49fc019  OK
 4FB05E1515AB73A7  072D43A077075292  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 7a8e7bfa937e89a3  7a8e7bfa937e89a3  OK
 49E95D6D4CA229BF  02FE55778117F12A  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 cf9c5d7a4986adb5  cf9c5d7a4986adb5  OK
 018310DC409B26D6  1D9D5C5018F728C2  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 d1abb290658bc778  d1abb290658bc778  OK
 1C587F1C13924FEF  305532286D6F295A  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 55cb3774d13ef201  55cb3774d13ef201  OK
 0101010101010101  0123456789ABCDEF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 fa34ec4847b268b2  fa34ec4847b268b2  OK
 1F1F1F1F0E0E0E0E  0123456789ABCDEF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 a790795108ea3cae  a790795108ea3cae  OK
 E0FEE0FEF1FEF1FE  0123456789ABCDEF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 c39e072d9fac631d  c39e072d9fac631d  OK
 0000000000000000  FFFFFFFFFFFFFFFF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 014933e0cdaff6e4  014933e0cdaff6e4  OK
 FFFFFFFFFFFFFFFF  0000000000000000  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 f21e9a77b71c49bc  f21e9a77b71c49bc  OK
 0123456789ABCDEF  0000000000000000  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 245946885754369a  245946885754369a  OK
 FEDCBA9876543210  FFFFFFFFFFFFFFFF  
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 6b5c5a9c5d9e0a5a  6b5c5a9c5d9e0a5a  OK
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_module_open() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%eblowfish.php on line %d
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%eblowfish.php on line %d
+Deprecated: Function mcrypt_generic() is deprecated in %s%eblowfish.php on line %d
 
 6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc
diff --git a/ext/mcrypt/tests/bug35496.phpt b/ext/mcrypt/tests/bug35496.phpt
index 195ed82a79..b211b05151 100644
--- a/ext/mcrypt/tests/bug35496.phpt
+++ b/ext/mcrypt/tests/bug35496.phpt
@@ -9,12 +9,12 @@ mcrypt_generic($td, "foobar");
 mdecrypt_generic($td, "baz");
 ?>
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug35496.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%ebug35496.php on line 2
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug35496.php on line 3
+Deprecated: Function mcrypt_generic() is deprecated in %s%ebug35496.php on line 3
 
 Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug35496.php on line 3
 
-Deprecated: mdecrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug35496.php on line 4
+Deprecated: Function mdecrypt_generic() is deprecated in %s%ebug35496.php on line 4
 
 Warning: mdecrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug35496.php on line 4
diff --git a/ext/mcrypt/tests/bug37595.phpt b/ext/mcrypt/tests/bug37595.phpt
index f88832727f..a125629c03 100644
--- a/ext/mcrypt/tests/bug37595.phpt
+++ b/ext/mcrypt/tests/bug37595.phpt
diff --git a/ext/mcrypt/tests/bug41252.phpt b/ext/mcrypt/tests/bug41252.phpt
index df97bba473..3900a06fd4 100644
--- a/ext/mcrypt/tests/bug41252.phpt
+++ b/ext/mcrypt/tests/bug41252.phpt
@@ -9,9 +9,9 @@ echo mcrypt_generic($td,'aaaaaaaa');
 print "I'm alive!\n";
 ?>
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug41252.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%ebug41252.php on line 2
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug41252.php on line 3
+Deprecated: Function mcrypt_generic() is deprecated in %s%ebug41252.php on line 3
 
 Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug41252.php on line 3
 I'm alive!
diff --git a/ext/mcrypt/tests/bug43143.phpt b/ext/mcrypt/tests/bug43143.phpt
index 81f7aa4fa9..904bfb7003 100644
--- a/ext/mcrypt/tests/bug43143.phpt
+++ b/ext/mcrypt/tests/bug43143.phpt
@@ -18,10 +18,10 @@ echo "END\n";
 --EXPECTF--
 ECB
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug43143.php on line 5
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%ebug43143.php on line 5
 CFB
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug43143.php on line 9
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%ebug43143.php on line 9
 
 Warning: mcrypt_encrypt(): Encryption mode requires an initialization vector of size 32 in %sbug43143.php on line 9
 END
diff --git a/ext/mcrypt/tests/bug46010.phpt b/ext/mcrypt/tests/bug46010.phpt
index 7f8fa80bbb..fd3b4b60e5 100644
--- a/ext/mcrypt/tests/bug46010.phpt
+++ b/ext/mcrypt/tests/bug46010.phpt
@@ -12,11 +12,11 @@ var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, $key, "data", MCRYPT_MODE_ECB,
 
 ?>
 --EXPECTF--
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug46010.php on line 4
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%ebug46010.php on line 4
 string(16) "f7a2ce11d4002294"
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug46010.php on line 5
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%ebug46010.php on line 5
 string(16) "f7a2ce11d4002294"
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug46010.php on line 6
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%ebug46010.php on line 6
 string(16) "f7a2ce11d4002294"
diff --git a/ext/mcrypt/tests/bug49738.phpt b/ext/mcrypt/tests/bug49738.phpt
index 9023d78809..713f6efa15 100644
--- a/ext/mcrypt/tests/bug49738.phpt
+++ b/ext/mcrypt/tests/bug49738.phpt
@@ -10,12 +10,12 @@ Bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes)
    echo mcrypt_generic($td, 'aaaaaaaa');
 ?>
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug49738.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%ebug49738.php on line 2
 
-Deprecated: mcrypt_generic_init(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug49738.php on line 3
+Deprecated: Function mcrypt_generic_init() is deprecated in %s%ebug49738.php on line 3
 
-Deprecated: mcrypt_generic_deinit(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug49738.php on line 4
+Deprecated: Function mcrypt_generic_deinit() is deprecated in %s%ebug49738.php on line 4
 
-Deprecated: mcrypt_generic(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug49738.php on line 5
+Deprecated: Function mcrypt_generic() is deprecated in %s%ebug49738.php on line 5
 
 Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug49738.php on line 5
diff --git a/ext/mcrypt/tests/bug55169.phpt b/ext/mcrypt/tests/bug55169.phpt
index 3932a2cfd1..25d5febe06 100644
--- a/ext/mcrypt/tests/bug55169.phpt
+++ b/ext/mcrypt/tests/bug55169.phpt
@@ -17,42 +17,42 @@ for( $i=1; $i<=64; $i = $i*2 ){
 --EXPECTF--

 Input: 1

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 1

  Hex: %x

 

 Input: 2

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 2

  Hex: %x

 

 Input: 4

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 4

  Hex: %x

 

 Input: 8

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 8

  Hex: %x

 

 Input: 16

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 16

  Hex: %x

 

 Input: 32

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 32

  Hex: %x

 

 Input: 64

 

-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug55169.php on line 4

+Deprecated: Function mcrypt_create_iv() is deprecated in %s%ebug55169.php on line 4

  Length: 64

  Hex: %x

diff --git a/ext/mcrypt/tests/bug70625.phpt b/ext/mcrypt/tests/bug70625.phpt
index 83af940a4f..65ab8eb022 100644
--- a/ext/mcrypt/tests/bug70625.phpt
+++ b/ext/mcrypt/tests/bug70625.phpt
@@ -13,8 +13,8 @@ var_dump($plaintext);
 
 ?>
 --EXPECTF--
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug70625.php on line 4
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%ebug70625.php on line 4
 string(14) "d5c9a57023d0f1"
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%ebug70625.php on line 6
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%ebug70625.php on line 6
 string(7) "payload"
diff --git a/ext/mcrypt/tests/mcrypt_cbc.phpt b/ext/mcrypt/tests/mcrypt_cbc.phpt
index d5d17320d7..0b60682cef 100644
--- a/ext/mcrypt/tests/mcrypt_cbc.phpt
+++ b/ext/mcrypt/tests/mcrypt_cbc.phpt
@@ -19,16 +19,16 @@ var_dump(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CBC));
 
 ?>
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc.php on line 6
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_cbc.php on line 6
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc.php on line 6
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_cbc.php on line 6
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc.php on line 7
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc.php on line 7
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc.php on line 10
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc.php on line 10
 PHP Testfest 2008
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc.php on line 13
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc.php on line 13
 
 Warning: mcrypt_decrypt(): Encryption mode requires an initialization vector of size 16 in %s on line %d
 bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt b/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt
index 7c523e850e..b306a8a94e 100644
--- a/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt
+++ b/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt
@@ -67,26 +67,26 @@ function special_var_dump($str) {
 
 key length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 41
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 41
 
 Warning: mcrypt_decrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 41
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 41
 
 Warning: mcrypt_decrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 41
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 41
 string(32) "736563726574206d6573736167650000"
 
 key length=26
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 41
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 41
 
 Warning: mcrypt_decrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -95,19 +95,19 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 48
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 48
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 4, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 48
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 48
 string(32) "659ec947f4dc3a3b9c50de744598d3c8"
 
 iv length=9
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_decrypt.php on line 48
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cbc_3des_decrypt.php on line 48
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 9, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
diff --git a/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt b/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt
index 690b0389dd..0fea9063df 100644
--- a/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt
+++ b/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt
@@ -50,26 +50,26 @@ foreach ($ivs as $iv) {
 
 key length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 28
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 28
 
 Warning: mcrypt_encrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 28
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 28
 
 Warning: mcrypt_encrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 28
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 28
 string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
 
 key length=26
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 28
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 28
 
 Warning: mcrypt_encrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -78,19 +78,19 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 35
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 35
 
 Warning: mcrypt_encrypt(): Received initialization vector of size 4, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 35
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 35
 string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
 
 iv length=9
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cbc_3des_encrypt.php on line 35
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cbc_3des_encrypt.php on line 35
 
 Warning: mcrypt_encrypt(): Received initialization vector of size 9, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
diff --git a/ext/mcrypt/tests/mcrypt_cfb.phpt b/ext/mcrypt/tests/mcrypt_cfb.phpt
index 6996d1529c..1ff72ab2e0 100644
--- a/ext/mcrypt/tests/mcrypt_cfb.phpt
+++ b/ext/mcrypt/tests/mcrypt_cfb.phpt
@@ -18,16 +18,16 @@ echo trim(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CFB, $iv)) . "\n"
 var_dump(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CFB));
 
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cfb.php on line 6
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_cfb.php on line 6
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cfb.php on line 6
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_cfb.php on line 6
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cfb.php on line 7
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_cfb.php on line 7
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cfb.php on line 10
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cfb.php on line 10
 PHP Testfest 2008
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_cfb.php on line 13
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_cfb.php on line 13
 
 Warning: mcrypt_decrypt(): Encryption mode requires an initialization vector of size 16 in %s on line %d
 bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_create_iv.phpt b/ext/mcrypt/tests/mcrypt_create_iv.phpt
index 1ba7cc315a..6faabbf831 100644
--- a/ext/mcrypt/tests/mcrypt_create_iv.phpt
+++ b/ext/mcrypt/tests/mcrypt_create_iv.phpt
@@ -12,17 +12,17 @@ echo strlen($iv1) . "\n";
 echo strlen($iv2) . "\n";
 echo strlen($iv3) . "\n";
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_create_iv.php on line 2
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_create_iv.php on line 2
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_create_iv.php on line 2
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_create_iv.php on line 2
 
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_create_iv.php on line 3
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_create_iv.php on line 3
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_create_iv.php on line 3
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_create_iv.php on line 3
 
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_create_iv.php on line 4
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_create_iv.php on line 4
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_create_iv.php on line 4
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_create_iv.php on line 4
 16
 16
 16
diff --git a/ext/mcrypt/tests/mcrypt_decrypt.phpt b/ext/mcrypt/tests/mcrypt_decrypt.phpt
index 08bcef564e..03098f0d8e 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt.phpt
@@ -20,21 +20,21 @@ var_dump(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_CBC));
 
 var_dump(mcrypt_decrypt(MCRYPT_BLOWFISH, "FooBar", $enc_data, MCRYPT_MODE_CBC, $iv));
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt.php on line 7
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_decrypt.php on line 7
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt.php on line 7
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_decrypt.php on line 7
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt.php on line 8
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_decrypt.php on line 8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt.php on line 11
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt.php on line 11
 PHP Testfest 2008
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt.php on line 14
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt.php on line 14
 
 Warning: mcrypt_decrypt(): Encryption mode requires an initialization vector of size 16 in %s on line %d
 bool(false)
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt.php on line 16
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt.php on line 16
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 16, but size 8 is required for this encryption mode in %s on line %d
 bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt b/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt
index 7f57d1df2a..cc5996d410 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_3des_cbc.phpt
@@ -72,26 +72,26 @@ function special_var_dump($str) {
 
 key length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 44
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 44
 
 Warning: mcrypt_decrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 44
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 44
 
 Warning: mcrypt_decrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 44
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 44
 string(32) "736563726574206d6573736167650000"
 
 key length=26
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 44
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 44
 
 Warning: mcrypt_decrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -100,19 +100,19 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 51
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 51
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 4, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 51
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 51
 string(32) "659ec947f4dc3a3b9c50de744598d3c8"
 
 iv length=9
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_cbc.php on line 51
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_cbc.php on line 51
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 9, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt b/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt
index 3daecef279..e86a5650fe 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_3des_ecb.phpt
@@ -71,26 +71,26 @@ function special_var_dump($str) {
 
 key length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 43
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 43
 
 Warning: mcrypt_decrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 43
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 43
 
 Warning: mcrypt_decrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 43
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 43
 string(32) "736563726574206d6573736167650000"
 
 key length=26
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 43
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 43
 
 Warning: mcrypt_decrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -99,16 +99,16 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 50
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 50
 string(32) "a9298896ed1b7335f8f10f7ff6d7a239"
 
 iv length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 50
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 50
 string(32) "a9298896ed1b7335f8f10f7ff6d7a239"
 
 iv length=9
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_3des_ecb.php on line 50
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_3des_ecb.php on line 50
 string(32) "a9298896ed1b7335f8f10f7ff6d7a239"
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_error.phpt b/ext/mcrypt/tests/mcrypt_decrypt_error.phpt
index 8218eab90a..b99b51c96a 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_error.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_error.phpt
@@ -41,14 +41,14 @@ var_dump( mcrypt_decrypt($cipher, $key, $data) );
 
 -- Testing mcrypt_decrypt() function with more than expected no. of arguments --
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_error.php on line 19
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_error.php on line 19
 
 Warning: mcrypt_decrypt() expects at most 5 parameters, 6 given in %s on line %d
 NULL
 
 -- Testing mcrypt_decrypt() function with less than expected no. of arguments --
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_decrypt_error.php on line 26
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_decrypt_error.php on line 26
 
 Warning: mcrypt_decrypt() expects at least 4 parameters, 3 given in %s on line %d
 NULL
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt
index 16df92d94f..37fffad4d7 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_variation1.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_decrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 1--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float .5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --uppercase NULL--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase true--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase false--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, object given, %s(%d)
 NULL
 
 --undefined var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --unset var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --resource--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation1.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 1 to be string, resource given, %s(%d)
 NULL
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt
index 129074e95a..25cc371f75 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_variation2.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_decrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --int 1--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --int 12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --int -12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float 10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float -10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float .5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --empty array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --int indexed array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --associative array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --nested arrays--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --uppercase NULL--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --lowercase null--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --lowercase true--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --lowercase false--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --empty string DQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --empty string SQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, object given, %s(%d)
 string(0) ""
 
 --undefined var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --unset var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --resource--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation2.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 2 to be string, resource given, %s(%d)
 string(0) ""
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation3.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation3.phpt
index 18aa8ddc0f..caa3635986 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_variation3.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_variation3.phpt
@@ -124,112 +124,112 @@ fclose($fp);
 *** Testing mcrypt_decrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "52833a00168e547f"
 
 --int 1--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "82011a0a93098a13"
 
 --int 12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "e8b71c21b6acc162"
 
 --int -12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "db3c458e975563a8"
 
 --float 10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "6ee8764562f25913"
 
 --float -10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d63b39fd5f65678e"
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(32) "7712cc4828221be40672239d9c32e742"
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(32) "caa892cb5d28b53c2b75b1e0799427c3"
 
 --float .5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "99880c86884385d9"
 
 --empty array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --int indexed array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --associative array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --nested arrays--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --uppercase NULL--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --lowercase null--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --lowercase true--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "82011a0a93098a13"
 
 --lowercase false--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "82011a0a93098a13"
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --empty string DQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --empty string SQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(32) "46677e368bc07ef375bd580e0c4b2594"
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, object given, %s(%d)
 string(0) ""
 
 --undefined var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --unset var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 string(16) "d27689f6fd9700f4"
 
 --resource--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation3.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 3 to be string, resource given, %s(%d)
 string(0) ""
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation4.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation4.phpt
index 34bb503e98..575ed8e9d7 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_variation4.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_variation4.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_decrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 1--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float .5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --uppercase NULL--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase true--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase false--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 4 to be string, object given, %s(%d)
 NULL
 
 --undefined var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --unset var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --resource--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation4.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 4 to be string, resource given, %s(%d)
 NULL
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_decrypt_variation5.phpt b/ext/mcrypt/tests/mcrypt_decrypt_variation5.phpt
index 3af310f76f..9fd28498d1 100644
--- a/ext/mcrypt/tests/mcrypt_decrypt_variation5.phpt
+++ b/ext/mcrypt/tests/mcrypt_decrypt_variation5.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_decrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --int 1--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --int 12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --int -12345--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float 10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float -10.5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float .5--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --empty array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --int indexed array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --associative array--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --nested arrays--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --uppercase NULL--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --lowercase null--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --lowercase true--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --lowercase false--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --empty string DQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --empty string SQ--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, object given, %s(%d)
 string(0) ""
 
 --undefined var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --unset var--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --resource--
-Error: 8192 - mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_decrypt_variation5.php(107)
+Error: 8192 - Function mcrypt_decrypt() is deprecated, %s%emcrypt_decrypt_variation5.php(107)
 Error: 2 - mcrypt_decrypt() expects parameter 5 to be string, resource given, %s(%d)
 string(0) ""
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_ecb.phpt b/ext/mcrypt/tests/mcrypt_ecb.phpt
index d5b4c5502c..625d55880b 100644
--- a/ext/mcrypt/tests/mcrypt_ecb.phpt
+++ b/ext/mcrypt/tests/mcrypt_ecb.phpt
@@ -18,13 +18,13 @@ echo trim(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_ECB, $iv)) . "\n"
 mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_ECB);
 
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb.php on line 6
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_ecb.php on line 6
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb.php on line 6
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_ecb.php on line 6
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb.php on line 7
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb.php on line 7
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb.php on line 10
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb.php on line 10
 PHP Testfest 2008
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb.php on line 13
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb.php on line 13
diff --git a/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt b/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt
index 60c07fe38b..635ca25a55 100644
--- a/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt
+++ b/ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt
@@ -68,26 +68,26 @@ function special_var_dump($str) {
 
 key length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 42
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 42
 
 Warning: mcrypt_decrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 42
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 42
 
 Warning: mcrypt_decrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 42
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 42
 string(32) "736563726574206d6573736167650000"
 
 key length=26
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 42
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 42
 
 Warning: mcrypt_decrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -96,16 +96,16 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 49
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 49
 string(32) "a9298896ed1b7335f8f10f7ff6d7a239"
 
 iv length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 49
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 49
 string(32) "a9298896ed1b7335f8f10f7ff6d7a239"
 
 iv length=9
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_decrypt.php on line 49
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ecb_3des_decrypt.php on line 49
 string(32) "a9298896ed1b7335f8f10f7ff6d7a239"
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt b/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt
index 6ed16f1072..68f056c510 100644
--- a/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt
+++ b/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt
@@ -53,26 +53,26 @@ foreach ($ivs as $iv) {
 
 key length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 31
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 31
 
 Warning: mcrypt_encrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 31
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 31
 
 Warning: mcrypt_encrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 31
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 31
 string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
 
 key length=26
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 31
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 31
 
 Warning: mcrypt_encrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -81,16 +81,16 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 38
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 38
 string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165"
 
 iv length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 38
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 38
 string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165"
 
 iv length=9
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ecb_3des_encrypt.php on line 38
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_ecb_3des_encrypt.php on line 38
 string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165"
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt b/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt
index 84d64c3b98..f0ee269a35 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt
@@ -15,27 +15,27 @@ echo mcrypt_enc_get_algorithms_name($td) . "\n";
 $td  = mcrypt_module_open('des', '', 'ecb', '');
 echo mcrypt_enc_get_algorithms_name($td) . "\n";
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 2
 
-Deprecated: mcrypt_enc_get_algorithms_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 3
+Deprecated: Function mcrypt_enc_get_algorithms_name() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 3
 Rijndael-128
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 4
 
-Deprecated: mcrypt_enc_get_algorithms_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 5
+Deprecated: Function mcrypt_enc_get_algorithms_name() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 5
 Rijndael-128
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 6
 
-Deprecated: mcrypt_enc_get_algorithms_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 7
+Deprecated: Function mcrypt_enc_get_algorithms_name() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 7
 RC2
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 8
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 8
 
-Deprecated: mcrypt_enc_get_algorithms_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 9
+Deprecated: Function mcrypt_enc_get_algorithms_name() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 9
 Blowfish
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 10
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 10
 
-Deprecated: mcrypt_enc_get_algorithms_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_algorithms_name.php on line 11
+Deprecated: Function mcrypt_enc_get_algorithms_name() is deprecated in %s%emcrypt_enc_get_algorithms_name.php on line 11
 DES
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt b/ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt
index 4d19263ed4..bbdd1de44b 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt
@@ -11,17 +11,17 @@ var_dump(mcrypt_enc_get_block_size($td));
 $td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
 var_dump(mcrypt_enc_get_block_size($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_block_size.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_block_size.php on line 2
 
-Deprecated: mcrypt_enc_get_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_block_size.php on line 3
+Deprecated: Function mcrypt_enc_get_block_size() is deprecated in %s%emcrypt_enc_get_block_size.php on line 3
 int(32)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_block_size.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_block_size.php on line 4
 
-Deprecated: mcrypt_enc_get_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_block_size.php on line 5
+Deprecated: Function mcrypt_enc_get_block_size() is deprecated in %s%emcrypt_enc_get_block_size.php on line 5
 int(8)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_block_size.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_block_size.php on line 6
 
-Deprecated: mcrypt_enc_get_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_block_size.php on line 7
+Deprecated: Function mcrypt_enc_get_block_size() is deprecated in %s%emcrypt_enc_get_block_size.php on line 7
 int(1)
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_iv_size.phpt b/ext/mcrypt/tests/mcrypt_enc_get_iv_size.phpt
index 7f38d8f8cb..f48a870035 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_iv_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_iv_size.phpt
@@ -11,17 +11,17 @@ var_dump(mcrypt_enc_get_iv_size($td));
 $td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
 var_dump(mcrypt_enc_get_iv_size($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_iv_size.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_iv_size.php on line 2
 
-Deprecated: mcrypt_enc_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_iv_size.php on line 3
+Deprecated: Function mcrypt_enc_get_iv_size() is deprecated in %s%emcrypt_enc_get_iv_size.php on line 3
 int(32)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_iv_size.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_iv_size.php on line 4
 
-Deprecated: mcrypt_enc_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_iv_size.php on line 5
+Deprecated: Function mcrypt_enc_get_iv_size() is deprecated in %s%emcrypt_enc_get_iv_size.php on line 5
 int(8)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_iv_size.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_iv_size.php on line 6
 
-Deprecated: mcrypt_enc_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_iv_size.php on line 7
+Deprecated: Function mcrypt_enc_get_iv_size() is deprecated in %s%emcrypt_enc_get_iv_size.php on line 7
 int(0)
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_key_size.phpt b/ext/mcrypt/tests/mcrypt_enc_get_key_size.phpt
index 1e8160cee0..08a8e0baf0 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_key_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_key_size.phpt
@@ -11,17 +11,17 @@ var_dump(mcrypt_enc_get_key_size($td));
 $td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
 var_dump(mcrypt_enc_get_key_size($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_key_size.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_key_size.php on line 2
 
-Deprecated: mcrypt_enc_get_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_key_size.php on line 3
+Deprecated: Function mcrypt_enc_get_key_size() is deprecated in %s%emcrypt_enc_get_key_size.php on line 3
 int(32)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_key_size.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_key_size.php on line 4
 
-Deprecated: mcrypt_enc_get_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_key_size.php on line 5
+Deprecated: Function mcrypt_enc_get_key_size() is deprecated in %s%emcrypt_enc_get_key_size.php on line 5
 int(24)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_key_size.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_key_size.php on line 6
 
-Deprecated: mcrypt_enc_get_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_key_size.php on line 7
+Deprecated: Function mcrypt_enc_get_key_size() is deprecated in %s%emcrypt_enc_get_key_size.php on line 7
 int(32)
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_mode_name.phpt b/ext/mcrypt/tests/mcrypt_enc_get_mode_name.phpt
index e344ea39c0..7abdd78d5c 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_mode_name.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_mode_name.phpt
@@ -17,32 +17,32 @@ echo mcrypt_enc_get_modes_name($td) . "\n";
 $td  = mcrypt_module_open('des', '', 'cbc', '');
 echo mcrypt_enc_get_modes_name($td) . "\n";
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 2
 
-Deprecated: mcrypt_enc_get_modes_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 3
+Deprecated: Function mcrypt_enc_get_modes_name() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 3
 ECB
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 4
 
-Deprecated: mcrypt_enc_get_modes_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 5
+Deprecated: Function mcrypt_enc_get_modes_name() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 5
 CBC
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 6
 
-Deprecated: mcrypt_enc_get_modes_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 7
+Deprecated: Function mcrypt_enc_get_modes_name() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 7
 STREAM
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 8
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 8
 
-Deprecated: mcrypt_enc_get_modes_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 9
+Deprecated: Function mcrypt_enc_get_modes_name() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 9
 OFB
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 10
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 10
 
-Deprecated: mcrypt_enc_get_modes_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 11
+Deprecated: Function mcrypt_enc_get_modes_name() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 11
 ECB
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 12
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 12
 
-Deprecated: mcrypt_enc_get_modes_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_mode_name.php on line 13
+Deprecated: Function mcrypt_enc_get_modes_name() is deprecated in %s%emcrypt_enc_get_mode_name.php on line 13
 CBC
diff --git a/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt b/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt
index 49752cf983..8cde780d9e 100644
--- a/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt
@@ -8,9 +8,9 @@ $td  = mcrypt_module_open('rijndael-256', '', 'ecb', '');
 $var = mcrypt_enc_get_supported_key_sizes($td);
 var_dump($var);
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_supported_key_sizes.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_get_supported_key_sizes.php on line 2
 
-Deprecated: mcrypt_enc_get_supported_key_sizes(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_get_supported_key_sizes.php on line 3
+Deprecated: Function mcrypt_enc_get_supported_key_sizes() is deprecated in %s%emcrypt_enc_get_supported_key_sizes.php on line 3
 array(3) {
   [0]=>
   int(16)
diff --git a/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm.phpt b/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm.phpt
index 8dc00f637c..fbc86550f9 100644
--- a/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm.phpt
@@ -11,17 +11,17 @@ var_dump(mcrypt_enc_is_block_algorithm($td));
 $td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
 var_dump(mcrypt_enc_is_block_algorithm($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_algorithm.php on line 2
 
-Deprecated: mcrypt_enc_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm.php on line 3
+Deprecated: Function mcrypt_enc_is_block_algorithm() is deprecated in %s%emcrypt_enc_is_block_algorithm.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_algorithm.php on line 4
 
-Deprecated: mcrypt_enc_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm.php on line 5
+Deprecated: Function mcrypt_enc_is_block_algorithm() is deprecated in %s%emcrypt_enc_is_block_algorithm.php on line 5
 bool(true)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_algorithm.php on line 6
 
-Deprecated: mcrypt_enc_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm.php on line 7
+Deprecated: Function mcrypt_enc_is_block_algorithm() is deprecated in %s%emcrypt_enc_is_block_algorithm.php on line 7
 bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm_mode.phpt b/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm_mode.phpt
index b2f3830758..181ca49600 100644
--- a/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_is_block_algorithm_mode.phpt
@@ -11,17 +11,17 @@ var_dump(mcrypt_enc_is_block_algorithm_mode($td));
 $td = mcrypt_module_open(MCRYPT_WAKE, '',  MCRYPT_MODE_STREAM, '');
 var_dump(mcrypt_enc_is_block_algorithm_mode($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm_mode.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_algorithm_mode.php on line 2
 
-Deprecated: mcrypt_enc_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm_mode.php on line 3
+Deprecated: Function mcrypt_enc_is_block_algorithm_mode() is deprecated in %s%emcrypt_enc_is_block_algorithm_mode.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm_mode.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_algorithm_mode.php on line 4
 
-Deprecated: mcrypt_enc_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm_mode.php on line 5
+Deprecated: Function mcrypt_enc_is_block_algorithm_mode() is deprecated in %s%emcrypt_enc_is_block_algorithm_mode.php on line 5
 bool(true)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm_mode.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_algorithm_mode.php on line 6
 
-Deprecated: mcrypt_enc_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_algorithm_mode.php on line 7
+Deprecated: Function mcrypt_enc_is_block_algorithm_mode() is deprecated in %s%emcrypt_enc_is_block_algorithm_mode.php on line 7
 bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt b/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt
index e3d7292733..e59d11dde4 100644
--- a/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt
@@ -13,22 +13,22 @@ var_dump(mcrypt_enc_is_block_mode($td));
 $td = mcrypt_module_open(MCRYPT_WAKE, '', MCRYPT_MODE_STREAM, '');
 var_dump(mcrypt_enc_is_block_mode($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 2
 
-Deprecated: mcrypt_enc_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 3
+Deprecated: Function mcrypt_enc_is_block_mode() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 4
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 4
 
-Deprecated: mcrypt_enc_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 5
+Deprecated: Function mcrypt_enc_is_block_mode() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 5
 bool(true)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 6
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 6
 
-Deprecated: mcrypt_enc_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 7
+Deprecated: Function mcrypt_enc_is_block_mode() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 7
 bool(false)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 8
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 8
 
-Deprecated: mcrypt_enc_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_is_block_mode.php on line 9
+Deprecated: Function mcrypt_enc_is_block_mode() is deprecated in %s%emcrypt_enc_is_block_mode.php on line 9
 bool(false)
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_enc_self_test.phpt b/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
index 55e9e9759e..2297b969c1 100644
--- a/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
+++ b/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
@@ -7,7 +7,7 @@ mcrypt_enc_self_test
 $td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
 var_dump(mcrypt_enc_self_test($td));
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_self_test.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_enc_self_test.php on line 2
 
-Deprecated: mcrypt_enc_self_test(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_enc_self_test.php on line 3
+Deprecated: Function mcrypt_enc_self_test() is deprecated in %s%emcrypt_enc_self_test.php on line 3
 int(0)
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt b/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt
index 05fc1153c6..15b3c886fa 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt
@@ -65,26 +65,26 @@ foreach ($ivs as $iv) {
 
 key length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 40
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 40
 
 Warning: mcrypt_encrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 40
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 40
 
 Warning: mcrypt_encrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 40
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 40
 string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
 
 key length=26
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 40
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 40
 
 Warning: mcrypt_encrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -93,19 +93,19 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 47
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 47
 
 Warning: mcrypt_encrypt(): Received initialization vector of size 4, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 47
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 47
 string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac"
 
 iv length=9
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_cbc.php on line 47
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_cbc.php on line 47
 
 Warning: mcrypt_encrypt(): Received initialization vector of size 9, but size 8 is required for this encryption mode in %s on line %d
 string(0) ""
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt b/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt
index 117b6c13f1..ffcabf8f5f 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt
@@ -57,26 +57,26 @@ foreach ($ivs as $iv) {
 
 key length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 25
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 25
 
 Warning: mcrypt_encrypt(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=20
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 25
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 25
 
 Warning: mcrypt_encrypt(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 25
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 25
 string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
 
 key length=26
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 25
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 25
 
 Warning: mcrypt_encrypt(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d
 string(0) ""
@@ -85,16 +85,16 @@ string(0) ""
 
 iv length=4
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 39
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 39
 string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
 
 iv length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 39
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 39
 string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
 
 iv length=9
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_3des_ecb.php on line 39
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_3des_ecb.php on line 39
 string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27"
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_error.phpt b/ext/mcrypt/tests/mcrypt_encrypt_error.phpt
index 2896cf7195..98775d317b 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_error.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_error.phpt
@@ -41,14 +41,14 @@ var_dump( mcrypt_encrypt($cipher, $key, $data) );
 
 -- Testing mcrypt_encrypt() function with more than expected no. of arguments --
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_error.php on line 19
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_error.php on line 19
 
 Warning: mcrypt_encrypt() expects at most 5 parameters, 6 given in %s on line %d
 NULL
 
 -- Testing mcrypt_encrypt() function with less than expected no. of arguments --
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_encrypt_error.php on line 26
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_encrypt_error.php on line 26
 
 Warning: mcrypt_encrypt() expects at least 4 parameters, 3 given in %s on line %d
 NULL
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt
index 7fb9ad1161..88b6edef3d 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation1.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_encrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 1--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float .5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, array given, %s(%d)
 NULL
 
 --uppercase NULL--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase true--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase false--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, object given, %s(%d)
 NULL
 
 --undefined var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --unset var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --resource--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation1.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation1.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 1 to be string, resource given, %s(%d)
 NULL
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt
index 21382dde26..fa0cd81665 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation2.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_encrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --int 1--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --int 12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --int -12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float 10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float -10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --float .5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --empty array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --int indexed array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --associative array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --nested arrays--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, array given, %s(%d)
 string(0) ""
 
 --uppercase NULL--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --lowercase null--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --lowercase true--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --lowercase false--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --empty string DQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --empty string SQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, object given, %s(%d)
 string(0) ""
 
 --undefined var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --unset var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d)
 string(0) ""
 
 --resource--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation2.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation2.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 2 to be string, resource given, %s(%d)
 string(0) ""
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt
index e2bb2400e6..17698d20d9 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation3.phpt
@@ -124,112 +124,112 @@ fclose($fp);
 *** Testing mcrypt_encrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "51dc9cd9179b718b"
 
 --int 1--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "619c335f8c4f9cbf"
 
 --int 12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "b1258d67ab73de00"
 
 --int -12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "8eecf134443bd6b9"
 
 --float 10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "34b5750a793baff5"
 
 --float -10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "7a605f2aacc8a11d"
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(32) "74a0d7026ae586f476d4b17808851e86"
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(32) "bfb155997017986c01090afebd62c7ca"
 
 --float .5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "cc60ac201164b6c7"
 
 --empty array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --int indexed array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --associative array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --nested arrays--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, array given, %s(%d)
 string(0) ""
 
 --uppercase NULL--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --lowercase null--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --lowercase true--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "619c335f8c4f9cbf"
 
 --lowercase false--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "619c335f8c4f9cbf"
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --empty string DQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --empty string SQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(32) "749c3b4d16731d98370128754b7c930f"
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, object given, %s(%d)
 string(0) ""
 
 --undefined var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --unset var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 string(16) "6ece228c41457539"
 
 --resource--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation3.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation3.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 3 to be string, resource given, %s(%d)
 string(0) ""
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation4.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation4.phpt
index a5e52f3fe2..363defdcf0 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation4.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation4.phpt
@@ -124,132 +124,132 @@ fclose($fp);
 *** Testing mcrypt_encrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 1--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --float .5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 4 to be string, array given, %s(%d)
 NULL
 
 --uppercase NULL--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase true--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --lowercase false--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 4 to be string, object given, %s(%d)
 NULL
 
 --undefined var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --unset var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt(): Module initialization failed, %s(%d)
 bool(false)
 
 --resource--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation4.php(107)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation4.php(107)
 Error: 2 - mcrypt_encrypt() expects parameter 4 to be string, resource given, %s(%d)
 NULL
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt b/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt
index 86cfd8879e..7ad6dd5f9a 100644
--- a/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt
+++ b/ext/mcrypt/tests/mcrypt_encrypt_variation5.phpt
@@ -125,132 +125,132 @@ fclose($fp);
 *** Testing mcrypt_encrypt() : usage variation ***
 
 --int 0--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --int 1--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --int 12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --int -12345--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float 10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float -10.5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float 12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float -12.3456789000e10--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --float .5--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --empty array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --int indexed array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --associative array--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --nested arrays--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, array given, %s(%d)
 string(0) ""
 
 --uppercase NULL--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --lowercase null--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --lowercase true--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --lowercase false--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --uppercase TRUE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --uppercase FALSE--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --empty string DQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --empty string SQ--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --instance of classWithToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --instance of classWithoutToString--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, object given, %s(%d)
 string(0) ""
 
 --undefined var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --unset var--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d)
 string(0) ""
 
 --resource--
-Error: 8192 - mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead, %s%emcrypt_encrypt_variation5.php(108)
+Error: 8192 - Function mcrypt_encrypt() is deprecated, %s%emcrypt_encrypt_variation5.php(108)
 Error: 2 - mcrypt_encrypt() expects parameter 5 to be string, resource given, %s(%d)
 string(0) ""
 ===DONE===
diff --git a/ext/mcrypt/tests/mcrypt_get_block_size.phpt b/ext/mcrypt/tests/mcrypt_get_block_size.phpt
index 9c60e7b73b..9028b22668 100644
--- a/ext/mcrypt/tests/mcrypt_get_block_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_get_block_size.phpt
@@ -8,11 +8,11 @@ var_dump(mcrypt_get_block_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC));
 var_dump(mcrypt_get_block_size(MCRYPT_3DES, MCRYPT_MODE_CBC));
 var_dump(mcrypt_get_block_size(MCRYPT_WAKE, MCRYPT_MODE_STREAM));
 --EXPECTF--
-Deprecated: mcrypt_get_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_block_size.php on line 2
+Deprecated: Function mcrypt_get_block_size() is deprecated in %s%emcrypt_get_block_size.php on line 2
 int(32)
 
-Deprecated: mcrypt_get_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_block_size.php on line 3
+Deprecated: Function mcrypt_get_block_size() is deprecated in %s%emcrypt_get_block_size.php on line 3
 int(8)
 
-Deprecated: mcrypt_get_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_block_size.php on line 4
+Deprecated: Function mcrypt_get_block_size() is deprecated in %s%emcrypt_get_block_size.php on line 4
 int(1)
diff --git a/ext/mcrypt/tests/mcrypt_get_cipher_name.phpt b/ext/mcrypt/tests/mcrypt_get_cipher_name.phpt
index f5216d6c59..6d46fe1bf2 100644
--- a/ext/mcrypt/tests/mcrypt_get_cipher_name.phpt
+++ b/ext/mcrypt/tests/mcrypt_get_cipher_name.phpt
@@ -9,14 +9,14 @@ echo mcrypt_get_cipher_name(MCRYPT_RC2) . "\n";
 echo mcrypt_get_cipher_name(MCRYPT_ARCFOUR) . "\n";
 echo mcrypt_get_cipher_name(MCRYPT_WAKE) . "\n";
 --EXPECTF--
-Deprecated: mcrypt_get_cipher_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_cipher_name.php on line 2
+Deprecated: Function mcrypt_get_cipher_name() is deprecated in %s%emcrypt_get_cipher_name.php on line 2
 Rijndael-256
 
-Deprecated: mcrypt_get_cipher_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_cipher_name.php on line 3
+Deprecated: Function mcrypt_get_cipher_name() is deprecated in %s%emcrypt_get_cipher_name.php on line 3
 RC2
 
-Deprecated: mcrypt_get_cipher_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_cipher_name.php on line 4
+Deprecated: Function mcrypt_get_cipher_name() is deprecated in %s%emcrypt_get_cipher_name.php on line 4
 RC4
 
-Deprecated: mcrypt_get_cipher_name(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_cipher_name.php on line 5
+Deprecated: Function mcrypt_get_cipher_name() is deprecated in %s%emcrypt_get_cipher_name.php on line 5
 WAKE
diff --git a/ext/mcrypt/tests/mcrypt_get_iv_size.phpt b/ext/mcrypt/tests/mcrypt_get_iv_size.phpt
index 758d3df24b..ac3e4148cd 100644
--- a/ext/mcrypt/tests/mcrypt_get_iv_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_get_iv_size.phpt
@@ -9,16 +9,16 @@ var_dump(mcrypt_get_iv_size(MCRYPT_3DES, MCRYPT_MODE_CBC));
 var_dump(mcrypt_get_iv_size(MCRYPT_WAKE, MCRYPT_MODE_STREAM));
 var_dump(mcrypt_get_iv_size(MCRYPT_XTEA, MCRYPT_MODE_STREAM));
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_iv_size.php on line 2
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_get_iv_size.php on line 2
 int(32)
 
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_iv_size.php on line 3
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_get_iv_size.php on line 3
 int(8)
 
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_iv_size.php on line 4
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_get_iv_size.php on line 4
 int(0)
 
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_iv_size.php on line 5
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_get_iv_size.php on line 5
 
 Warning: mcrypt_get_iv_size(): Module initialization failed in %s on line %d
 bool(false)
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_get_key_size.phpt b/ext/mcrypt/tests/mcrypt_get_key_size.phpt
index 4e86211889..7958efc2f3 100644
--- a/ext/mcrypt/tests/mcrypt_get_key_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_get_key_size.phpt
@@ -8,11 +8,11 @@ var_dump(mcrypt_get_key_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC));
 var_dump(mcrypt_get_key_size(MCRYPT_3DES, MCRYPT_MODE_CBC));
 var_dump(mcrypt_get_key_size(MCRYPT_WAKE, MCRYPT_MODE_STREAM));
 --EXPECTF--
-Deprecated: mcrypt_get_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_key_size.php on line 2
+Deprecated: Function mcrypt_get_key_size() is deprecated in %s%emcrypt_get_key_size.php on line 2
 int(32)
 
-Deprecated: mcrypt_get_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_key_size.php on line 3
+Deprecated: Function mcrypt_get_key_size() is deprecated in %s%emcrypt_get_key_size.php on line 3
 int(24)
 
-Deprecated: mcrypt_get_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_get_key_size.php on line 4
+Deprecated: Function mcrypt_get_key_size() is deprecated in %s%emcrypt_get_key_size.php on line 4
 int(32)
diff --git a/ext/mcrypt/tests/mcrypt_list_algorithms.phpt b/ext/mcrypt/tests/mcrypt_list_algorithms.phpt
index 1c96235c21..6a7bfd7c70 100644
--- a/ext/mcrypt/tests/mcrypt_list_algorithms.phpt
+++ b/ext/mcrypt/tests/mcrypt_list_algorithms.phpt
@@ -10,7 +10,7 @@ foreach (mcrypt_list_algorithms() as $algo) {
 	}
 }
 --EXPECTF--
-Deprecated: mcrypt_list_algorithms(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_list_algorithms.php on line 2
+Deprecated: Function mcrypt_list_algorithms() is deprecated in %s%emcrypt_list_algorithms.php on line 2
 FOUND
 FOUND
 FOUND
diff --git a/ext/mcrypt/tests/mcrypt_list_modes.phpt b/ext/mcrypt/tests/mcrypt_list_modes.phpt
index 721c2e69c7..8cebbcbb0c 100644
--- a/ext/mcrypt/tests/mcrypt_list_modes.phpt
+++ b/ext/mcrypt/tests/mcrypt_list_modes.phpt
@@ -6,7 +6,7 @@ mcrypt_list_modes
 <?php
 var_dump(mcrypt_list_modes());
 --EXPECTF--
-Deprecated: mcrypt_list_modes(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_list_modes.php on line 2
+Deprecated: Function mcrypt_list_modes() is deprecated in %s%emcrypt_list_modes.php on line 2
 array(8) {
   [0]=>
   string(3) "cbc"
diff --git a/ext/mcrypt/tests/mcrypt_module_get_algo_block_size.phpt b/ext/mcrypt/tests/mcrypt_module_get_algo_block_size.phpt
index 8e6a72c36b..2ed4dbb7fd 100644
--- a/ext/mcrypt/tests/mcrypt_module_get_algo_block_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_get_algo_block_size.phpt
@@ -12,20 +12,20 @@ var_dump(mcrypt_module_get_algo_block_size(MCRYPT_CAST_256));
 var_dump(mcrypt_module_get_algo_block_size(MCRYPT_BLOWFISH));
 ?>
 --EXPECTF--
-Deprecated: mcrypt_module_get_algo_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_block_size.php on line 2
+Deprecated: Function mcrypt_module_get_algo_block_size() is deprecated in %s%emcrypt_module_get_algo_block_size.php on line 2
 int(32)
 
-Deprecated: mcrypt_module_get_algo_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_block_size.php on line 3
+Deprecated: Function mcrypt_module_get_algo_block_size() is deprecated in %s%emcrypt_module_get_algo_block_size.php on line 3
 int(24)
 
-Deprecated: mcrypt_module_get_algo_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_block_size.php on line 4
+Deprecated: Function mcrypt_module_get_algo_block_size() is deprecated in %s%emcrypt_module_get_algo_block_size.php on line 4
 int(8)
 
-Deprecated: mcrypt_module_get_algo_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_block_size.php on line 5
+Deprecated: Function mcrypt_module_get_algo_block_size() is deprecated in %s%emcrypt_module_get_algo_block_size.php on line 5
 int(8)
 
-Deprecated: mcrypt_module_get_algo_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_block_size.php on line 6
+Deprecated: Function mcrypt_module_get_algo_block_size() is deprecated in %s%emcrypt_module_get_algo_block_size.php on line 6
 int(16)
 
-Deprecated: mcrypt_module_get_algo_block_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_block_size.php on line 7
+Deprecated: Function mcrypt_module_get_algo_block_size() is deprecated in %s%emcrypt_module_get_algo_block_size.php on line 7
 int(8)
diff --git a/ext/mcrypt/tests/mcrypt_module_get_algo_key_size.phpt b/ext/mcrypt/tests/mcrypt_module_get_algo_key_size.phpt
index b00b267e62..5ab791d772 100644
--- a/ext/mcrypt/tests/mcrypt_module_get_algo_key_size.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_get_algo_key_size.phpt
@@ -12,20 +12,20 @@ var_dump(mcrypt_module_get_algo_key_size(MCRYPT_CAST_256));
 var_dump(mcrypt_module_get_algo_key_size(MCRYPT_BLOWFISH));
 ?>
 --EXPECTF--
-Deprecated: mcrypt_module_get_algo_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_key_size.php on line 2
+Deprecated: Function mcrypt_module_get_algo_key_size() is deprecated in %s%emcrypt_module_get_algo_key_size.php on line 2
 int(32)
 
-Deprecated: mcrypt_module_get_algo_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_key_size.php on line 3
+Deprecated: Function mcrypt_module_get_algo_key_size() is deprecated in %s%emcrypt_module_get_algo_key_size.php on line 3
 int(32)
 
-Deprecated: mcrypt_module_get_algo_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_key_size.php on line 4
+Deprecated: Function mcrypt_module_get_algo_key_size() is deprecated in %s%emcrypt_module_get_algo_key_size.php on line 4
 int(128)
 
-Deprecated: mcrypt_module_get_algo_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_key_size.php on line 5
+Deprecated: Function mcrypt_module_get_algo_key_size() is deprecated in %s%emcrypt_module_get_algo_key_size.php on line 5
 int(16)
 
-Deprecated: mcrypt_module_get_algo_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_key_size.php on line 6
+Deprecated: Function mcrypt_module_get_algo_key_size() is deprecated in %s%emcrypt_module_get_algo_key_size.php on line 6
 int(32)
 
-Deprecated: mcrypt_module_get_algo_key_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_algo_key_size.php on line 7
+Deprecated: Function mcrypt_module_get_algo_key_size() is deprecated in %s%emcrypt_module_get_algo_key_size.php on line 7
 int(56)
diff --git a/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt b/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt
index 93b4a32504..c850784b8a 100644
--- a/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt
@@ -7,7 +7,7 @@ mcrypt_module_get_supported_key_sizes
 var_dump(mcrypt_module_get_supported_key_sizes(MCRYPT_RIJNDAEL_256));
 var_dump(mcrypt_module_get_supported_key_sizes(MCRYPT_RC2));
 --EXPECTF--
-Deprecated: mcrypt_module_get_supported_key_sizes(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_supported_key_sizes.php on line 2
+Deprecated: Function mcrypt_module_get_supported_key_sizes() is deprecated in %s%emcrypt_module_get_supported_key_sizes.php on line 2
 array(3) {
   [0]=>
   int(16)
@@ -17,6 +17,6 @@ array(3) {
   int(32)
 }
 
-Deprecated: mcrypt_module_get_supported_key_sizes(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_get_supported_key_sizes.php on line 3
+Deprecated: Function mcrypt_module_get_supported_key_sizes() is deprecated in %s%emcrypt_module_get_supported_key_sizes.php on line 3
 array(0) {
 }
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt
index aebcad77d7..27b965b41f 100644
--- a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt
@@ -9,14 +9,14 @@ var_dump(mcrypt_module_is_block_algorithm(MCRYPT_DES));
 var_dump(mcrypt_module_is_block_algorithm(MCRYPT_WAKE));
 var_dump(mcrypt_module_is_block_algorithm(MCRYPT_XTEA));
 --EXPECTF--
-Deprecated: mcrypt_module_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm.php on line 2
+Deprecated: Function mcrypt_module_is_block_algorithm() is deprecated in %s%emcrypt_module_is_block_algorithm.php on line 2
 bool(true)
 
-Deprecated: mcrypt_module_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm.php on line 3
+Deprecated: Function mcrypt_module_is_block_algorithm() is deprecated in %s%emcrypt_module_is_block_algorithm.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm.php on line 4
+Deprecated: Function mcrypt_module_is_block_algorithm() is deprecated in %s%emcrypt_module_is_block_algorithm.php on line 4
 bool(false)
 
-Deprecated: mcrypt_module_is_block_algorithm(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm.php on line 5
+Deprecated: Function mcrypt_module_is_block_algorithm() is deprecated in %s%emcrypt_module_is_block_algorithm.php on line 5
 bool(true)
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt
index 3f00a917b9..57d06f4df7 100644
--- a/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt
@@ -9,14 +9,14 @@ var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_ECB));
 var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_STREAM));
 var_dump(mcrypt_module_is_block_algorithm_mode(MCRYPT_MODE_OFB));
 --EXPECTF--
-Deprecated: mcrypt_module_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm_mode.php on line 2
+Deprecated: Function mcrypt_module_is_block_algorithm_mode() is deprecated in %s%emcrypt_module_is_block_algorithm_mode.php on line 2
 bool(true)
 
-Deprecated: mcrypt_module_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm_mode.php on line 3
+Deprecated: Function mcrypt_module_is_block_algorithm_mode() is deprecated in %s%emcrypt_module_is_block_algorithm_mode.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm_mode.php on line 4
+Deprecated: Function mcrypt_module_is_block_algorithm_mode() is deprecated in %s%emcrypt_module_is_block_algorithm_mode.php on line 4
 bool(false)
 
-Deprecated: mcrypt_module_is_block_algorithm_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_algorithm_mode.php on line 5
+Deprecated: Function mcrypt_module_is_block_algorithm_mode() is deprecated in %s%emcrypt_module_is_block_algorithm_mode.php on line 5
 bool(true)
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt b/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt
index dd6b9826ee..117c1dd593 100644
--- a/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt
@@ -10,17 +10,17 @@ var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_STREAM));
 var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_NOFB));
 var_dump(mcrypt_module_is_block_mode(MCRYPT_MODE_OFB));
 --EXPECTF--
-Deprecated: mcrypt_module_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_mode.php on line 2
+Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_module_is_block_mode.php on line 2
 bool(true)
 
-Deprecated: mcrypt_module_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_mode.php on line 3
+Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_module_is_block_mode.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_mode.php on line 4
+Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_module_is_block_mode.php on line 4
 bool(false)
 
-Deprecated: mcrypt_module_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_mode.php on line 5
+Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_module_is_block_mode.php on line 5
 bool(false)
 
-Deprecated: mcrypt_module_is_block_mode(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_is_block_mode.php on line 6
+Deprecated: Function mcrypt_module_is_block_mode() is deprecated in %s%emcrypt_module_is_block_mode.php on line 6
 bool(false)
\ No newline at end of file
diff --git a/ext/mcrypt/tests/mcrypt_module_open.phpt b/ext/mcrypt/tests/mcrypt_module_open.phpt
index 7d5db16662..f8a10616a3 100644
--- a/ext/mcrypt/tests/mcrypt_module_open.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_open.phpt
@@ -8,10 +8,10 @@ var_dump(mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, ''));
 mcrypt_module_open('', '', '', '');
 
 --EXPECTF--
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_open.php on line 2
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_module_open.php on line 2
 resource(%d) of type (mcrypt)
 
-Deprecated: mcrypt_module_open(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_open.php on line 3
+Deprecated: Function mcrypt_module_open() is deprecated in %s%emcrypt_module_open.php on line 3
 
 Warning: mcrypt_module_open(): Could not open encryption module in %s on line %d
 
diff --git a/ext/mcrypt/tests/mcrypt_module_self_test.phpt b/ext/mcrypt/tests/mcrypt_module_self_test.phpt
index e76f242878..aa53c32173 100644
--- a/ext/mcrypt/tests/mcrypt_module_self_test.phpt
+++ b/ext/mcrypt/tests/mcrypt_module_self_test.phpt
@@ -8,11 +8,11 @@ var_dump(mcrypt_module_self_test(MCRYPT_RIJNDAEL_128));
 var_dump(mcrypt_module_self_test(MCRYPT_RC2));
 var_dump(mcrypt_module_self_test(''));
 --EXPECTF--
-Deprecated: mcrypt_module_self_test(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_self_test.php on line 2
+Deprecated: Function mcrypt_module_self_test() is deprecated in %s%emcrypt_module_self_test.php on line 2
 bool(true)
 
-Deprecated: mcrypt_module_self_test(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_self_test.php on line 3
+Deprecated: Function mcrypt_module_self_test() is deprecated in %s%emcrypt_module_self_test.php on line 3
 bool(true)
 
-Deprecated: mcrypt_module_self_test(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_module_self_test.php on line 4
+Deprecated: Function mcrypt_module_self_test() is deprecated in %s%emcrypt_module_self_test.php on line 4
 bool(false)
diff --git a/ext/mcrypt/tests/mcrypt_ofb.phpt b/ext/mcrypt/tests/mcrypt_ofb.phpt
index 78f88e9f8a..76f7fe61c8 100644
--- a/ext/mcrypt/tests/mcrypt_ofb.phpt
+++ b/ext/mcrypt/tests/mcrypt_ofb.phpt
@@ -18,15 +18,15 @@ echo trim(mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_OFB, $iv)) . "\n"
 mcrypt_decrypt($cipher, $key, $enc_data, MCRYPT_MODE_OFB);
 
 --EXPECTF--
-Deprecated: mcrypt_get_iv_size(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ofb.php on line 6
+Deprecated: Function mcrypt_get_iv_size() is deprecated in %s%emcrypt_ofb.php on line 6
 
-Deprecated: mcrypt_create_iv(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ofb.php on line 6
+Deprecated: Function mcrypt_create_iv() is deprecated in %s%emcrypt_ofb.php on line 6
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ofb.php on line 7
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ofb.php on line 7
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ofb.php on line 10
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ofb.php on line 10
 PHP Testfest 2008
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_ofb.php on line 13
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_ofb.php on line 13
 
 Warning: mcrypt_decrypt(): Encryption mode requires an initialization vector of size 16 in %s on line %d
diff --git a/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt b/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt
index de86aca0d9..d9e7d96bbc 100644
--- a/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt
+++ b/ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt
@@ -72,61 +72,61 @@ foreach ($ivs as $iv) {
 
 key length=0
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 45
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45
 
 Warning: mcrypt_encrypt(): Key of size 0 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
 key length=0
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 45
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45
 
 Warning: mcrypt_encrypt(): Key of size 0 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
 key length=8
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 45
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45
 
 Warning: mcrypt_encrypt(): Key of size 8 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
 key length=16
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 45
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 45
 string(128) "dc8f957ec530acf10cd95ba7da7b6405380fe19a2941e9a8de54680512f18491bc374e5464885ae6c2ae2aa7a6cdd2fbe12a06bbc4bd59dbbfaa15f09044f101"
 
 --- testing different iv lengths
 
 iv length=0
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 53
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 0, but size 16 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=0
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 53
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 0, but size 16 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=8
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 53
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 8, but size 16 is required for this encryption mode in %s on line %d
 string(0) ""
 
 iv length=16
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 53
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53
 string(32) "42adc8c0db19473f2c684ff2d6e828a5"
 
 iv length=17
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_128BitKey.php on line 53
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_128BitKey.php on line 53
 
 Warning: mcrypt_decrypt(): Received initialization vector of size 17, but size 16 is required for this encryption mode in %s on line %d
 string(0) ""
diff --git a/ext/mcrypt/tests/mcrypt_rijndael128_256BitKey.phpt b/ext/mcrypt/tests/mcrypt_rijndael128_256BitKey.phpt
index 5509e69065..7fef8af36d 100644
--- a/ext/mcrypt/tests/mcrypt_rijndael128_256BitKey.phpt
+++ b/ext/mcrypt/tests/mcrypt_rijndael128_256BitKey.phpt
@@ -63,52 +63,52 @@ foreach ($keys as $key) {
 
 key length=20
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 43
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 43
 
 Warning: mcrypt_encrypt(): Key of size 20 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 45
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 45
 
 Warning: mcrypt_decrypt(): Key of size 20 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
 key length=24
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 43
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 43
 string(128) "8ecdf1ed5742aff16ef34c819c8d22c707c54f4d9ffc18e5f6ab79fe68c25705351e2c001a0b9f29e5def67570ca9da644efb69a8bb97940cb4bec094dae8bb5"
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 45
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 45
 string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
 
 key length=30
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 43
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 43
 
 Warning: mcrypt_encrypt(): Key of size 30 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 45
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 45
 
 Warning: mcrypt_decrypt(): Key of size 30 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
 key length=32
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 43
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 43
 string(128) "f23bc103bfd0859a8318acee6d96e5f43dff68f3cdeae817a1e77c33492e32bdb82c5f660fcd1a2bfda70d9de4d5d8028ce179a9e2f7f9ee7dd61c7b4b409e95"
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 45
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 45
 string(128) "546869732069732074686520736563726574206d657373616765207768696368206d75737420626520656e637279707465640000000000000000000000000000"
 
 key length=40
 
-Deprecated: mcrypt_encrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 43
+Deprecated: Function mcrypt_encrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 43
 
 Warning: mcrypt_encrypt(): Key of size 40 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""
 
-Deprecated: mcrypt_decrypt(): The mcrypt extension is deprecated and will be removed in the future: use openssl instead in %s%emcrypt_rijndael128_256BitKey.php on line 45
+Deprecated: Function mcrypt_decrypt() is deprecated in %s%emcrypt_rijndael128_256BitKey.php on line 45
 
 Warning: mcrypt_decrypt(): Key of size 40 not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported in %s on line %d
 string(0) ""