From 053897d770f878b50979a5053e4ccbb886a86c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= <mail@pmmaga.net>
Date: Sun, 6 Nov 2016 22:42:27 +0100
Subject: [PATCH 1/4] Remove tests and iterations directly related with the b
 prefix

---
 Zend/tests/heredoc_002.phpt                   |  23 ---
 Zend/tests/nowdoc_002.phpt                    |  23 ---
 .../tests/array/array_combine_variation6.phpt |  53 -------
 .../array/array_diff_assoc_variation1.phpt    |  22 +--
 .../array/array_diff_assoc_variation10.phpt   |  50 -------
 .../array/array_diff_assoc_variation2.phpt    |  22 +--
 .../array/array_diff_assoc_variation3.phpt    |  24 +---
 .../array/array_diff_assoc_variation4.phpt    |  20 +--
 .../tests/array/array_diff_variation1.phpt    |  20 +--
 .../tests/array/array_diff_variation10.phpt   |  44 ------
 .../tests/array/array_diff_variation2.phpt    |  20 +--
 .../tests/array/array_diff_variation3.phpt    |  20 +--
 .../tests/array/array_diff_variation4.phpt    |  18 +--
 .../tests/array/array_flip_variation2.phpt    | Bin 2179 -> 2018 bytes
 .../array_intersect_assoc_variation10.phpt    |  54 -------
 .../array/array_intersect_variation10.phpt    |  53 -------
 .../tests/array/array_map_variation9.phpt     |  55 -------
 .../array_merge_recursive_variation8.phpt     |  73 ----------
 .../tests/array/array_pad_variation4.phpt     |  60 --------
 .../tests/array/array_unique_variation7.phpt  |  33 -----
 .../array_walk_recursive_variation3.phpt      |  27 ++--
 .../array_walk_recursive_variation6.phpt      |  13 --
 .../tests/array/array_walk_variation3.phpt    |  27 ++--
 .../tests/array/array_walk_variation6.phpt    |  13 --
 .../tests/array/uasort_variation3.phpt        | Bin 2584 -> 2477 bytes
 .../tests/array/usort_variation3.phpt         |  28 ++--
 .../tests/file/disk_free_space_basic.phpt     |   5 -
 .../file/disk_total_space_variation.phpt      |   5 -
 .../tests/file/fileinode_variation.phpt       |   9 +-
 ext/standard/tests/file/flock_variation.phpt  |  43 ------
 .../tests/file/fnmatch_variation.phpt         |  40 ------
 .../gettype_settype_variation4.phpt           | 135 ------------------
 32 files changed, 60 insertions(+), 972 deletions(-)
 delete mode 100644 Zend/tests/heredoc_002.phpt
 delete mode 100644 Zend/tests/nowdoc_002.phpt
 delete mode 100644 ext/standard/tests/array/array_combine_variation6.phpt
 delete mode 100644 ext/standard/tests/array/array_diff_assoc_variation10.phpt
 delete mode 100644 ext/standard/tests/array/array_diff_variation10.phpt
 delete mode 100644 ext/standard/tests/array/array_intersect_assoc_variation10.phpt
 delete mode 100644 ext/standard/tests/array/array_intersect_variation10.phpt
 delete mode 100644 ext/standard/tests/array/array_map_variation9.phpt
 delete mode 100644 ext/standard/tests/array/array_merge_recursive_variation8.phpt
 delete mode 100644 ext/standard/tests/array/array_pad_variation4.phpt
 delete mode 100644 ext/standard/tests/array/array_unique_variation7.phpt

diff --git a/Zend/tests/heredoc_002.phpt b/Zend/tests/heredoc_002.phpt
deleted file mode 100644
index 481ada996cc61..0000000000000
--- a/Zend/tests/heredoc_002.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-basic binary heredoc syntax
---FILE--
-<?php
-
-require_once 'nowdoc.inc';
-
-print b<<<ENDOFHEREDOC
-This is a heredoc test.
-
-ENDOFHEREDOC;
-
-$x = b<<<ENDOFHEREDOC
-This is another heredoc test.
-
-ENDOFHEREDOC;
-
-print "{$x}";
-
-?>
---EXPECT--
-This is a heredoc test.
-This is another heredoc test.
diff --git a/Zend/tests/nowdoc_002.phpt b/Zend/tests/nowdoc_002.phpt
deleted file mode 100644
index 3b17da814f928..0000000000000
--- a/Zend/tests/nowdoc_002.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-basic binary nowdoc syntax
---FILE--
-<?php
-
-require_once 'nowdoc.inc';
-
-print b<<<'ENDOFNOWDOC'
-This is a nowdoc test.
-
-ENDOFNOWDOC;
-
-$x = b<<<'ENDOFNOWDOC'
-This is another nowdoc test.
-
-ENDOFNOWDOC;
-
-print "{$x}";
-
-?>
---EXPECT--
-This is a nowdoc test.
-This is another nowdoc test.
diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt
deleted file mode 100644
index 94c7b4d664a90..0000000000000
--- a/ext/standard/tests/array/array_combine_variation6.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-Test array_combine() function : usage variations - binary safe checking 
---FILE--
-<?php
-/* Prototype  : array array_combine(array $keys, array $values)
- * Description: Creates an array by using the elements of the first parameter as keys
- *              and the elements of the second as the corresponding values
- * Source code: ext/standard/array.c
-*/
-
-/*
-* Testing the behavior of array_combine() by passing array with 
-* binary values for $keys and $values argument. 
-*/
-
-echo "*** Testing array_combine() : binary safe checking ***\n";
-
-// array with binary values
-$arr_binary = array(b"hello", b"world");
-$arr_normal = array("hello", "world");
-
-// array with binary value for $keys and $values argument
-var_dump( array_combine($arr_binary, $arr_binary) );
-
-// array with binary value for $values argument
-var_dump( array_combine($arr_normal, $arr_binary) );
-
-// array with binary value for $keys argument
-var_dump( array_combine($arr_binary, $arr_normal) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_combine() : binary safe checking ***
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["world"]=>
-  string(5) "world"
-}
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["world"]=>
-  string(5) "world"
-}
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["world"]=>
-  string(5) "world"
-}
-Done
diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index b6c63794b3d60..0b5ce9ffbe117 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -70,22 +70,18 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
-       // binary data
-/*21*/ b"binary",
-	   (binary)"binary",
 	   
        // object data
-/*23*/ new classA(),
+/*21*/ new classA(),
 
        // undefined data
-/*24*/ @$undefined_var,
+/*22*/ @$undefined_var,
 
        // unset data
-/*25*/ @$unset_var,
+/*23*/ @$unset_var,
 
        // resource variable
-/*26*/ $fp,
+/*24*/ $fp,
 );
 
 // loop through each element of $inputs to check the behavior of array_diff_assoc
@@ -219,16 +215,6 @@ NULL
 
 -- Iteration 24 --
 
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-
 Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 Done
\ No newline at end of file
diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt
deleted file mode 100644
index 0687ed8a5bf5a..0000000000000
--- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-Test array_diff_assoc() function : usage variations - binary safe check
---FILE--
-<?php
-/* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether 
- * the keys are equal 
- * Source code: ext/standard/array.c
- */
-
-/*
- * Test how array_diff_assoc() compares binary data
- */
-
-echo "*** Testing array_diff_assoc() : usage variations ***\n";
-
-$array1 = array( b"1", 
-                 b"hello", 
-                 "world", 
-                 "str1" => "hello", 
-                 "str2" => "world");
-
-$array2 = array( b"1" => 'hello',
-                 b"world",
-                 "hello", 
-                 'test');
-
-var_dump(array_diff_assoc($array1, $array2));
-var_dump(array_diff_assoc($array2, $array1));
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_diff_assoc() : usage variations ***
-array(3) {
-  [0]=>
-  string(1) "1"
-  ["str1"]=>
-  string(5) "hello"
-  ["str2"]=>
-  string(5) "world"
-}
-array(2) {
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  string(4) "test"
-}
-Done
diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
index 5de94424e8963..09501c95abdf2 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -70,22 +70,18 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
-       // binary data
-/*21*/ b"binary",
-	   (binary)"binary",
 	   
        // object data
-/*23*/ new classA(),
+/*21*/ new classA(),
 
        // undefined data
-/*24*/ @$undefined_var,
+/*22*/ @$undefined_var,
 
        // unset data
-/*25*/ @$unset_var,
+/*23*/ @$unset_var,
 
        // resource variable
-/*26*/ $fp,
+/*24*/ $fp,
 );
 
 // loop through each element of $inputs to check the behavior of array_diff_assoc
@@ -220,16 +216,6 @@ NULL
 
 -- Iteration 24 --
 
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-
 Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 Done
\ No newline at end of file
diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt
index 1d4aaf2e436a1..bd4937102f669 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt
@@ -79,25 +79,19 @@ $inputs = array(
        "string",
        'string',
        $heredoc),
-       
-       // binary data
-/*7*/
-'binary' => array(
-       b"binary",
-	   (binary)"binary"),
 	   
        // object data
-/*8*/
+/*7*/
 'object' => array(
       new classA()),
 
        // undefined data
-/*9*/
+/*8*/
 'undefined' => array(
        @$undefined_var),
 
        // unset data
-/*10*/
+/*9*/
 'unset' => array(
       @$unset_var),
 );
@@ -178,27 +172,19 @@ array(3) {
 }
 
 -- Iteration 7 --
-array(2) {
-  [0]=>
-  string(6) "binary"
-  [1]=>
-  string(6) "binary"
-}
-
--- Iteration 8 --
 array(1) {
   [0]=>
   object(classA)#%d (0) {
   }
 }
 
--- Iteration 9 --
+-- Iteration 8 --
 array(1) {
   [0]=>
   NULL
 }
 
--- Iteration 10 --
+-- Iteration 9 --
 array(1) {
   [0]=>
   NULL
diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt
index 34e979ab299de..23e977f99dcae 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt
@@ -71,20 +71,14 @@ $inputs = array(
       "string" => 'stringd',
       'string' => 'strings',
       $heredoc => 'stringh'),
-       
-       // binary data
-/*7*/
-'binary' => array(
-      b"binary1" => 'binary 1',
-	  (binary)"binary2" => 'binary 2'),
 
        // undefined data
-/*8*/
+/*7*/
 'undefined' => array(
       @$undefined_var => 'undefined'),
 
        // unset data
-/*9*/
+/*8*/
 'unset' => array(
       @$unset_var => 'unset'),
 
@@ -156,20 +150,12 @@ array(2) {
 }
 
 -- Iteration 7 --
-array(2) {
-  ["binary1"]=>
-  string(8) "binary 1"
-  ["binary2"]=>
-  string(8) "binary 2"
-}
-
--- Iteration 8 --
 array(1) {
   [""]=>
   string(9) "undefined"
 }
 
--- Iteration 9 --
+-- Iteration 8 --
 array(1) {
   [""]=>
   string(5) "unset"
diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt
index f9a34b0a59371..a5ca4b01216c3 100644
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -70,22 +70,18 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
-       // binary data
-/*21*/ b"binary",
-	   (binary)"binary",
 	   
        // object data
-/*23*/ new classA(),
+/*21*/ new classA(),
 
        // undefined data
-/*24*/ @$undefined_var,
+/*22*/ @$undefined_var,
 
        // unset data
-/*25*/ @$unset_var,
+/*23*/ @$unset_var,
 
        // resource variable
-/*26*/ $fp
+/*24*/ $fp
 );
 
 // loop through each element of $inputs to check the behavior of array_diff
@@ -197,12 +193,4 @@ NULL
 -- Iteration 24 --
 Warning: array_diff(): Argument #1 is not an array in %s on line %d
 NULL
-
--- Iteration 25 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
 Done
\ No newline at end of file
diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt
deleted file mode 100644
index 9442b946d9e9b..0000000000000
--- a/ext/standard/tests/array/array_diff_variation10.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-Test array_diff() function : usage variations - binary safe checking
---FILE--
-<?php
-/* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are 
- * not present in any of the others arguments. 
- * Source code: ext/standard/array.c
- */
-
-/*
- * Test behaviour of array_diff() function with binary input
- */
-
-echo "*** Testing array_diff() : usage variations ***\n";
-
-
-$array1 = array( b"1", 
-                 b"hello", 
-                 "world", 
-                 "str1" => "hello", 
-                 "str2" => "world");
-
-$array2 = array( b"1" => 'hello',
-                 b"world",
-                 "hello", 
-                 'test');
-
-var_dump(array_diff($array1, $array2));
-var_dump(array_diff($array2, $array1));
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_diff() : usage variations ***
-array(1) {
-  [0]=>
-  string(1) "1"
-}
-array(1) {
-  [4]=>
-  string(4) "test"
-}
-Done
diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt
index be68c40c2f88b..c22d3bae83fbd 100644
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -70,22 +70,18 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-              
-       // binary data
-/*21*/ b"binary",
-	   (binary)"binary",
 
        // object data
-/*23*/ new classA(),
+/*21*/ new classA(),
 
        // undefined data
-/*24*/ @$undefined_var,
+/*22*/ @$undefined_var,
 
        // unset data
-/*25*/ @$unset_var,
+/*23*/ @$unset_var,
 
        // resource variable
-/*26*/ $fp
+/*24*/ $fp
 );
 
 // loop through each element of $inputs to check the behavior of array_diff
@@ -196,12 +192,4 @@ NULL
 -- Iteration 24 --
 Warning: array_diff(): Argument #2 is not an array in %s on line %d
 NULL
-
--- Iteration 25 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
 Done
\ No newline at end of file
diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt
index 84f73fd287f26..2f12ab1deafa2 100644
--- a/ext/standard/tests/array/array_diff_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_variation3.phpt
@@ -75,19 +75,13 @@ $values = array(
       "string",
       'string',
       $heredoc),
-      
-/*8*/      
-"binary" => array(
-       // binary data
-       b"binary",
-	   (binary)"binary"),
 	   
-/*9*/	   
+/*8*/	   
 "undefined" => array(
       // undefined data
       @$undefined_var),
 
-/*10*/
+/*9*/
 "unset" => array(      
       // unset data
       @$unset_var)
@@ -169,20 +163,12 @@ array(3) {
 }
 
  Iteration: 8 
-array(2) {
-  [0]=>
-  string(6) "binary"
-  [1]=>
-  string(6) "binary"
-}
-
- Iteration: 9 
 array(1) {
   [0]=>
   NULL
 }
 
- Iteration: 10 
+ Iteration: 9 
 array(1) {
   [0]=>
   NULL
diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt
index 75b01adaa1769..1f0ab0b673350 100644
--- a/ext/standard/tests/array/array_diff_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_variation4.phpt
@@ -75,19 +75,13 @@ $values = array(
       "string",
       'string',
       $heredoc),
-      
-/*8*/      
-"binary" => array(
-       // binary data
-       b"binary",
-	   (binary)"binary"),
 	   
-/*9*/	   
+/*8*/	   
 "undefined" => array(
       // undefined data
       @$undefined_var),
 
-/*10*/
+/*9*/
 "unset" => array(      
       // unset data
       @$unset_var)
@@ -173,12 +167,4 @@ array(2) {
   [1]=>
   int(2)
 }
-
- Iteration: 10 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
 Done
\ No newline at end of file
diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt
index 997c391306e5cf751d4603cad8fb3c679155dab4..ee07eb8a2621c29b21026d2370626fd03fc855f4 100644
GIT binary patch
delta 23
fcmZn`e8j)uHOppOR!K%iqs`%L&Ww{^vd;nlVXg<*

delta 167
zcmaFF-z>P{HH)i4Qf6LaQKdq5Y9*I~f>NTAUUEi}hJmJ@Qj(H_t(}58L_QuUZ>X*V
zRFb3w5kZ#Se2+zqk<nx`E1NT;Cz1xGSX(=wmg174%)E3BV@;s>3`t5rk!YwPAY+YC
PRha=*L5!H}#J&Ikr?N7E

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
deleted file mode 100644
index 9bce974a9dd66..0000000000000
--- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-Test array_intersect_assoc() function : usage variations - binary safe checking 
---FILE--
-<?php
-/* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments.
- * Keys are used to do more restrictive check
- * Source code: ext/standard/array.c
-*/
-
-/*
-* Testing the behavior of array_intersect_assoc() by passing array with 
-* binary values for $arr1 and $arr2 argument. 
-*/
-
-echo "*** Testing array_intersect_assoc() : binary safe checking ***\n";
-
-// array with binary values
-$arr_binary = array(b"hello", b"world");
-// simple array
-$arr_normal = array("hello", "world");
-
-// array with binary value for $arr1 argument
-var_dump( array_intersect_assoc($arr_binary, $arr_normal) );
-
-// array with binary value for $arr2 argument
-var_dump( array_intersect_assoc($arr_normal, $arr_binary) );
-
-// array with binary value for both $arr1 and $arr2 argument
-var_dump( array_intersect_assoc($arr_binary, $arr_binary) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_intersect_assoc() : binary safe checking ***
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-Done
\ No newline at end of file
diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt
deleted file mode 100644
index e193f97d465a7..0000000000000
--- a/ext/standard/tests/array/array_intersect_variation10.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-Test array_intersect() function : usage variations - binary safe checking 
---FILE--
-<?php
-/* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
- * Source code: ext/standard/array.c
-*/
-
-/*
-* Testing the behavior of array_intersect() by passing array with 
-* binary values for $arr1 and $arr2 argument. 
-*/
-
-echo "*** Testing array_intersect() : binary safe checking ***\n";
-
-// array with binary values
-$arr_binary = array(b"hello", b"world");
-// simple array
-$arr_normal = array("hello", "world");
-
-// array with binary value for $arr1 argument
-var_dump( array_intersect($arr_binary, $arr_normal) );
-
-// array with binary value for $arr2 argument
-var_dump( array_intersect($arr_normal, $arr_binary) );
-
-// array with binary value for both $arr1 and $arr2 argument
-var_dump( array_intersect($arr_binary, $arr_binary) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_intersect() : binary safe checking ***
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-Done
diff --git a/ext/standard/tests/array/array_map_variation9.phpt b/ext/standard/tests/array/array_map_variation9.phpt
deleted file mode 100644
index f33b717c6c9c2..0000000000000
--- a/ext/standard/tests/array/array_map_variation9.phpt
+++ /dev/null
@@ -1,55 +0,0 @@
---TEST--
-Test array_map() function : usage variations - binary safe checking
---FILE--
-<?php
-/* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays
- * Source code: ext/standard/array.c
- */
-
-/*
- * Test array_map() by passing array having binary values for $arr1 argument
- */
-
-echo "*** Testing array_map() : array with binary data for 'arr1' argument ***\n";
-
-function callback1($a)
-{
-  return ($a);
-}
-function callback2($a, $b)
-{
-  return array($a => $b);
-}
-
-// array with binary data
-$arr1 = array(b"hello", b"world", "1", b"22.22");
-
-echo "-- checking binary safe array with one parameter callback function --\n";
-var_dump( array_map('callback1', $arr1) );
-
-echo "-- checking binary safe array with two parameter callback function --\n";
-try {
-	var_dump( array_map(b"callback2", $arr1) );
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_map() : array with binary data for 'arr1' argument ***
--- checking binary safe array with one parameter callback function --
-array(4) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  [2]=>
-  string(1) "1"
-  [3]=>
-  string(5) "22.22"
-}
--- checking binary safe array with two parameter callback function --
-Exception: Too few arguments to function callback2(), 1 passed and exactly 2 expected
-Done
diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt
deleted file mode 100644
index 6ad2f6989fc26..0000000000000
--- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt
+++ /dev/null
@@ -1,73 +0,0 @@
---TEST--
-Test array_merge_recursive() function : usage variations - binary safe checking
---FILE--
-<?php
-/* Prototype  : array array_merge_recursive(array $arr1[, array $...])
- * Description: Recursively merges elements from passed arrays into one array
- * Source code: ext/standard/array.c
-*/
-
-/*
- * Testing the functionality of array_merge_recursive() by passing an array having binary values.
-*/
-
-echo "*** Testing array_merge_recursive() : array with binary data for \$arr1 argument ***\n";
-
-// array with binary values
-$arr1 = array(b"1", b"hello" => "hello", b"world", "str1" => b"hello", "str2" => "world");
-
-// initialize the second argument
-$arr2 = array(b"str1" => b"binary", b"hello" => "binary", b"str2" => b"binary");
- 
-echo "-- With default argument --\n";
-var_dump( array_merge_recursive($arr1) );
-
-echo "-- With more arguments --\n";
-var_dump( array_merge_recursive($arr1, $arr2) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_merge_recursive() : array with binary data for $arr1 argument ***
--- With default argument --
-array(5) {
-  [0]=>
-  string(1) "1"
-  ["hello"]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  ["str1"]=>
-  string(5) "hello"
-  ["str2"]=>
-  string(5) "world"
-}
--- With more arguments --
-array(5) {
-  [0]=>
-  string(1) "1"
-  ["hello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(6) "binary"
-  }
-  [1]=>
-  string(5) "world"
-  ["str1"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(6) "binary"
-  }
-  ["str2"]=>
-  array(2) {
-    [0]=>
-    string(5) "world"
-    [1]=>
-    string(6) "binary"
-  }
-}
-Done
diff --git a/ext/standard/tests/array/array_pad_variation4.phpt b/ext/standard/tests/array/array_pad_variation4.phpt
deleted file mode 100644
index 83c1e8300d2d8..0000000000000
--- a/ext/standard/tests/array/array_pad_variation4.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-Test array_pad() function : usage variations - binary safe checking
---FILE--
-<?php
-/* Prototype  : array array_pad(array $input, int $pad_size, mixed $pad_value)
- * Description: Returns a copy of input array padded with pad_value to size pad_size
- * Source code: ext/standard/array.c
-*/
-
-/*
-* Passing binary values to $pad_value argument and testing whether
-* array_pad() behaves in an expected way with the other arguments passed to the function.
-* The $input and $pad_size arguments passed are fixed values.
-*/
-
-echo "*** Testing array_pad() : Passing binary values to \$pad_value argument ***\n";
-
-// initialize the $input and $pad_size argument
-$input = array(1, 2, 3);
-$pad_size = 6;
-
-// initialize $pad_value with reference variable
-$binary = b"hello";
-
-var_dump( array_pad($input, $pad_size, $binary) );  // positive 'pad_size'
-var_dump( array_pad($input, -$pad_size, $binary) );  // negative 'pad_size'
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_pad() : Passing binary values to $pad_value argument ***
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  string(5) "hello"
-  [5]=>
-  string(5) "hello"
-}
-array(6) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  int(1)
-  [4]=>
-  int(2)
-  [5]=>
-  int(3)
-}
-Done
diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt
deleted file mode 100644
index e998a73c6cc02..0000000000000
--- a/ext/standard/tests/array/array_unique_variation7.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Test array_unique() function : usage variations - binary safe checking
---FILE--
-<?php
-/* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
- * Source code: ext/standard/array.c
-*/
-
-/*
- * Testing the functionality of array_unique() by passing an array having binary values.
-*/
-
-echo "*** Testing array_unique() : array with binary data for \$input argument ***\n";
-
-// array with binary values
-$input = array( b"1", b"hello", "world", "str1" => "hello", "str2" => "world");
-
-var_dump( array_unique($input) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing array_unique() : array with binary data for $input argument ***
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-}
-Done
diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt
index 9abdc0b5c236a..bfadd9e2c193d 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt
@@ -48,11 +48,8 @@ $input_values = array(
        // empty array
        array(),
 
-       // binary array
-       array(array(b'binary')),
-
        // mixed array
-/*8*/  array(16, 8.345, array("Fruits"), array(true, null), array(FALSE), array(-98, 0.005, 'banana'))
+/*7*/  array(16, 8.345, array("Fruits"), array(true, null), array(FALSE), array(-98, 0.005, 'banana'))
 );
 
 for($count = 0; $count < count($input_values); $count++) {
@@ -106,18 +103,14 @@ bool(true)
 bool(true)
 
 -- Iteration 7 --
-7 : 0 binary
-bool(true)
-
--- Iteration 8 --
-8 : 0 16
-8 : 1 8.345
-8 : 0 Fruits
-8 : 0 1
-8 : 1 
-8 : 0 
-8 : 0 -98
-8 : 1 0.005
-8 : 2 banana
+7 : 0 16
+7 : 1 8.345
+7 : 0 Fruits
+7 : 0 1
+7 : 1 
+7 : 0 
+7 : 0 -98
+7 : 1 0.005
+7 : 2 banana
 bool(true)
 Done
diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt
index 747eb7403c44a..f6b2f51163ae8 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt
@@ -69,11 +69,6 @@ $input = array( "a" => "Apple", 'z' => array('b' => 'Bananna', "c" => "carrot"),
 echo "-- Associative array with string keys --\n";
 var_dump( array_walk_recursive($input, "for_string"));
 
-// binary key
-$input = array( b"a" => "Apple", b"b" => "Banana");
-echo "-- Associative array with binary keys --\n";
-var_dump( array_walk_recursive($input, "for_string"));
-
 // Mixed keys - numeric/string
 $input = array( 0 => array(0 => 1, 1 => 2), "x" => array("a" => "Apple", "b" => "Banana"), 2 =>3);
 echo "-- Associative array with numeric/string keys --\n";
@@ -118,14 +113,6 @@ string(6) "carrot"
 string(1) "o"
 string(6) "Orange"
 
-bool(true)
--- Associative array with binary keys --
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(6) "Banana"
-
 bool(true)
 -- Associative array with numeric/string keys --
 int(0)
diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt
index 9ff7d5dfac921..5cccb51fd28bc 100644
--- a/ext/standard/tests/array/array_walk_variation3.phpt
+++ b/ext/standard/tests/array/array_walk_variation3.phpt
@@ -48,11 +48,8 @@ $input_values = array(
        // empty array
        array(),
 
-       // binary array
-       array(b"binary"),
-
        // mixed array
-/*8*/  array(16, 8.345, "Fruits", true, null, FALSE, -98, 0.005, 'banana')
+/*7*/  array(16, 8.345, "Fruits", true, null, FALSE, -98, 0.005, 'banana')
 );
 
 for($count = 0; $count < count($input_values); $count++) {
@@ -106,18 +103,14 @@ bool(true)
 bool(true)
 
 -- Iteration 7 --
-7 : 0 binary
-bool(true)
-
--- Iteration 8 --
-8 : 0 16
-8 : 1 8.345
-8 : 2 Fruits
-8 : 3 1
-8 : 4 
-8 : 5 
-8 : 6 -98
-8 : 7 0.005
-8 : 8 banana
+7 : 0 16
+7 : 1 8.345
+7 : 2 Fruits
+7 : 3 1
+7 : 4 
+7 : 5 
+7 : 6 -98
+7 : 7 0.005
+7 : 8 banana
 bool(true)
 Done
diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt
index c1f23233ec94b..10b55a044c7b0 100644
--- a/ext/standard/tests/array/array_walk_variation6.phpt
+++ b/ext/standard/tests/array/array_walk_variation6.phpt
@@ -69,11 +69,6 @@ $input = array( "a" => "Apple", 'b' => 'Bananna', "c" => "carrot", 'o' => "Orang
 echo "-- Associative array with string keys --\n";
 var_dump( array_walk($input, "for_string"));
 
-// binary keys
-$input = array( b"a" => "Apple", b"b" => "Banana");
-echo "-- Associative array with binary keys --\n";
-var_dump( array_walk($input, "for_string"));
-
 // Mixed keys - numeric/string
 $input = array( 0 => 1, 1 => 2, "a" => "Apple", "b" => "Banana", 2 =>3);
 echo "-- Associative array with numeric/string keys --\n";
@@ -114,14 +109,6 @@ string(6) "carrot"
 string(1) "o"
 string(6) "Orange"
 
-bool(true)
--- Associative array with binary keys --
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(6) "Banana"
-
 bool(true)
 -- Associative array with numeric/string keys --
 int(0)
diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt
index 9147d59916ed1216794744fda981f9a144374a77..5ef2f9d6e2391339e4e8bdd204f6dea6f4754af8 100644
GIT binary patch
delta 22
ecmbOsvQ~HlGy7(H_F6_pqse<YCQYv6oCN?;_6KhO

delta 119
zcmZ20JVRsyGrOrmQf6LaQKdq5Y9*I~f>NTAUUEi}hJmJ@Qj(H_t(}62sSZ#)NeQA1
yEM#o3`43wQBcsXWMvh5ZN{I|fO0l+fKvkJ}B^oBCnm|@GOg%!v*kCdr=X?N}_8=et

diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt
index 3758fe9c9a628..b99fc0a4f84ce 100644
--- a/ext/standard/tests/array/usort_variation3.phpt
+++ b/ext/standard/tests/array/usort_variation3.phpt
@@ -58,10 +58,6 @@ $array_arg = array(
   // null keys
   NULL => 35,
 
-  // binary key
-  "a".chr(0)."b" => 45,
-  b"binary" => 30,
-
   //heredoc keys
   $simple_heredoc => 75,
   $multiline_heredoc => 200,
@@ -80,7 +76,7 @@ var_dump($array_arg);
 bool(true)
 
 -- Sorted array after usort() function call --
-array(15) {
+array(13) {
   [0]=>
   int(200)
   [1]=>
@@ -88,28 +84,24 @@ array(15) {
   [2]=>
   int(75)
   [3]=>
-  int(45)
-  [4]=>
   int(35)
-  [5]=>
-  int(30)
-  [6]=>
+  [4]=>
   int(25)
-  [7]=>
+  [5]=>
   int(9)
-  [8]=>
+  [6]=>
   int(8)
-  [9]=>
+  [7]=>
   int(7)
-  [10]=>
+  [8]=>
   int(6)
-  [11]=>
+  [9]=>
   int(5)
-  [12]=>
+  [10]=>
   int(4)
-  [13]=>
+  [11]=>
   int(1)
-  [14]=>
+  [12]=>
   int(0)
 }
 ===DONE===
diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt
index 57446b6ee037f..e0c9cf4d76e3f 100644
--- a/ext/standard/tests/file/disk_free_space_basic.phpt
+++ b/ext/standard/tests/file/disk_free_space_basic.phpt
@@ -44,9 +44,6 @@ else {
   var_dump($space1, $space2);
 }
 
-echo "*** Testing with Binary Input ***\n";
-var_dump( disk_free_space(b"$file_path") ); 
-
 echo"\n--- Done ---";
 ?>
 
@@ -70,7 +67,5 @@ float(%d)
 float(%d)
 
  Free Space Value Is Correct
-*** Testing with Binary Input ***
-float(%d)
 
 --- Done ---
diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index ba2ceb2d1b96a..cce879c67b893 100644
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -53,9 +53,6 @@ foreach($dirs_arr as $dir1) {
   $count++;
 }
 
-echo "*** Testing with Binary Input ***\n";
-var_dump( disk_total_space(b"$file_path") ); 
-
 echo"\n--- Done ---";
 ?>
 
@@ -117,7 +114,5 @@ NULL
 
 Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
-*** Testing with Binary Input ***
-float(%d)
 
 --- Done ---
diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt
index 1fac953098b3f..b033ab2738b31 100644
--- a/ext/standard/tests/file/fileinode_variation.phpt
+++ b/ext/standard/tests/file/fileinode_variation.phpt
@@ -76,11 +76,6 @@ mkdir("$file_path/dir/subdir");
 print( fileinode("$file_path/dir/subdir") )."\n";
 clearstatcache();
 
-echo "-- Testing with binary input --\n";
-print( fileinode(b"$file_path/dir") )."\n";
-clearstatcache();
-print( fileinode(b"$file_path/dir/subdir") );
-
 rmdir("$file_path/dir/subdir");
 rmdir("$file_path/dir");
 
@@ -106,7 +101,5 @@ echo "\n*** Done ***";
 -- Testing with directories --
 %d
 %d
--- Testing with binary input --
-%d
-%d
+
 *** Done ***
diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt
index af67ab402a9a1..d34f78f7f2421 100644
--- a/ext/standard/tests/file/flock_variation.phpt
+++ b/ext/standard/tests/file/flock_variation.phpt
@@ -40,9 +40,6 @@ $wouldblocks = array(
   array(),
   "string",
   "",
-  /* binary input */
-  b"string",
-  b"",
   "\0"
 );
 
@@ -93,10 +90,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 0 --
 bool(true)
--- Inner iteration 12 in 0 --
-bool(true)
--- Inner iteration 13 in 0 --
-bool(true)
 --- Outer iteration 1 ---
 bool(true)
 -- Inner iteration 0 in 1 --
@@ -123,10 +116,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 1 --
 bool(true)
--- Inner iteration 12 in 1 --
-bool(true)
--- Inner iteration 13 in 1 --
-bool(true)
 --- Outer iteration 2 ---
 bool(true)
 -- Inner iteration 0 in 2 --
@@ -153,10 +142,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 2 --
 bool(true)
--- Inner iteration 12 in 2 --
-bool(true)
--- Inner iteration 13 in 2 --
-bool(true)
 --- Outer iteration 3 ---
 bool(true)
 -- Inner iteration 0 in 3 --
@@ -183,10 +168,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 3 --
 bool(true)
--- Inner iteration 12 in 3 --
-bool(true)
--- Inner iteration 13 in 3 --
-bool(true)
 --- Outer iteration 4 ---
 bool(true)
 -- Inner iteration 0 in 4 --
@@ -213,10 +194,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 4 --
 bool(true)
--- Inner iteration 12 in 4 --
-bool(true)
--- Inner iteration 13 in 4 --
-bool(true)
 --- Outer iteration 5 ---
 bool(true)
 -- Inner iteration 0 in 5 --
@@ -243,10 +220,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 5 --
 bool(true)
--- Inner iteration 12 in 5 --
-bool(true)
--- Inner iteration 13 in 5 --
-bool(true)
 --- Outer iteration 6 ---
 bool(true)
 -- Inner iteration 0 in 6 --
@@ -273,10 +246,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 6 --
 bool(true)
--- Inner iteration 12 in 6 --
-bool(true)
--- Inner iteration 13 in 6 --
-bool(true)
 --- Outer iteration 7 ---
 bool(true)
 -- Inner iteration 0 in 7 --
@@ -303,10 +272,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 7 --
 bool(true)
--- Inner iteration 12 in 7 --
-bool(true)
--- Inner iteration 13 in 7 --
-bool(true)
 --- Outer iteration 8 ---
 bool(true)
 -- Inner iteration 0 in 8 --
@@ -333,10 +298,6 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 8 --
 bool(true)
--- Inner iteration 12 in 8 --
-bool(true)
--- Inner iteration 13 in 8 --
-bool(true)
 --- Outer iteration 9 ---
 bool(true)
 -- Inner iteration 0 in 9 --
@@ -363,9 +324,5 @@ bool(true)
 bool(true)
 -- Inner iteration 11 in 9 --
 bool(true)
--- Inner iteration 12 in 9 --
-bool(true)
--- Inner iteration 13 in 9 --
-bool(true)
 
 *** Done ***
diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt
index 6d28528c1ce92..6e29eff742c95 100644
--- a/ext/standard/tests/file/fnmatch_variation.phpt
+++ b/ext/standard/tests/file/fnmatch_variation.phpt
@@ -55,13 +55,6 @@ $pattern_arr = array(
 29 => "MATCH.TMP",
 30 => "MATCH*",
 31 => $file_name,
-
-/* binary inputs */
-32 => b"match*",
-33 => b"*.tmp",
-34 => b"mat*",
-35 => b"mat*tmp",
-36 => b"m*t",
 );
 
 for( $i = 0; $i<count($pattern_arr); $i++ ) {
@@ -101,9 +94,6 @@ $str_arr = array(
   'string',
   "str\0ing",
   "stringstring",
-
-  /* binary input */
-  b"string"
 );
 match($str_arr, $str_arr);
 
@@ -204,16 +194,6 @@ bool(false)
 bool(false)
 -- Iteration 31 --
 bool(true)
--- Iteration 32 --
-bool(false)
--- Iteration 33 --
-bool(true)
--- Iteration 34 --
-bool(false)
--- Iteration 35 --
-bool(false)
--- Iteration 36 --
-bool(false)
 
 *** Testing fnmatch() with other types other than files ***
 --- With Integers ---
@@ -271,7 +251,6 @@ bool(true)
 Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
 NULL
 bool(false)
-bool(true)
 -- Iteration 1 --
 
 Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
@@ -286,9 +265,6 @@ NULL
 Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
 Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 2 --
@@ -301,7 +277,6 @@ bool(true)
 Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
 NULL
 bool(false)
-bool(true)
 -- Iteration 3 --
 
 Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
@@ -316,9 +291,6 @@ NULL
 Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 
-Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
 Warning: fnmatch() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 4 --
@@ -331,18 +303,6 @@ bool(false)
 Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
 NULL
 bool(true)
-bool(false)
--- Iteration 5 --
-bool(true)
-
-Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
-NULL
-bool(true)
-
-Warning: fnmatch() expects parameter 2 to be a valid path, string given in %s on line %d
-NULL
-bool(false)
-bool(true)
 
 --- With booleans ---
 -- Iteration 0 --
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt
index 6ff891391f068..60261b92953b3 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt
@@ -163,21 +163,6 @@ $var_values = array (
   /* undefined/unset vars */
   $unset_var,
   $undef_var,
-  
-  /* binary strings */
-  b"0",
-  b'0',
-  b"10string",
-  b'10string',
-  b"+0123",
-  b'-0123',
-  b"0xff",
-  b'0x55',
-  b'1e2',
-  b'2974394749328742328432',
-  b"1e2",
-  b'10string',
-  b"10string"
 );
 
 // test conversion to these types                 
@@ -646,66 +631,6 @@ string(6) "string"
 bool(true)
 bool(false)
 string(7) "boolean"
--- Iteration 87 --
-string(6) "string"
-bool(true)
-bool(false)
-string(7) "boolean"
--- Iteration 88 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 89 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 90 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 91 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 92 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 93 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 94 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 95 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 96 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 97 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 98 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
 
 -- Setting type of data to bool --
 -- Iteration 1 --
@@ -1138,64 +1063,4 @@ string(6) "string"
 bool(true)
 bool(false)
 string(7) "boolean"
--- Iteration 87 --
-string(6) "string"
-bool(true)
-bool(false)
-string(7) "boolean"
--- Iteration 88 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 89 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 90 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 91 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 92 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 93 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 94 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 95 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 96 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 97 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
--- Iteration 98 --
-string(6) "string"
-bool(true)
-bool(true)
-string(7) "boolean"
 Done

From 9684ecf8d6aabae250727f73b6f0368d22c29a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= <mail@pmmaga.net>
Date: Sun, 6 Nov 2016 23:03:29 +0100
Subject: [PATCH 2/4] Replace binary casts for string casts on tests

---
 ext/spl/tests/recursive_tree_iterator_005.phpt   | 16 ++++++++--------
 .../tests/file/popen_pclose_basic-win32-mb.phpt  |  4 ++--
 .../tests/file/popen_pclose_basic-win32.phpt     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/spl/tests/recursive_tree_iterator_005.phpt b/ext/spl/tests/recursive_tree_iterator_005.phpt
index b14811fbe8dd9..95b1eb252b102 100644
--- a/ext/spl/tests/recursive_tree_iterator_005.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_005.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: RecursiveTreeIterator and binary vs unicode (PHP 6.0+)
+SPL: RecursiveTreeIterator and strings
 --INI--
 error_reporting=E_ALL&~E_NOTICE
 --FILE--
@@ -7,11 +7,11 @@ error_reporting=E_ALL&~E_NOTICE
 
 $ary = array(
 	0 => array(
-		(binary) "binary",
+		"string",
 		"abc2",
 		1,
 	),
-	(binary) "binary" => array(
+	"string" => array(
 		2,
 		"b",
 		3 => array(
@@ -42,7 +42,7 @@ foreach($it as $k => $v) {
 ===DONE===
 --EXPECT--
 string(7) "|-Array"
-string(10) "| |-binary"
+string(10) "| |-string"
 string(8) "| |-abc2"
 string(5) "| \-1"
 string(7) "\-Array"
@@ -61,7 +61,7 @@ string(3) "|-0"
 string(5) "| |-0"
 string(5) "| |-1"
 string(5) "| \-2"
-string(8) "\-binary"
+string(8) "\-string"
 string(5) "  |-0"
 string(5) "  |-1"
 string(5) "  |-3"
@@ -78,15 +78,15 @@ string(3) "|-0"
 string(5) "Array"
 string(7) "|-Array"
 string(5) "| |-0"
-string(6) "binary"
-string(10) "| |-binary"
+string(6) "string"
+string(10) "| |-string"
 string(5) "| |-1"
 string(4) "abc2"
 string(8) "| |-abc2"
 string(5) "| \-2"
 string(1) "1"
 string(5) "| \-1"
-string(8) "\-binary"
+string(8) "\-string"
 string(5) "Array"
 string(7) "\-Array"
 string(5) "  |-0"
diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt
index 7e0a0e0c548b0..1d65ce0e4c476 100644
--- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt
+++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt
@@ -45,8 +45,8 @@ $sysroot = exec('echo %SYSTEMROOT%');
 $file_handle = popen("$sysroot/system32/sort", "w");
 $newline = "\n";
 foreach($arr as $str) {
-  fwrite($file_handle, (binary)$str);
-  fwrite($file_handle, (binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)$newline);
+  fwrite($file_handle, (string)$str);
+  fwrite($file_handle, (string)(string)(string)(string)(string)(string)(string)(string)(string)$newline);
 }
 pclose($file_handle);
 
diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt
index 6351d866f370f..d854182860b5c 100644
--- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt
+++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt
@@ -45,8 +45,8 @@ $sysroot = exec('echo %SYSTEMROOT%');
 $file_handle = popen("$sysroot/system32/sort", "w");
 $newline = "\n";
 foreach($arr as $str) {
-  fwrite($file_handle, (binary)$str);
-  fwrite($file_handle, (binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)(binary)$newline);
+  fwrite($file_handle, (string)$str);
+  fwrite($file_handle, (string)(string)(string)(string)(string)(string)(string)(string)(string)$newline);
 }
 pclose($file_handle);
 

From eebfa33bc5d3553a3e35561ab3a27f3954e0163d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= <mail@pmmaga.net>
Date: Sun, 6 Nov 2016 23:10:16 +0100
Subject: [PATCH 3/4] Remove binary cast usage from helper files

---
 ext/phar/shortarc.php                              |  8 ++++----
 ext/phar/tests/cache_list/files/phar_test.inc      | 14 +++++++-------
 ext/phar/tests/files/phar_oo_test.inc              |  2 +-
 ext/phar/tests/files/phar_test.inc                 | 14 +++++++-------
 .../tests/tar/files/make.dangerous.tar.php.inc     |  8 ++++----
 ext/phar/tests/tar/files/make_invalid_tar.php.inc  |  2 +-
 ext/phar/tests/tar/files/tarmaker.php.inc          |  8 ++++----
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ext/phar/shortarc.php b/ext/phar/shortarc.php
index 1bf3baa8aa17b..fa5263664664a 100644
--- a/ext/phar/shortarc.php
+++ b/ext/phar/shortarc.php
@@ -114,15 +114,15 @@ static function go($return  = false)
     {
         $fp = fopen(__FILE__, 'rb');
         fseek($fp, self::LEN);
-        $L = unpack('V', $a = (binary)fread($fp, 4));
-        $m = (binary)'';
+        $L = unpack('V', $a = fread($fp, 4));
+        $m = '';
 
         do {
             $read = 8192;
             if ($L[1] - strlen($m) < 8192) {
                 $read = $L[1] - strlen($m);
             }
-            $last = (binary)fread($fp, $read);
+            $last = fread($fp, $read);
             $m .= $last;
         } while (strlen($last) && strlen($m) < $L[1]);
 
@@ -268,7 +268,7 @@ static function extractFile($path, $entry, $fp)
                 $stat[7] . ")");
         }
 
-        if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) {
+        if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) {
             die("Invalid internal .phar file (checksum error)");
         }
 
diff --git a/ext/phar/tests/cache_list/files/phar_test.inc b/ext/phar/tests/cache_list/files/phar_test.inc
index f82471d13b4cb..0931794dd73df 100644
--- a/ext/phar/tests/cache_list/files/phar_test.inc
+++ b/ext/phar/tests/cache_list/files/phar_test.inc
@@ -4,7 +4,7 @@ if (function_exists('date_default_timezone_set')) {
 	date_default_timezone_set('UTC');
 }
 
-$manifest = (binary)'';
+$manifest = '';
 $glags = 0;
 
 foreach($files as $name => $cont)
@@ -36,12 +36,12 @@ foreach($files as $name => $cont)
 	if (empty($comp)) $comp = $cont;
 	if (empty($ulen)) $ulen = strlen($cont);
 	if (empty($clen)) $clen = strlen($comp);
-	if (empty($crc32))$crc32= crc32((binary)$cont);
+	if (empty($crc32))$crc32= crc32($cont);
 	if (isset($meta)) $meta = serialize($meta);
 
 	// write manifest entry
-	$manifest .= pack('V', strlen($name)) . (binary)$name;
-	$manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . (binary)$meta;
+	$manifest .= pack('V', strlen($name)) . $name;
+	$manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . $meta;
 
 	// globals
 	$gflags |= $flags;
@@ -52,13 +52,13 @@ if (!isset($alias)) $alias = 'hio';
 
 if (isset($pmeta)) $pmeta = serialize($pmeta); else $pmeta = '';
 
-$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . (binary)$alias . pack('V', strlen($pmeta)) . (binary)$pmeta . $manifest;
-$file = (binary)$file;
+$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . $alias . pack('V', strlen($pmeta)) . $pmeta . $manifest;
+
 $file .= pack('V', strlen($manifest)) . $manifest;
 
 foreach($files as $cont)
 {
-	$file .= (binary)$cont;
+	$file .= $cont;
 }
 
 file_put_contents($fname, $file);
diff --git a/ext/phar/tests/files/phar_oo_test.inc b/ext/phar/tests/files/phar_oo_test.inc
index 45421568dee10..a0857b4aee811 100644
--- a/ext/phar/tests/files/phar_oo_test.inc
+++ b/ext/phar/tests/files/phar_oo_test.inc
@@ -5,7 +5,7 @@ ini_set('date.timezone', 'GMT');
 $tname = basename(current(get_included_files()), ".php");
 $fname = dirname(__FILE__) . "/$tname.phar.php";
 $pname = 'phar://' . $fname;
-$file = (binary)'<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>';
+$file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>';
 
 $files = array();
 
diff --git a/ext/phar/tests/files/phar_test.inc b/ext/phar/tests/files/phar_test.inc
index 6f939695422ed..53567a46bccbe 100644
--- a/ext/phar/tests/files/phar_test.inc
+++ b/ext/phar/tests/files/phar_test.inc
@@ -4,7 +4,7 @@ if (function_exists('date_default_timezone_set')) {
 	date_default_timezone_set('UTC');
 }
 
-$manifest = (binary)'';
+$manifest = '';
 $gflags = 0;
 
 foreach($files as $name => $cont)
@@ -36,12 +36,12 @@ foreach($files as $name => $cont)
 	if (empty($comp)) $comp = $cont;
 	if (empty($ulen)) $ulen = strlen($cont);
 	if (empty($clen)) $clen = strlen($comp);
-	if (empty($crc32))$crc32= crc32((binary)$cont);
+	if (empty($crc32))$crc32= crc32($cont);
 	if (isset($meta)) $meta = serialize($meta);
 
 	// write manifest entry
-	$manifest .= pack('V', strlen($name)) . (binary)$name;
-	$manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . (binary)$meta;
+	$manifest .= pack('V', strlen($name)) . $name;
+	$manifest .= pack('VVVVVV', $ulen, $time, $clen, $crc32, $flags|$perm, strlen($meta)) . $meta;
 
 	// globals
 	$gflags |= $flags;
@@ -52,13 +52,13 @@ if (!isset($alias)) $alias = 'hio';
 
 if (isset($pmeta)) $pmeta = serialize($pmeta); else $pmeta = '';
 
-$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . (binary)$alias . pack('V', strlen($pmeta)) . (binary)$pmeta . $manifest;
-$file = (binary)$file;
+$manifest = pack('VnVV', count($files), isset($hasdir) ? 0x1110 : 0x1000, $gflags, strlen($alias)) . $alias . pack('V', strlen($pmeta)) . $pmeta . $manifest;
+$file = $file;
 $file .= pack('V', strlen($manifest)) . $manifest;
 
 foreach($files as $cont)
 {
-	$file .= (binary)$cont;
+	$file .= $cont;
 }
 
 file_put_contents($fname, $file);
diff --git a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc
index deeaa41761973..4e9e673e5cf42 100644
--- a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc
+++ b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc
@@ -108,16 +108,16 @@ class danger_tarmaker
 
         $checksum = pack('a8', sprintf('%6s ', decoct($checksum)));
 
-        fwrite($this->tmp, (binary)$block . $checksum . $blockend, 512);
+        fwrite($this->tmp, $block . $checksum . $blockend, 512);
         if (is_resource($fileOrStream)) {
             stream_copy_to_stream($fileOrStream, $this->tmp);
             if ($stat['size'] % 512) {
-                fwrite($this->tmp, (binary)str_repeat("\0", 512 - $stat['size'] % 512));
+                fwrite($this->tmp, str_repeat("\0", 512 - $stat['size'] % 512));
             }
         } else {
-            fwrite($this->tmp, (binary)$fileOrStream);
+            fwrite($this->tmp, $fileOrStream);
             if (strlen($fileOrStream) % 512) {
-                fwrite($this->tmp, (binary)str_repeat("\0", 512 - strlen($fileOrStream) % 512));
+                fwrite($this->tmp, str_repeat("\0", 512 - strlen($fileOrStream) % 512));
             }
         }
     }
diff --git a/ext/phar/tests/tar/files/make_invalid_tar.php.inc b/ext/phar/tests/tar/files/make_invalid_tar.php.inc
index 413dd7bd1bdd5..c18bd199b3808 100644
--- a/ext/phar/tests/tar/files/make_invalid_tar.php.inc
+++ b/ext/phar/tests/tar/files/make_invalid_tar.php.inc
@@ -3,7 +3,7 @@ include dirname(__FILE__) . '/tarmaker.php.inc';
 class corrupter extends tarmaker {
 function close()
 {
-	fwrite($this->tmp, (binary)'oopsie');
+	fwrite($this->tmp, 'oopsie');
 	fclose($this->tmp);
 }
 }
\ No newline at end of file
diff --git a/ext/phar/tests/tar/files/tarmaker.php.inc b/ext/phar/tests/tar/files/tarmaker.php.inc
index 9b8d348fbb6e2..902507881a0ce 100644
--- a/ext/phar/tests/tar/files/tarmaker.php.inc
+++ b/ext/phar/tests/tar/files/tarmaker.php.inc
@@ -107,16 +107,16 @@ class tarmaker
 
         $checksum = pack('a8', sprintf('%6s ', decoct($checksum)));
 
-        fwrite($this->tmp, (binary)$block . $checksum . $blockend, 512);
+        fwrite($this->tmp, $block . $checksum . $blockend, 512);
         if (is_resource($fileOrStream)) {
             stream_copy_to_stream($fileOrStream, $this->tmp);
             if ($stat['size'] % 512) {
-                fwrite($this->tmp, (binary)str_repeat("\0", 512 - $stat['size'] % 512));
+                fwrite($this->tmp, str_repeat("\0", 512 - $stat['size'] % 512));
             }
         } else {
-            fwrite($this->tmp, (binary)$fileOrStream);
+            fwrite($this->tmp, $fileOrStream);
             if (strlen($fileOrStream) % 512) {
-                fwrite($this->tmp, (binary)str_repeat("\0", 512 - strlen($fileOrStream) % 512));
+                fwrite($this->tmp, str_repeat("\0", 512 - strlen($fileOrStream) % 512));
             }
         }
     }

From 0a92c03685ac8a3f641d879fd5e825e52f33cfc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= <mail@pmmaga.net>
Date: Mon, 5 Dec 2016 20:59:37 +0100
Subject: [PATCH 4/4] Throw deprecated notices when the binary prefix or cast
 are used

---
 Zend/zend_language_scanner.c | 1726 +++++++++++++++++-----------------
 Zend/zend_language_scanner.l |   20 +-
 2 files changed, 901 insertions(+), 845 deletions(-)

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index afc3da52dd5ea..d0b0bf6e114e4 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1160,7 +1160,7 @@ int start_line = CG(zend_lineno);
 yy4:
 	YYDEBUG(4, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 1804 "Zend/zend_language_scanner.l"
+#line 1810 "Zend/zend_language_scanner.l"
 	{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_TOKEN(END);
@@ -1221,7 +1221,7 @@ int start_line = CG(zend_lineno);
 yy7:
 	YYDEBUG(7, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 1795 "Zend/zend_language_scanner.l"
+#line 1801 "Zend/zend_language_scanner.l"
 	{
 	if (CG(short_tags)) {
 		BEGIN(ST_IN_SCRIPTING);
@@ -1236,7 +1236,7 @@ int start_line = CG(zend_lineno);
 	++YYCURSOR;
 	YYDEBUG(9, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 1782 "Zend/zend_language_scanner.l"
+#line 1788 "Zend/zend_language_scanner.l"
 	{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN(T_OPEN_TAG_WITH_ECHO);
@@ -1272,7 +1272,7 @@ int start_line = CG(zend_lineno);
 yy15:
 	YYDEBUG(15, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 1788 "Zend/zend_language_scanner.l"
+#line 1794 "Zend/zend_language_scanner.l"
 	{
 	HANDLE_NEWLINE(yytext[yyleng-1]);
 	BEGIN(ST_IN_SCRIPTING);
@@ -1335,7 +1335,7 @@ int start_line = CG(zend_lineno);
 yy20:
 		YYDEBUG(20, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2214 "Zend/zend_language_scanner.l"
+#line 2232 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_TOKEN(END);
@@ -1400,7 +1400,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(23, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2158 "Zend/zend_language_scanner.l"
+#line 2176 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('`');
@@ -1426,7 +1426,7 @@ int start_line = CG(zend_lineno);
 yy27:
 		YYDEBUG(27, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1869 "Zend/zend_language_scanner.l"
+#line 1875 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	RETURN_TOKEN(T_VARIABLE);
@@ -1437,7 +1437,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(29, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1587 "Zend/zend_language_scanner.l"
+#line 1593 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
@@ -1448,7 +1448,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(31, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2145 "Zend/zend_language_scanner.l"
+#line 2163 "Zend/zend_language_scanner.l"
 		{
 	Z_LVAL_P(zendlval) = (zend_long) '{';
 	yy_push_state(ST_IN_SCRIPTING);
@@ -1469,7 +1469,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(35, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1862 "Zend/zend_language_scanner.l"
+#line 1868 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
@@ -1494,7 +1494,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(38, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1853 "Zend/zend_language_scanner.l"
+#line 1859 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
@@ -1554,7 +1554,7 @@ int start_line = CG(zend_lineno);
 yy42:
 		YYDEBUG(42, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2164 "Zend/zend_language_scanner.l"
+#line 2182 "Zend/zend_language_scanner.l"
 		{
 	if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
 		YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
@@ -1609,7 +1609,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(44, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2153 "Zend/zend_language_scanner.l"
+#line 2171 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('"');
@@ -1653,7 +1653,7 @@ int start_line = CG(zend_lineno);
 yy49:
 		YYDEBUG(49, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1869 "Zend/zend_language_scanner.l"
+#line 1875 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	RETURN_TOKEN(T_VARIABLE);
@@ -1664,7 +1664,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(51, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1587 "Zend/zend_language_scanner.l"
+#line 1593 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
@@ -1675,7 +1675,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(53, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2145 "Zend/zend_language_scanner.l"
+#line 2163 "Zend/zend_language_scanner.l"
 		{
 	Z_LVAL_P(zendlval) = (zend_long) '{';
 	yy_push_state(ST_IN_SCRIPTING);
@@ -1696,7 +1696,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(57, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1862 "Zend/zend_language_scanner.l"
+#line 1868 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
@@ -1721,7 +1721,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(60, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1853 "Zend/zend_language_scanner.l"
+#line 1859 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
@@ -1739,7 +1739,7 @@ int start_line = CG(zend_lineno);
 	++YYCURSOR;
 	YYDEBUG(64, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 2131 "Zend/zend_language_scanner.l"
+#line 2149 "Zend/zend_language_scanner.l"
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack));
 
@@ -1800,7 +1800,7 @@ int start_line = CG(zend_lineno);
 yy68:
 		YYDEBUG(68, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2256 "Zend/zend_language_scanner.l"
+#line 2274 "Zend/zend_language_scanner.l"
 		{
 	int newline = 0;
 
@@ -1912,7 +1912,7 @@ int start_line = CG(zend_lineno);
 yy73:
 		YYDEBUG(73, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1869 "Zend/zend_language_scanner.l"
+#line 1875 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	RETURN_TOKEN(T_VARIABLE);
@@ -1923,7 +1923,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(75, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1587 "Zend/zend_language_scanner.l"
+#line 1593 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
@@ -1934,7 +1934,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(77, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2145 "Zend/zend_language_scanner.l"
+#line 2163 "Zend/zend_language_scanner.l"
 		{
 	Z_LVAL_P(zendlval) = (zend_long) '{';
 	yy_push_state(ST_IN_SCRIPTING);
@@ -1955,7 +1955,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(81, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1862 "Zend/zend_language_scanner.l"
+#line 1868 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
@@ -1980,7 +1980,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(84, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1853 "Zend/zend_language_scanner.l"
+#line 1859 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
@@ -2156,7 +2156,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(88, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2387 "Zend/zend_language_scanner.l"
+#line 2405 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_TOKEN(END);
@@ -2190,7 +2190,7 @@ int start_line = CG(zend_lineno);
 yy93:
 		YYDEBUG(93, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1576 "Zend/zend_language_scanner.l"
+#line 1582 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(yytext[0]);
 }
@@ -2200,10 +2200,14 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(95, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2035 "Zend/zend_language_scanner.l"
+#line 2045 "Zend/zend_language_scanner.l"
 		{
 	int bprefix = (yytext[0] != '"') ? 1 : 0;
 
+	if (bprefix == 1) {
+		zend_error(E_DEPRECATED, "The usage of the 'b' prefix is deprecated");
+	}
+
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '"':
@@ -2241,13 +2245,13 @@ int start_line = CG(zend_lineno);
 	BEGIN(ST_DOUBLE_QUOTES);
 	RETURN_TOKEN('"');
 }
-#line 2245 "Zend/zend_language_scanner.c"
+#line 2249 "Zend/zend_language_scanner.c"
 yy96:
 		YYDEBUG(96, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(97, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1898 "Zend/zend_language_scanner.l"
+#line 1904 "Zend/zend_language_scanner.l"
 		{
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
@@ -2276,7 +2280,7 @@ int start_line = CG(zend_lineno);
 
 	RETURN_TOKEN(T_COMMENT);
 }
-#line 2280 "Zend/zend_language_scanner.c"
+#line 2284 "Zend/zend_language_scanner.c"
 yy98:
 		YYDEBUG(98, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2307,12 +2311,16 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(102, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1966 "Zend/zend_language_scanner.l"
+#line 1972 "Zend/zend_language_scanner.l"
 		{
 	register char *s, *t;
 	char *end;
 	int bprefix = (yytext[0] != '\'') ? 1 : 0;
 
+	if (bprefix == 1) {
+		zend_error(E_DEPRECATED, "The usage of the 'b' prefix is deprecated");
+	}
+
 	while (1) {
 		if (YYCURSOR < YYLIMIT) {
 			if (*YYCURSOR == '\'') {
@@ -2375,7 +2383,7 @@ int start_line = CG(zend_lineno);
 	}
 	RETURN_TOKEN(T_CONSTANT_ENCAPSED_STRING);
 }
-#line 2379 "Zend/zend_language_scanner.c"
+#line 2387 "Zend/zend_language_scanner.c"
 yy103:
 		YYDEBUG(103, *YYCURSOR);
 		yyaccept = 0;
@@ -2505,7 +2513,7 @@ int start_line = CG(zend_lineno);
 yy111:
 		YYDEBUG(111, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1646 "Zend/zend_language_scanner.l"
+#line 1652 "Zend/zend_language_scanner.l"
 		{
 	char *end;
 	if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
@@ -2550,7 +2558,7 @@ int start_line = CG(zend_lineno);
 	ZEND_ASSERT(!errno);
 	RETURN_TOKEN(T_LNUMBER);
 }
-#line 2554 "Zend/zend_language_scanner.c"
+#line 2562 "Zend/zend_language_scanner.c"
 yy112:
 		YYDEBUG(112, *YYCURSOR);
 		yyaccept = 1;
@@ -2631,12 +2639,12 @@ int start_line = CG(zend_lineno);
 yy120:
 		YYDEBUG(120, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1892 "Zend/zend_language_scanner.l"
+#line 1898 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	RETURN_TOKEN(T_STRING);
 }
-#line 2640 "Zend/zend_language_scanner.c"
+#line 2648 "Zend/zend_language_scanner.c"
 yy121:
 		YYDEBUG(121, *YYCURSOR);
 		yyaccept = 2;
@@ -2925,7 +2933,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_NS_SEPARATOR);
 }
-#line 2929 "Zend/zend_language_scanner.c"
+#line 2937 "Zend/zend_language_scanner.c"
 yy144:
 		YYDEBUG(144, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2941,23 +2949,23 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(147, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2125 "Zend/zend_language_scanner.l"
+#line 2143 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_BACKQUOTE);
 	RETURN_TOKEN('`');
 }
-#line 2950 "Zend/zend_language_scanner.c"
+#line 2958 "Zend/zend_language_scanner.c"
 yy148:
 		YYDEBUG(148, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(149, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1581 "Zend/zend_language_scanner.l"
+#line 1587 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_IN_SCRIPTING);
 	RETURN_TOKEN('{');
 }
-#line 2961 "Zend/zend_language_scanner.c"
+#line 2969 "Zend/zend_language_scanner.c"
 yy150:
 		YYDEBUG(150, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2969,7 +2977,7 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(152, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1593 "Zend/zend_language_scanner.l"
+#line 1599 "Zend/zend_language_scanner.l"
 		{
 	RESET_DOC_COMMENT();
 	if (!zend_stack_is_empty(&SCNG(state_stack))) {
@@ -2977,7 +2985,7 @@ int start_line = CG(zend_lineno);
 	}
 	RETURN_TOKEN('}');
 }
-#line 2981 "Zend/zend_language_scanner.c"
+#line 2989 "Zend/zend_language_scanner.c"
 yy153:
 		YYDEBUG(153, *YYCURSOR);
 		++YYCURSOR;
@@ -2985,11 +2993,11 @@ int start_line = CG(zend_lineno);
 yy154:
 		YYDEBUG(154, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1480 "Zend/zend_language_scanner.l"
+#line 1486 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IS_NOT_EQUAL);
 }
-#line 2993 "Zend/zend_language_scanner.c"
+#line 3001 "Zend/zend_language_scanner.c"
 yy155:
 		YYDEBUG(155, *YYCURSOR);
 		++YYCURSOR;
@@ -3014,42 +3022,42 @@ int start_line = CG(zend_lineno);
 yy157:
 		YYDEBUG(157, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1869 "Zend/zend_language_scanner.l"
+#line 1875 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	RETURN_TOKEN(T_VARIABLE);
 }
-#line 3023 "Zend/zend_language_scanner.c"
+#line 3031 "Zend/zend_language_scanner.c"
 yy158:
 		YYDEBUG(158, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(159, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1524 "Zend/zend_language_scanner.l"
+#line 1530 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_MOD_EQUAL);
 }
-#line 3033 "Zend/zend_language_scanner.c"
+#line 3041 "Zend/zend_language_scanner.c"
 yy160:
 		YYDEBUG(160, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(161, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1552 "Zend/zend_language_scanner.l"
+#line 1558 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_BOOLEAN_AND);
 }
-#line 3043 "Zend/zend_language_scanner.c"
+#line 3051 "Zend/zend_language_scanner.c"
 yy162:
 		YYDEBUG(162, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(163, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1536 "Zend/zend_language_scanner.l"
+#line 1542 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_AND_EQUAL);
 }
-#line 3053 "Zend/zend_language_scanner.c"
+#line 3061 "Zend/zend_language_scanner.c"
 yy164:
 		YYDEBUG(164, *YYCURSOR);
 		++YYCURSOR;
@@ -3179,61 +3187,61 @@ int start_line = CG(zend_lineno);
 		if ((yych = *YYCURSOR) == '=') goto yy289;
 		YYDEBUG(177, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1508 "Zend/zend_language_scanner.l"
+#line 1514 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_POW);
 }
-#line 3187 "Zend/zend_language_scanner.c"
+#line 3195 "Zend/zend_language_scanner.c"
 yy178:
 		YYDEBUG(178, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(179, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1504 "Zend/zend_language_scanner.l"
+#line 1510 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_MUL_EQUAL);
 }
-#line 3197 "Zend/zend_language_scanner.c"
+#line 3205 "Zend/zend_language_scanner.c"
 yy180:
 		YYDEBUG(180, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(181, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1460 "Zend/zend_language_scanner.l"
+#line 1466 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_INC);
 }
-#line 3207 "Zend/zend_language_scanner.c"
+#line 3215 "Zend/zend_language_scanner.c"
 yy182:
 		YYDEBUG(182, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(183, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1496 "Zend/zend_language_scanner.l"
+#line 1502 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_PLUS_EQUAL);
 }
-#line 3217 "Zend/zend_language_scanner.c"
+#line 3225 "Zend/zend_language_scanner.c"
 yy184:
 		YYDEBUG(184, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(185, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1464 "Zend/zend_language_scanner.l"
+#line 1470 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_DEC);
 }
-#line 3227 "Zend/zend_language_scanner.c"
+#line 3235 "Zend/zend_language_scanner.c"
 yy186:
 		YYDEBUG(186, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(187, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1500 "Zend/zend_language_scanner.l"
+#line 1506 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_MINUS_EQUAL);
 }
-#line 3237 "Zend/zend_language_scanner.c"
+#line 3245 "Zend/zend_language_scanner.c"
 yy188:
 		YYDEBUG(188, *YYCURSOR);
 		++YYCURSOR;
@@ -3244,7 +3252,7 @@ int start_line = CG(zend_lineno);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-#line 3248 "Zend/zend_language_scanner.c"
+#line 3256 "Zend/zend_language_scanner.c"
 yy190:
 		YYDEBUG(190, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3267,7 +3275,7 @@ int start_line = CG(zend_lineno);
 yy193:
 		YYDEBUG(193, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1740 "Zend/zend_language_scanner.l"
+#line 1746 "Zend/zend_language_scanner.l"
 		{
 	const char *end;
 
@@ -3276,17 +3284,17 @@ int start_line = CG(zend_lineno);
 	ZEND_ASSERT(end == yytext + yyleng);
 	RETURN_TOKEN(T_DNUMBER);
 }
-#line 3280 "Zend/zend_language_scanner.c"
+#line 3288 "Zend/zend_language_scanner.c"
 yy194:
 		YYDEBUG(194, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(195, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1520 "Zend/zend_language_scanner.l"
+#line 1526 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_CONCAT_EQUAL);
 }
-#line 3290 "Zend/zend_language_scanner.c"
+#line 3298 "Zend/zend_language_scanner.c"
 yy196:
 		YYDEBUG(196, *YYCURSOR);
 		yyaccept = 4;
@@ -3295,7 +3303,7 @@ int start_line = CG(zend_lineno);
 yy197:
 		YYDEBUG(197, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1927 "Zend/zend_language_scanner.l"
+#line 1933 "Zend/zend_language_scanner.l"
 		{
 	int doc_com;
 
@@ -3328,17 +3336,17 @@ int start_line = CG(zend_lineno);
 
 	RETURN_TOKEN(T_COMMENT);
 }
-#line 3332 "Zend/zend_language_scanner.c"
+#line 3340 "Zend/zend_language_scanner.c"
 yy198:
 		YYDEBUG(198, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(199, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1516 "Zend/zend_language_scanner.l"
+#line 1522 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_DIV_EQUAL);
 }
-#line 3342 "Zend/zend_language_scanner.c"
+#line 3350 "Zend/zend_language_scanner.c"
 yy200:
 		YYDEBUG(200, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3374,7 +3382,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM);
 }
-#line 3378 "Zend/zend_language_scanner.c"
+#line 3386 "Zend/zend_language_scanner.c"
 yy205:
 		YYDEBUG(205, *YYCURSOR);
 		yyaccept = 5;
@@ -3385,22 +3393,22 @@ int start_line = CG(zend_lineno);
 yy206:
 		YYDEBUG(206, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1568 "Zend/zend_language_scanner.l"
+#line 1574 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_SL);
 }
-#line 3393 "Zend/zend_language_scanner.c"
+#line 3401 "Zend/zend_language_scanner.c"
 yy207:
 		YYDEBUG(207, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '>') goto yy307;
 		YYDEBUG(208, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1488 "Zend/zend_language_scanner.l"
+#line 1494 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IS_SMALLER_OR_EQUAL);
 }
-#line 3404 "Zend/zend_language_scanner.c"
+#line 3412 "Zend/zend_language_scanner.c"
 yy209:
 		YYDEBUG(209, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3411,42 +3419,42 @@ int start_line = CG(zend_lineno);
 		if ((yych = *YYCURSOR) == '=') goto yy309;
 		YYDEBUG(211, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1476 "Zend/zend_language_scanner.l"
+#line 1482 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IS_EQUAL);
 }
-#line 3419 "Zend/zend_language_scanner.c"
+#line 3427 "Zend/zend_language_scanner.c"
 yy212:
 		YYDEBUG(212, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(213, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1444 "Zend/zend_language_scanner.l"
+#line 1450 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_DOUBLE_ARROW);
 }
-#line 3429 "Zend/zend_language_scanner.c"
+#line 3437 "Zend/zend_language_scanner.c"
 yy214:
 		YYDEBUG(214, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(215, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1492 "Zend/zend_language_scanner.l"
+#line 1498 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IS_GREATER_OR_EQUAL);
 }
-#line 3439 "Zend/zend_language_scanner.c"
+#line 3447 "Zend/zend_language_scanner.c"
 yy216:
 		YYDEBUG(216, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy311;
 		YYDEBUG(217, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1572 "Zend/zend_language_scanner.l"
+#line 1578 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_SR);
 }
-#line 3450 "Zend/zend_language_scanner.c"
+#line 3458 "Zend/zend_language_scanner.c"
 yy218:
 		YYDEBUG(218, *YYCURSOR);
 		++YYCURSOR;
@@ -3455,12 +3463,12 @@ int start_line = CG(zend_lineno);
 yy219:
 		YYDEBUG(219, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1960 "Zend/zend_language_scanner.l"
+#line 1966 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(INITIAL);
 	RETURN_TOKEN(T_CLOSE_TAG);  /* implicit ';' at php-end tag */
 }
-#line 3464 "Zend/zend_language_scanner.c"
+#line 3472 "Zend/zend_language_scanner.c"
 yy220:
 		YYDEBUG(220, *YYCURSOR);
 		++YYCURSOR;
@@ -3470,7 +3478,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_COALESCE);
 }
-#line 3474 "Zend/zend_language_scanner.c"
+#line 3482 "Zend/zend_language_scanner.c"
 yy222:
 		YYDEBUG(222, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3501,7 +3509,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_AS);
 }
-#line 3505 "Zend/zend_language_scanner.c"
+#line 3513 "Zend/zend_language_scanner.c"
 yy227:
 		YYDEBUG(227, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3591,7 +3599,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_DO);
 }
-#line 3595 "Zend/zend_language_scanner.c"
+#line 3603 "Zend/zend_language_scanner.c"
 yy236:
 		YYDEBUG(236, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3680,7 +3688,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_IF);
 }
-#line 3684 "Zend/zend_language_scanner.c"
+#line 3692 "Zend/zend_language_scanner.c"
 yy249:
 		YYDEBUG(249, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3741,11 +3749,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(256, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1556 "Zend/zend_language_scanner.l"
+#line 1562 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_LOGICAL_OR);
 }
-#line 3749 "Zend/zend_language_scanner.c"
+#line 3757 "Zend/zend_language_scanner.c"
 yy257:
 		YYDEBUG(257, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3859,11 +3867,11 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(271, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1544 "Zend/zend_language_scanner.l"
+#line 1550 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_XOR_EQUAL);
 }
-#line 3867 "Zend/zend_language_scanner.c"
+#line 3875 "Zend/zend_language_scanner.c"
 yy272:
 		YYDEBUG(272, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3891,31 +3899,31 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(274, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1540 "Zend/zend_language_scanner.l"
+#line 1546 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_OR_EQUAL);
 }
-#line 3899 "Zend/zend_language_scanner.c"
+#line 3907 "Zend/zend_language_scanner.c"
 yy275:
 		YYDEBUG(275, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(276, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1548 "Zend/zend_language_scanner.l"
+#line 1554 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_BOOLEAN_OR);
 }
-#line 3909 "Zend/zend_language_scanner.c"
+#line 3917 "Zend/zend_language_scanner.c"
 yy277:
 		YYDEBUG(277, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(278, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1472 "Zend/zend_language_scanner.l"
+#line 1478 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IS_NOT_IDENTICAL);
 }
-#line 3919 "Zend/zend_language_scanner.c"
+#line 3927 "Zend/zend_language_scanner.c"
 yy279:
 		YYDEBUG(279, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3981,11 +3989,11 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(290, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1512 "Zend/zend_language_scanner.l"
+#line 1518 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_POW_EQUAL);
 }
-#line 3989 "Zend/zend_language_scanner.c"
+#line 3997 "Zend/zend_language_scanner.c"
 yy291:
 		YYDEBUG(291, *YYCURSOR);
 		++YYCURSOR;
@@ -3995,7 +4003,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_ELLIPSIS);
 }
-#line 3999 "Zend/zend_language_scanner.c"
+#line 4007 "Zend/zend_language_scanner.c"
 yy293:
 		YYDEBUG(293, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4019,7 +4027,7 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(296, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1618 "Zend/zend_language_scanner.l"
+#line 1624 "Zend/zend_language_scanner.l"
 		{
 	char *bin = yytext + 2; /* Skip "0b" */
 	int len = yyleng - 2;
@@ -4047,7 +4055,7 @@ int start_line = CG(zend_lineno);
 		RETURN_TOKEN(T_DNUMBER);
 	}
 }
-#line 4051 "Zend/zend_language_scanner.c"
+#line 4059 "Zend/zend_language_scanner.c"
 yy297:
 		YYDEBUG(297, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4073,7 +4081,7 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(302, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1691 "Zend/zend_language_scanner.l"
+#line 1697 "Zend/zend_language_scanner.l"
 		{
 	char *hex = yytext + 2; /* Skip "0x" */
 	int len = yyleng - 2;
@@ -4101,7 +4109,7 @@ int start_line = CG(zend_lineno);
 		RETURN_TOKEN(T_DNUMBER);
 	}
 }
-#line 4105 "Zend/zend_language_scanner.c"
+#line 4113 "Zend/zend_language_scanner.c"
 yy303:
 		YYDEBUG(303, *YYCURSOR);
 		++YYCURSOR;
@@ -4136,41 +4144,41 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(306, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1528 "Zend/zend_language_scanner.l"
+#line 1534 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_SL_EQUAL);
 }
-#line 4144 "Zend/zend_language_scanner.c"
+#line 4152 "Zend/zend_language_scanner.c"
 yy307:
 		YYDEBUG(307, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(308, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1484 "Zend/zend_language_scanner.l"
+#line 1490 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_SPACESHIP);
 }
-#line 4154 "Zend/zend_language_scanner.c"
+#line 4162 "Zend/zend_language_scanner.c"
 yy309:
 		YYDEBUG(309, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(310, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1468 "Zend/zend_language_scanner.l"
+#line 1474 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IS_IDENTICAL);
 }
-#line 4164 "Zend/zend_language_scanner.c"
+#line 4172 "Zend/zend_language_scanner.c"
 yy311:
 		YYDEBUG(311, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(312, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1532 "Zend/zend_language_scanner.l"
+#line 1538 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_SR_EQUAL);
 }
-#line 4174 "Zend/zend_language_scanner.c"
+#line 4182 "Zend/zend_language_scanner.c"
 yy313:
 		YYDEBUG(313, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4194,11 +4202,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(317, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1560 "Zend/zend_language_scanner.l"
+#line 1566 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_LOGICAL_AND);
 }
-#line 4202 "Zend/zend_language_scanner.c"
+#line 4210 "Zend/zend_language_scanner.c"
 yy318:
 		YYDEBUG(318, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4283,7 +4291,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_EXIT);
 }
-#line 4287 "Zend/zend_language_scanner.c"
+#line 4295 "Zend/zend_language_scanner.c"
 yy331:
 		YYDEBUG(331, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4369,7 +4377,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_FOR);
 }
-#line 4373 "Zend/zend_language_scanner.c"
+#line 4381 "Zend/zend_language_scanner.c"
 yy341:
 		YYDEBUG(341, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4442,7 +4450,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_NEW);
 }
-#line 4446 "Zend/zend_language_scanner.c"
+#line 4454 "Zend/zend_language_scanner.c"
 yy353:
 		YYDEBUG(353, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4519,7 +4527,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_TRY);
 }
-#line 4523 "Zend/zend_language_scanner.c"
+#line 4531 "Zend/zend_language_scanner.c"
 yy364:
 		YYDEBUG(364, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4534,11 +4542,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(366, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1392 "Zend/zend_language_scanner.l"
+#line 1398 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_USE);
 }
-#line 4542 "Zend/zend_language_scanner.c"
+#line 4550 "Zend/zend_language_scanner.c"
 yy367:
 		YYDEBUG(367, *YYCURSOR);
 		++YYCURSOR;
@@ -4551,7 +4559,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_VAR);
 }
-#line 4555 "Zend/zend_language_scanner.c"
+#line 4563 "Zend/zend_language_scanner.c"
 yy369:
 		YYDEBUG(369, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4566,11 +4574,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(371, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1564 "Zend/zend_language_scanner.l"
+#line 1570 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_LOGICAL_XOR);
 }
-#line 4574 "Zend/zend_language_scanner.c"
+#line 4582 "Zend/zend_language_scanner.c"
 yy372:
 		YYDEBUG(372, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4788,7 +4796,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_CASE);
 }
-#line 4792 "Zend/zend_language_scanner.c"
+#line 4800 "Zend/zend_language_scanner.c"
 yy403:
 		YYDEBUG(403, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4843,7 +4851,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_ECHO);
 }
-#line 4847 "Zend/zend_language_scanner.c"
+#line 4855 "Zend/zend_language_scanner.c"
 yy412:
 		YYDEBUG(412, *YYCURSOR);
 		++YYCURSOR;
@@ -4871,7 +4879,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_ELSE);
 }
-#line 4875 "Zend/zend_language_scanner.c"
+#line 4883 "Zend/zend_language_scanner.c"
 yy414:
 		YYDEBUG(414, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4916,11 +4924,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(421, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1368 "Zend/zend_language_scanner.l"
+#line 1374 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_EVAL);
 }
-#line 4924 "Zend/zend_language_scanner.c"
+#line 4932 "Zend/zend_language_scanner.c"
 yy422:
 		YYDEBUG(422, *YYCURSOR);
 		++YYCURSOR;
@@ -4933,7 +4941,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_EXIT);
 }
-#line 4937 "Zend/zend_language_scanner.c"
+#line 4945 "Zend/zend_language_scanner.c"
 yy424:
 		YYDEBUG(424, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4976,7 +4984,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_GOTO);
 }
-#line 4980 "Zend/zend_language_scanner.c"
+#line 4988 "Zend/zend_language_scanner.c"
 yy431:
 		YYDEBUG(431, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5025,11 +5033,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(437, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1448 "Zend/zend_language_scanner.l"
+#line 1454 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_LIST);
 }
-#line 5033 "Zend/zend_language_scanner.c"
+#line 5041 "Zend/zend_language_scanner.c"
 yy438:
 		YYDEBUG(438, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5220,7 +5228,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_INT_CAST);
 }
-#line 5224 "Zend/zend_language_scanner.c"
+#line 5232 "Zend/zend_language_scanner.c"
 yy470:
 		YYDEBUG(470, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5317,12 +5325,16 @@ int start_line = CG(zend_lineno);
 yy481:
 		YYDEBUG(481, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2077 "Zend/zend_language_scanner.l"
+#line 2091 "Zend/zend_language_scanner.l"
 		{
 	char *s;
 	int bprefix = (yytext[0] != '<') ? 1 : 0;
 	zend_heredoc_label *heredoc_label = emalloc(sizeof(zend_heredoc_label));
 
+	if (bprefix == 1) {
+		zend_error(E_DEPRECATED, "The usage of the 'b' prefix is deprecated");
+	}
+
 	CG(zend_lineno)++;
 	heredoc_label->length = yyleng-bprefix-3-1-(yytext[yyleng-2]=='\r'?1:0);
 	s = yytext+bprefix+3;
@@ -5364,7 +5376,7 @@ int start_line = CG(zend_lineno);
 
 	RETURN_TOKEN(T_START_HEREDOC);
 }
-#line 5368 "Zend/zend_language_scanner.c"
+#line 5380 "Zend/zend_language_scanner.c"
 yy482:
 		YYDEBUG(482, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5384,11 +5396,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(485, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1452 "Zend/zend_language_scanner.l"
+#line 1458 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ARRAY);
 }
-#line 5392 "Zend/zend_language_scanner.c"
+#line 5404 "Zend/zend_language_scanner.c"
 yy486:
 		YYDEBUG(486, *YYCURSOR);
 		++YYCURSOR;
@@ -5401,7 +5413,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_BREAK);
 }
-#line 5405 "Zend/zend_language_scanner.c"
+#line 5417 "Zend/zend_language_scanner.c"
 yy488:
 		YYDEBUG(488, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5420,7 +5432,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_CATCH);
 }
-#line 5424 "Zend/zend_language_scanner.c"
+#line 5436 "Zend/zend_language_scanner.c"
 yy491:
 		YYDEBUG(491, *YYCURSOR);
 		++YYCURSOR;
@@ -5433,7 +5445,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_CLASS);
 }
-#line 5437 "Zend/zend_language_scanner.c"
+#line 5449 "Zend/zend_language_scanner.c"
 yy493:
 		YYDEBUG(493, *YYCURSOR);
 		++YYCURSOR;
@@ -5446,7 +5458,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_CLONE);
 }
-#line 5450 "Zend/zend_language_scanner.c"
+#line 5462 "Zend/zend_language_scanner.c"
 yy495:
 		YYDEBUG(495, *YYCURSOR);
 		++YYCURSOR;
@@ -5459,7 +5471,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_CONST);
 }
-#line 5463 "Zend/zend_language_scanner.c"
+#line 5475 "Zend/zend_language_scanner.c"
 yy497:
 		YYDEBUG(497, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5492,11 +5504,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(502, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1408 "Zend/zend_language_scanner.l"
+#line 1414 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_EMPTY);
 }
-#line 5500 "Zend/zend_language_scanner.c"
+#line 5512 "Zend/zend_language_scanner.c"
 yy503:
 		YYDEBUG(503, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5521,7 +5533,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_ENDIF);
 }
-#line 5525 "Zend/zend_language_scanner.c"
+#line 5537 "Zend/zend_language_scanner.c"
 yy507:
 		YYDEBUG(507, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5563,11 +5575,11 @@ int start_line = CG(zend_lineno);
 yy511:
 		YYDEBUG(511, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1424 "Zend/zend_language_scanner.l"
+#line 1430 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_FINAL);
 }
-#line 5571 "Zend/zend_language_scanner.c"
+#line 5583 "Zend/zend_language_scanner.c"
 yy512:
 		YYDEBUG(512, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5624,11 +5636,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(521, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1404 "Zend/zend_language_scanner.l"
+#line 1410 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ISSET);
 }
-#line 5632 "Zend/zend_language_scanner.c"
+#line 5644 "Zend/zend_language_scanner.c"
 yy522:
 		YYDEBUG(522, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5647,7 +5659,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_PRINT);
 }
-#line 5651 "Zend/zend_language_scanner.c"
+#line 5663 "Zend/zend_language_scanner.c"
 yy525:
 		YYDEBUG(525, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5702,7 +5714,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_THROW);
 }
-#line 5706 "Zend/zend_language_scanner.c"
+#line 5718 "Zend/zend_language_scanner.c"
 yy534:
 		YYDEBUG(534, *YYCURSOR);
 		++YYCURSOR;
@@ -5715,7 +5727,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_TRAIT);
 }
-#line 5719 "Zend/zend_language_scanner.c"
+#line 5731 "Zend/zend_language_scanner.c"
 yy536:
 		YYDEBUG(536, *YYCURSOR);
 		++YYCURSOR;
@@ -5724,11 +5736,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(537, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1440 "Zend/zend_language_scanner.l"
+#line 1446 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_UNSET);
 }
-#line 5732 "Zend/zend_language_scanner.c"
+#line 5744 "Zend/zend_language_scanner.c"
 yy538:
 		YYDEBUG(538, *YYCURSOR);
 		++YYCURSOR;
@@ -5741,7 +5753,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_WHILE);
 }
-#line 5745 "Zend/zend_language_scanner.c"
+#line 5757 "Zend/zend_language_scanner.c"
 yy540:
 		YYDEBUG(540, *YYCURSOR);
 		yyaccept = 6;
@@ -5763,7 +5775,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_YIELD);
 }
-#line 5767 "Zend/zend_language_scanner.c"
+#line 5779 "Zend/zend_language_scanner.c"
 yy542:
 		YYDEBUG(542, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5855,11 +5867,11 @@ int start_line = CG(zend_lineno);
 		++YYCURSOR;
 		YYDEBUG(557, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1360 "Zend/zend_language_scanner.l"
+#line 1366 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_BOOL_CAST);
 }
-#line 5863 "Zend/zend_language_scanner.c"
+#line 5875 "Zend/zend_language_scanner.c"
 yy558:
 		YYDEBUG(558, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5893,12 +5905,12 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_DOUBLE_CAST);
 }
-#line 5897 "Zend/zend_language_scanner.c"
+#line 5909 "Zend/zend_language_scanner.c"
 yy564:
 		YYDEBUG(564, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'G') goto yy616;
-		if (yych == 'g') goto yy616;
+		if (yych == 'G') goto yy622;
+		if (yych == 'g') goto yy622;
 		goto yy166;
 yy565:
 		YYDEBUG(565, *YYCURSOR);
@@ -5911,7 +5923,7 @@ int start_line = CG(zend_lineno);
 			goto yy166;
 		} else {
 			if (yych <= ' ') goto yy565;
-			if (yych == ')') goto yy622;
+			if (yych == ')') goto yy624;
 			goto yy166;
 		}
 yy567:
@@ -5923,32 +5935,32 @@ int start_line = CG(zend_lineno);
 yy568:
 		YYDEBUG(568, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy624;
-		if (yych == 'c') goto yy624;
+		if (yych == 'C') goto yy626;
+		if (yych == 'c') goto yy626;
 		goto yy128;
 yy569:
 		YYDEBUG(569, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy625;
-		if (yych == 'l') goto yy625;
+		if (yych == 'L') goto yy627;
+		if (yych == 'l') goto yy627;
 		goto yy128;
 yy570:
 		YYDEBUG(570, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'U') goto yy626;
-		if (yych == 'u') goto yy626;
+		if (yych == 'U') goto yy628;
+		if (yych == 'u') goto yy628;
 		goto yy128;
 yy571:
 		YYDEBUG(571, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy627;
-		if (yych == 'e') goto yy627;
+		if (yych == 'E') goto yy629;
+		if (yych == 'e') goto yy629;
 		goto yy128;
 yy572:
 		YYDEBUG(572, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy629;
-		if (yych == 't') goto yy629;
+		if (yych == 'T') goto yy631;
+		if (yych == 't') goto yy631;
 		goto yy128;
 yy573:
 		YYDEBUG(573, *YYCURSOR);
@@ -5962,12 +5974,12 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_ELSEIF);
 }
-#line 5966 "Zend/zend_language_scanner.c"
+#line 5978 "Zend/zend_language_scanner.c"
 yy575:
 		YYDEBUG(575, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy631;
-		if (yych == 'l') goto yy631;
+		if (yych == 'L') goto yy633;
+		if (yych == 'l') goto yy633;
 		goto yy128;
 yy576:
 		YYDEBUG(576, *YYCURSOR);
@@ -5977,14 +5989,14 @@ int start_line = CG(zend_lineno);
 				if (yych <= '/') goto yy577;
 				if (yych <= '9') goto yy127;
 			} else {
-				if (yych == 'E') goto yy632;
+				if (yych == 'E') goto yy634;
 				if (yych <= 'Z') goto yy127;
 			}
 		} else {
 			if (yych <= 'd') {
 				if (yych != '`') goto yy127;
 			} else {
-				if (yych <= 'e') goto yy632;
+				if (yych <= 'e') goto yy634;
 				if (yych <= 'z') goto yy127;
 				if (yych >= 0x80) goto yy127;
 			}
@@ -5996,42 +6008,42 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_ENDFOR);
 }
-#line 6000 "Zend/zend_language_scanner.c"
+#line 6012 "Zend/zend_language_scanner.c"
 yy578:
 		YYDEBUG(578, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy633;
-		if (yych == 't') goto yy633;
+		if (yych == 'T') goto yy635;
+		if (yych == 't') goto yy635;
 		goto yy128;
 yy579:
 		YYDEBUG(579, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy634;
-		if (yych == 'l') goto yy634;
+		if (yych == 'L') goto yy636;
+		if (yych == 'l') goto yy636;
 		goto yy128;
 yy580:
 		YYDEBUG(580, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy635;
-		if (yych == 's') goto yy635;
+		if (yych == 'S') goto yy637;
+		if (yych == 's') goto yy637;
 		goto yy128;
 yy581:
 		YYDEBUG(581, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'Y') goto yy637;
-		if (yych == 'y') goto yy637;
+		if (yych == 'Y') goto yy639;
+		if (yych == 'y') goto yy639;
 		goto yy128;
 yy582:
 		YYDEBUG(582, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'H') goto yy639;
-		if (yych == 'h') goto yy639;
+		if (yych == 'H') goto yy641;
+		if (yych == 'h') goto yy641;
 		goto yy128;
 yy583:
 		YYDEBUG(583, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy641;
-		if (yych == 'o') goto yy641;
+		if (yych == 'O') goto yy643;
+		if (yych == 'o') goto yy643;
 		goto yy128;
 yy584:
 		YYDEBUG(584, *YYCURSOR);
@@ -6041,58 +6053,58 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(585, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1400 "Zend/zend_language_scanner.l"
+#line 1406 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_GLOBAL);
 }
-#line 6049 "Zend/zend_language_scanner.c"
+#line 6061 "Zend/zend_language_scanner.c"
 yy586:
 		YYDEBUG(586, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy642;
-		if (yych == 'e') goto yy642;
+		if (yych == 'E') goto yy644;
+		if (yych == 'e') goto yy644;
 		goto yy128;
 yy587:
 		YYDEBUG(587, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy643;
-		if (yych == 'e') goto yy643;
+		if (yych == 'E') goto yy645;
+		if (yych == 'e') goto yy645;
 		goto yy128;
 yy588:
 		YYDEBUG(588, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy645;
-		if (yych == 'c') goto yy645;
+		if (yych == 'C') goto yy647;
+		if (yych == 'c') goto yy647;
 		goto yy128;
 yy589:
 		YYDEBUG(589, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy646;
-		if (yych == 'd') goto yy646;
+		if (yych == 'D') goto yy648;
+		if (yych == 'd') goto yy648;
 		goto yy128;
 yy590:
 		YYDEBUG(590, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy647;
-		if (yych == 'a') goto yy647;
+		if (yych == 'A') goto yy649;
+		if (yych == 'a') goto yy649;
 		goto yy128;
 yy591:
 		YYDEBUG(591, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy648;
-		if (yych == 'a') goto yy648;
+		if (yych == 'A') goto yy650;
+		if (yych == 'a') goto yy650;
 		goto yy128;
 yy592:
 		YYDEBUG(592, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy649;
-		if (yych == 'e') goto yy649;
+		if (yych == 'E') goto yy651;
+		if (yych == 'e') goto yy651;
 		goto yy128;
 yy593:
 		YYDEBUG(593, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy651;
-		if (yych == 't') goto yy651;
+		if (yych == 'T') goto yy653;
+		if (yych == 't') goto yy653;
 		goto yy128;
 yy594:
 		YYDEBUG(594, *YYCURSOR);
@@ -6102,16 +6114,16 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(595, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1436 "Zend/zend_language_scanner.l"
+#line 1442 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_PUBLIC);
 }
-#line 6110 "Zend/zend_language_scanner.c"
+#line 6122 "Zend/zend_language_scanner.c"
 yy596:
 		YYDEBUG(596, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy652;
-		if (yych == 'e') goto yy652;
+		if (yych == 'E') goto yy654;
+		if (yych == 'e') goto yy654;
 		goto yy128;
 yy597:
 		YYDEBUG(597, *YYCURSOR);
@@ -6125,7 +6137,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_RETURN);
 }
-#line 6129 "Zend/zend_language_scanner.c"
+#line 6141 "Zend/zend_language_scanner.c"
 yy599:
 		YYDEBUG(599, *YYCURSOR);
 		++YYCURSOR;
@@ -6134,11 +6146,11 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(600, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1416 "Zend/zend_language_scanner.l"
+#line 1422 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_STATIC);
 }
-#line 6142 "Zend/zend_language_scanner.c"
+#line 6154 "Zend/zend_language_scanner.c"
 yy601:
 		YYDEBUG(601, *YYCURSOR);
 		++YYCURSOR;
@@ -6151,7 +6163,7 @@ int start_line = CG(zend_lineno);
 		{
 	RETURN_TOKEN(T_SWITCH);
 }
-#line 6155 "Zend/zend_language_scanner.c"
+#line 6167 "Zend/zend_language_scanner.c"
 yy603:
 		YYDEBUG(603, *YYCURSOR);
 		++YYCURSOR;
@@ -6170,72 +6182,72 @@ int start_line = CG(zend_lineno);
 			if (yych <= 'F') {
 				if (yych <= ' ') goto yy603;
 				if (yych <= 'E') goto yy166;
-				goto yy654;
+				goto yy656;
 			} else {
-				if (yych == 'f') goto yy654;
+				if (yych == 'f') goto yy656;
 				goto yy166;
 			}
 		}
 yy605:
 		YYDEBUG(605, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy655;
-		if (yych == 's') goto yy655;
+		if (yych == 'S') goto yy657;
+		if (yych == 's') goto yy657;
 		goto yy128;
 yy606:
 		YYDEBUG(606, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy656;
+		if (yych == '_') goto yy658;
 		goto yy128;
 yy607:
 		YYDEBUG(607, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy658;
+		if (yych == '_') goto yy660;
 		goto yy128;
 yy608:
 		YYDEBUG(608, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy659;
-		if (yych == 't') goto yy659;
+		if (yych == 'T') goto yy661;
+		if (yych == 't') goto yy661;
 		goto yy128;
 yy609:
 		YYDEBUG(609, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy660;
+		if (yych == '_') goto yy662;
 		goto yy128;
 yy610:
 		YYDEBUG(610, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy661;
+		if (yych == '_') goto yy663;
 		goto yy128;
 yy611:
 		YYDEBUG(611, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy662;
-		if (yych == 'o') goto yy662;
+		if (yych == 'O') goto yy664;
+		if (yych == 'o') goto yy664;
 		goto yy128;
 yy612:
 		YYDEBUG(612, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy663;
-		if (yych == 's') goto yy663;
+		if (yych == 'S') goto yy665;
+		if (yych == 's') goto yy665;
 		goto yy128;
 yy613:
 		YYDEBUG(613, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy664;
-		if (yych == 't') goto yy664;
+		if (yych == 'T') goto yy666;
+		if (yych == 't') goto yy666;
 		goto yy128;
 yy614:
 		YYDEBUG(614, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(615, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1352 "Zend/zend_language_scanner.l"
+#line 1358 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ARRAY_CAST);
 }
-#line 6239 "Zend/zend_language_scanner.c"
+#line 6251 "Zend/zend_language_scanner.c"
 yy616:
 		YYDEBUG(616, *YYCURSOR);
 		++YYCURSOR;
@@ -6247,7 +6259,7 @@ int start_line = CG(zend_lineno);
 			goto yy166;
 		} else {
 			if (yych <= ' ') goto yy616;
-			if (yych == ')') goto yy665;
+			if (yych == ')') goto yy667;
 			goto yy166;
 		}
 yy618:
@@ -6273,482 +6285,483 @@ int start_line = CG(zend_lineno);
 			goto yy166;
 		} else {
 			if (yych <= ' ') goto yy620;
-			if (yych == ')') goto yy667;
+			if (yych == ')') goto yy669;
 			goto yy166;
 		}
 yy622:
 		YYDEBUG(622, *YYCURSOR);
 		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(623, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy622;
+			goto yy166;
+		} else {
+			if (yych <= ' ') goto yy622;
+			if (yych == ')') goto yy671;
+			goto yy166;
+		}
+yy624:
+		YYDEBUG(624, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(625, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1364 "Zend/zend_language_scanner.l"
+#line 1370 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_UNSET_CAST);
 }
-#line 6289 "Zend/zend_language_scanner.c"
-yy624:
-		YYDEBUG(624, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy669;
-		if (yych == 't') goto yy669;
-		goto yy128;
-yy625:
-		YYDEBUG(625, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy671;
-		if (yych == 'e') goto yy671;
-		goto yy128;
+#line 6315 "Zend/zend_language_scanner.c"
 yy626:
 		YYDEBUG(626, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy673;
-		if (yych == 'e') goto yy673;
+		if (yych == 'T') goto yy673;
+		if (yych == 't') goto yy673;
 		goto yy128;
 yy627:
 		YYDEBUG(627, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy675;
+		if (yych == 'e') goto yy675;
+		goto yy128;
+yy628:
+		YYDEBUG(628, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy677;
+		if (yych == 'e') goto yy677;
+		goto yy128;
+yy629:
+		YYDEBUG(629, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(628, *YYCURSOR);
+		YYDEBUG(630, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1214 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_DECLARE);
 }
-#line 6320 "Zend/zend_language_scanner.c"
-yy629:
-		YYDEBUG(629, *YYCURSOR);
+#line 6346 "Zend/zend_language_scanner.c"
+yy631:
+		YYDEBUG(631, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(630, *YYCURSOR);
+		YYDEBUG(632, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1242 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_DEFAULT);
 }
-#line 6333 "Zend/zend_language_scanner.c"
-yy631:
-		YYDEBUG(631, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy675;
-		if (yych == 'a') goto yy675;
-		goto yy128;
-yy632:
-		YYDEBUG(632, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy676;
-		if (yych == 'a') goto yy676;
-		goto yy128;
+#line 6359 "Zend/zend_language_scanner.c"
 yy633:
 		YYDEBUG(633, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy677;
-		if (yych == 'c') goto yy677;
+		if (yych == 'A') goto yy679;
+		if (yych == 'a') goto yy679;
 		goto yy128;
 yy634:
 		YYDEBUG(634, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy678;
-		if (yych == 'e') goto yy678;
+		if (yych == 'A') goto yy680;
+		if (yych == 'a') goto yy680;
 		goto yy128;
 yy635:
 		YYDEBUG(635, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'C') goto yy681;
+		if (yych == 'c') goto yy681;
+		goto yy128;
+yy636:
+		YYDEBUG(636, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy682;
+		if (yych == 'e') goto yy682;
+		goto yy128;
+yy637:
+		YYDEBUG(637, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(636, *YYCURSOR);
+		YYDEBUG(638, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1278 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_EXTENDS);
 }
-#line 6370 "Zend/zend_language_scanner.c"
-yy637:
-		YYDEBUG(637, *YYCURSOR);
+#line 6396 "Zend/zend_language_scanner.c"
+yy639:
+		YYDEBUG(639, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(638, *YYCURSOR);
+		YYDEBUG(640, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1162 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_FINALLY);
 }
-#line 6383 "Zend/zend_language_scanner.c"
-yy639:
-		YYDEBUG(639, *YYCURSOR);
+#line 6409 "Zend/zend_language_scanner.c"
+yy641:
+		YYDEBUG(641, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(640, *YYCURSOR);
+		YYDEBUG(642, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1206 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_FOREACH);
 }
-#line 6396 "Zend/zend_language_scanner.c"
-yy641:
-		YYDEBUG(641, *YYCURSOR);
+#line 6422 "Zend/zend_language_scanner.c"
+yy643:
+		YYDEBUG(643, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy680;
-		if (yych == 'n') goto yy680;
+		if (yych == 'N') goto yy684;
+		if (yych == 'n') goto yy684;
 		goto yy128;
-yy642:
-		YYDEBUG(642, *YYCURSOR);
+yy644:
+		YYDEBUG(644, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy682;
-		if (yych == 'n') goto yy682;
+		if (yych == 'N') goto yy686;
+		if (yych == 'n') goto yy686;
 		goto yy128;
-yy643:
-		YYDEBUG(643, *YYCURSOR);
+yy645:
+		YYDEBUG(645, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) <= '^') {
 			if (yych <= '9') {
 				if (yych >= '0') goto yy127;
 			} else {
-				if (yych <= '@') goto yy644;
+				if (yych <= '@') goto yy646;
 				if (yych <= 'Z') goto yy127;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy683;
+				if (yych <= '_') goto yy687;
 			} else {
 				if (yych <= 'z') goto yy127;
 				if (yych >= 0x80) goto yy127;
 			}
 		}
-yy644:
-		YYDEBUG(644, *YYCURSOR);
+yy646:
+		YYDEBUG(646, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1372 "Zend/zend_language_scanner.l"
+#line 1378 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_INCLUDE);
 }
-#line 6434 "Zend/zend_language_scanner.c"
-yy645:
-		YYDEBUG(645, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy684;
-		if (yych == 'e') goto yy684;
-		goto yy128;
-yy646:
-		YYDEBUG(646, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy685;
-		if (yych == 'o') goto yy685;
-		goto yy128;
+#line 6460 "Zend/zend_language_scanner.c"
 yy647:
 		YYDEBUG(647, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy686;
-		if (yych == 'c') goto yy686;
+		if (yych == 'E') goto yy688;
+		if (yych == 'e') goto yy688;
 		goto yy128;
 yy648:
 		YYDEBUG(648, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy687;
-		if (yych == 'c') goto yy687;
+		if (yych == 'O') goto yy689;
+		if (yych == 'o') goto yy689;
 		goto yy128;
 yy649:
 		YYDEBUG(649, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'C') goto yy690;
+		if (yych == 'c') goto yy690;
+		goto yy128;
+yy650:
+		YYDEBUG(650, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'C') goto yy691;
+		if (yych == 'c') goto yy691;
+		goto yy128;
+yy651:
+		YYDEBUG(651, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(650, *YYCURSOR);
+		YYDEBUG(652, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1428 "Zend/zend_language_scanner.l"
+#line 1434 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_PRIVATE);
 }
-#line 6471 "Zend/zend_language_scanner.c"
-yy651:
-		YYDEBUG(651, *YYCURSOR);
+#line 6497 "Zend/zend_language_scanner.c"
+yy653:
+		YYDEBUG(653, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy688;
-		if (yych == 'e') goto yy688;
+		if (yych == 'E') goto yy692;
+		if (yych == 'e') goto yy692;
 		goto yy128;
-yy652:
-		YYDEBUG(652, *YYCURSOR);
+yy654:
+		YYDEBUG(654, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) <= '^') {
 			if (yych <= '9') {
 				if (yych >= '0') goto yy127;
 			} else {
-				if (yych <= '@') goto yy653;
+				if (yych <= '@') goto yy655;
 				if (yych <= 'Z') goto yy127;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy689;
+				if (yych <= '_') goto yy693;
 			} else {
 				if (yych <= 'z') goto yy127;
 				if (yych >= 0x80) goto yy127;
 			}
 		}
-yy653:
-		YYDEBUG(653, *YYCURSOR);
+yy655:
+		YYDEBUG(655, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1380 "Zend/zend_language_scanner.l"
+#line 1386 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_REQUIRE);
 }
-#line 6503 "Zend/zend_language_scanner.c"
-yy654:
-		YYDEBUG(654, *YYCURSOR);
+#line 6529 "Zend/zend_language_scanner.c"
+yy656:
+		YYDEBUG(656, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy690;
-		if (yych == 'r') goto yy690;
+		if (yych == 'R') goto yy694;
+		if (yych == 'r') goto yy694;
 		goto yy166;
-yy655:
-		YYDEBUG(655, *YYCURSOR);
+yy657:
+		YYDEBUG(657, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy691;
+		if (yych == '_') goto yy695;
 		goto yy128;
-yy656:
-		YYDEBUG(656, *YYCURSOR);
+yy658:
+		YYDEBUG(658, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(657, *YYCURSOR);
+		YYDEBUG(659, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1773 "Zend/zend_language_scanner.l"
+#line 1779 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_DIR);
 }
-#line 6527 "Zend/zend_language_scanner.c"
-yy658:
-		YYDEBUG(658, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '_') goto yy692;
-		goto yy128;
-yy659:
-		YYDEBUG(659, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'I') goto yy694;
-		if (yych == 'i') goto yy694;
-		goto yy128;
+#line 6553 "Zend/zend_language_scanner.c"
 yy660:
 		YYDEBUG(660, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy695;
-		if (yych == 'c') goto yy695;
+		if (yych == '_') goto yy696;
 		goto yy128;
 yy661:
 		YYDEBUG(661, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy696;
+		if (yych == 'I') goto yy698;
+		if (yych == 'i') goto yy698;
 		goto yy128;
 yy662:
 		YYDEBUG(662, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy698;
-		if (yych == 'd') goto yy698;
+		if (yych == 'C') goto yy699;
+		if (yych == 'c') goto yy699;
 		goto yy128;
 yy663:
 		YYDEBUG(663, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'P') goto yy699;
-		if (yych == 'p') goto yy699;
+		if (yych == '_') goto yy700;
 		goto yy128;
 yy664:
 		YYDEBUG(664, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy700;
+		if (yych == 'D') goto yy702;
+		if (yych == 'd') goto yy702;
 		goto yy128;
 yy665:
 		YYDEBUG(665, *YYCURSOR);
-		++YYCURSOR;
+		yych = *++YYCURSOR;
+		if (yych == 'P') goto yy703;
+		if (yych == 'p') goto yy703;
+		goto yy128;
+yy666:
 		YYDEBUG(666, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1348 "Zend/zend_language_scanner.l"
-		{
-	RETURN_TOKEN(T_STRING_CAST);
-}
-#line 6576 "Zend/zend_language_scanner.c"
+		yych = *++YYCURSOR;
+		if (yych == '_') goto yy704;
+		goto yy128;
 yy667:
 		YYDEBUG(667, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(668, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1356 "Zend/zend_language_scanner.l"
+#line 1352 "Zend/zend_language_scanner.l"
 		{
-	RETURN_TOKEN(T_OBJECT_CAST);
+	zend_error(E_DEPRECATED, "The usage of the binary cast is deprecated");
+
+	RETURN_TOKEN(T_STRING_CAST);
 }
-#line 6586 "Zend/zend_language_scanner.c"
+#line 6604 "Zend/zend_language_scanner.c"
 yy669:
 		YYDEBUG(669, *YYCURSOR);
 		++YYCURSOR;
+		YYDEBUG(670, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 1362 "Zend/zend_language_scanner.l"
+		{
+	RETURN_TOKEN(T_OBJECT_CAST);
+}
+#line 6614 "Zend/zend_language_scanner.c"
+yy671:
+		YYDEBUG(671, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(672, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 1348 "Zend/zend_language_scanner.l"
+		{
+	RETURN_TOKEN(T_STRING_CAST);
+}
+#line 6624 "Zend/zend_language_scanner.c"
+yy673:
+		YYDEBUG(673, *YYCURSOR);
+		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(670, *YYCURSOR);
+		YYDEBUG(674, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1420 "Zend/zend_language_scanner.l"
+#line 1426 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ABSTRACT);
 }
-#line 6599 "Zend/zend_language_scanner.c"
-yy671:
-		YYDEBUG(671, *YYCURSOR);
+#line 6637 "Zend/zend_language_scanner.c"
+yy675:
+		YYDEBUG(675, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(672, *YYCURSOR);
+		YYDEBUG(676, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1456 "Zend/zend_language_scanner.l"
+#line 1462 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_CALLABLE);
 }
-#line 6612 "Zend/zend_language_scanner.c"
-yy673:
-		YYDEBUG(673, *YYCURSOR);
+#line 6650 "Zend/zend_language_scanner.c"
+yy677:
+		YYDEBUG(677, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(674, *YYCURSOR);
+		YYDEBUG(678, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1250 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_CONTINUE);
 }
-#line 6625 "Zend/zend_language_scanner.c"
-yy675:
-		YYDEBUG(675, *YYCURSOR);
+#line 6663 "Zend/zend_language_scanner.c"
+yy679:
+		YYDEBUG(679, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy701;
-		if (yych == 'r') goto yy701;
+		if (yych == 'R') goto yy705;
+		if (yych == 'r') goto yy705;
 		goto yy128;
-yy676:
-		YYDEBUG(676, *YYCURSOR);
+yy680:
+		YYDEBUG(680, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy702;
-		if (yych == 'c') goto yy702;
+		if (yych == 'C') goto yy706;
+		if (yych == 'c') goto yy706;
 		goto yy128;
-yy677:
-		YYDEBUG(677, *YYCURSOR);
+yy681:
+		YYDEBUG(681, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'H') goto yy703;
-		if (yych == 'h') goto yy703;
+		if (yych == 'H') goto yy707;
+		if (yych == 'h') goto yy707;
 		goto yy128;
-yy678:
-		YYDEBUG(678, *YYCURSOR);
+yy682:
+		YYDEBUG(682, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(679, *YYCURSOR);
+		YYDEBUG(683, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1190 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ENDWHILE);
 }
-#line 6656 "Zend/zend_language_scanner.c"
-yy680:
-		YYDEBUG(680, *YYCURSOR);
+#line 6694 "Zend/zend_language_scanner.c"
+yy684:
+		YYDEBUG(684, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(681, *YYCURSOR);
+		YYDEBUG(685, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1133 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_FUNCTION);
 }
-#line 6669 "Zend/zend_language_scanner.c"
-yy682:
-		YYDEBUG(682, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'T') goto yy705;
-		if (yych == 't') goto yy705;
-		goto yy128;
-yy683:
-		YYDEBUG(683, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy706;
-		if (yych == 'o') goto yy706;
-		goto yy128;
-yy684:
-		YYDEBUG(684, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy707;
-		if (yych == 'o') goto yy707;
-		goto yy128;
-yy685:
-		YYDEBUG(685, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'F') goto yy708;
-		if (yych == 'f') goto yy708;
-		goto yy128;
+#line 6707 "Zend/zend_language_scanner.c"
 yy686:
 		YYDEBUG(686, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy710;
-		if (yych == 'e') goto yy710;
+		if (yych == 'T') goto yy709;
+		if (yych == 't') goto yy709;
 		goto yy128;
 yy687:
 		YYDEBUG(687, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy712;
-		if (yych == 'e') goto yy712;
+		if (yych == 'O') goto yy710;
+		if (yych == 'o') goto yy710;
 		goto yy128;
 yy688:
 		YYDEBUG(688, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy714;
-		if (yych == 'd') goto yy714;
+		if (yych == 'O') goto yy711;
+		if (yych == 'o') goto yy711;
 		goto yy128;
 yy689:
 		YYDEBUG(689, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy716;
-		if (yych == 'o') goto yy716;
+		if (yych == 'F') goto yy712;
+		if (yych == 'f') goto yy712;
 		goto yy128;
 yy690:
 		YYDEBUG(690, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'O') goto yy717;
-		if (yych == 'o') goto yy717;
-		goto yy166;
+		if (yych == 'E') goto yy714;
+		if (yych == 'e') goto yy714;
+		goto yy128;
 yy691:
 		YYDEBUG(691, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy718;
+		if (yych == 'E') goto yy716;
+		if (yych == 'e') goto yy716;
 		goto yy128;
 yy692:
 		YYDEBUG(692, *YYCURSOR);
-		++YYCURSOR;
-		if (yybm[0+(yych = *YYCURSOR)] & 16) {
-			goto yy127;
-		}
+		yych = *++YYCURSOR;
+		if (yych == 'D') goto yy718;
+		if (yych == 'd') goto yy718;
+		goto yy128;
+yy693:
 		YYDEBUG(693, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1769 "Zend/zend_language_scanner.l"
-		{
-	RETURN_TOKEN(T_FILE);
-}
-#line 6741 "Zend/zend_language_scanner.c"
-yy694:
-		YYDEBUG(694, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'O') goto yy720;
 		if (yych == 'o') goto yy720;
 		goto yy128;
-yy695:
-		YYDEBUG(695, *YYCURSOR);
+yy694:
+		YYDEBUG(694, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych == 'O') goto yy721;
 		if (yych == 'o') goto yy721;
+		goto yy166;
+yy695:
+		YYDEBUG(695, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '_') goto yy722;
 		goto yy128;
 yy696:
 		YYDEBUG(696, *YYCURSOR);
@@ -6758,403 +6771,428 @@ int start_line = CG(zend_lineno);
 		}
 		YYDEBUG(697, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1765 "Zend/zend_language_scanner.l"
+#line 1775 "Zend/zend_language_scanner.l"
 		{
-	RETURN_TOKEN(T_LINE);
+	RETURN_TOKEN(T_FILE);
 }
-#line 6766 "Zend/zend_language_scanner.c"
+#line 6779 "Zend/zend_language_scanner.c"
 yy698:
 		YYDEBUG(698, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy722;
+		if (yych == 'O') goto yy724;
+		if (yych == 'o') goto yy724;
 		goto yy128;
 yy699:
 		YYDEBUG(699, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'A') goto yy723;
-		if (yych == 'a') goto yy723;
+		if (yych == 'O') goto yy725;
+		if (yych == 'o') goto yy725;
 		goto yy128;
 yy700:
 		YYDEBUG(700, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '_') goto yy724;
-		goto yy128;
-yy701:
+		++YYCURSOR;
+		if (yybm[0+(yych = *YYCURSOR)] & 16) {
+			goto yy127;
+		}
 		YYDEBUG(701, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy726;
-		if (yych == 'e') goto yy726;
-		goto yy128;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 1771 "Zend/zend_language_scanner.l"
+		{
+	RETURN_TOKEN(T_LINE);
+}
+#line 6804 "Zend/zend_language_scanner.c"
 yy702:
 		YYDEBUG(702, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'H') goto yy728;
-		if (yych == 'h') goto yy728;
+		if (yych == '_') goto yy726;
 		goto yy128;
 yy703:
 		YYDEBUG(703, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy727;
+		if (yych == 'a') goto yy727;
+		goto yy128;
+yy704:
+		YYDEBUG(704, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '_') goto yy728;
+		goto yy128;
+yy705:
+		YYDEBUG(705, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy730;
+		if (yych == 'e') goto yy730;
+		goto yy128;
+yy706:
+		YYDEBUG(706, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'H') goto yy732;
+		if (yych == 'h') goto yy732;
+		goto yy128;
+yy707:
+		YYDEBUG(707, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(704, *YYCURSOR);
+		YYDEBUG(708, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1234 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ENDSWITCH);
 }
-#line 6807 "Zend/zend_language_scanner.c"
-yy705:
-		YYDEBUG(705, *YYCURSOR);
+#line 6845 "Zend/zend_language_scanner.c"
+yy709:
+		YYDEBUG(709, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'S') goto yy730;
-		if (yych == 's') goto yy730;
+		if (yych == 'S') goto yy734;
+		if (yych == 's') goto yy734;
 		goto yy128;
-yy706:
-		YYDEBUG(706, *YYCURSOR);
+yy710:
+		YYDEBUG(710, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy732;
-		if (yych == 'n') goto yy732;
+		if (yych == 'N') goto yy736;
+		if (yych == 'n') goto yy736;
 		goto yy128;
-yy707:
-		YYDEBUG(707, *YYCURSOR);
+yy711:
+		YYDEBUG(711, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'F') goto yy733;
-		if (yych == 'f') goto yy733;
+		if (yych == 'F') goto yy737;
+		if (yych == 'f') goto yy737;
 		goto yy128;
-yy708:
-		YYDEBUG(708, *YYCURSOR);
+yy712:
+		YYDEBUG(712, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(709, *YYCURSOR);
+		YYDEBUG(713, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1396 "Zend/zend_language_scanner.l"
+#line 1402 "Zend/zend_language_scanner.l"
 		{
     RETURN_TOKEN(T_INSTEADOF);
 }
-#line 6838 "Zend/zend_language_scanner.c"
-yy710:
-		YYDEBUG(710, *YYCURSOR);
+#line 6876 "Zend/zend_language_scanner.c"
+yy714:
+		YYDEBUG(714, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(711, *YYCURSOR);
+		YYDEBUG(715, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1270 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_INTERFACE);
 }
-#line 6851 "Zend/zend_language_scanner.c"
-yy712:
-		YYDEBUG(712, *YYCURSOR);
+#line 6889 "Zend/zend_language_scanner.c"
+yy716:
+		YYDEBUG(716, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(713, *YYCURSOR);
+		YYDEBUG(717, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1388 "Zend/zend_language_scanner.l"
+#line 1394 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_NAMESPACE);
 }
-#line 6864 "Zend/zend_language_scanner.c"
-yy714:
-		YYDEBUG(714, *YYCURSOR);
+#line 6902 "Zend/zend_language_scanner.c"
+yy718:
+		YYDEBUG(718, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(715, *YYCURSOR);
+		YYDEBUG(719, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1432 "Zend/zend_language_scanner.l"
+#line 1438 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_PROTECTED);
 }
-#line 6877 "Zend/zend_language_scanner.c"
-yy716:
-		YYDEBUG(716, *YYCURSOR);
+#line 6915 "Zend/zend_language_scanner.c"
+yy720:
+		YYDEBUG(720, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy735;
-		if (yych == 'n') goto yy735;
+		if (yych == 'N') goto yy739;
+		if (yych == 'n') goto yy739;
 		goto yy128;
-yy717:
-		YYDEBUG(717, *YYCURSOR);
+yy721:
+		YYDEBUG(721, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'M') goto yy736;
-		if (yych == 'm') goto yy736;
+		if (yych == 'M') goto yy740;
+		if (yych == 'm') goto yy740;
 		goto yy166;
-yy718:
-		YYDEBUG(718, *YYCURSOR);
+yy722:
+		YYDEBUG(722, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(719, *YYCURSOR);
+		YYDEBUG(723, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1749 "Zend/zend_language_scanner.l"
+#line 1755 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_CLASS_C);
 }
-#line 6902 "Zend/zend_language_scanner.c"
-yy720:
-		YYDEBUG(720, *YYCURSOR);
+#line 6940 "Zend/zend_language_scanner.c"
+yy724:
+		YYDEBUG(724, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy738;
-		if (yych == 'n') goto yy738;
+		if (yych == 'N') goto yy742;
+		if (yych == 'n') goto yy742;
 		goto yy128;
-yy721:
-		YYDEBUG(721, *YYCURSOR);
+yy725:
+		YYDEBUG(725, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'M') goto yy739;
-		if (yych == 'm') goto yy739;
+		if (yych == 'M') goto yy743;
+		if (yych == 'm') goto yy743;
 		goto yy128;
-yy722:
-		YYDEBUG(722, *YYCURSOR);
+yy726:
+		YYDEBUG(726, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy740;
+		if (yych == '_') goto yy744;
 		goto yy128;
-yy723:
-		YYDEBUG(723, *YYCURSOR);
+yy727:
+		YYDEBUG(727, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy742;
-		if (yych == 'c') goto yy742;
+		if (yych == 'C') goto yy746;
+		if (yych == 'c') goto yy746;
 		goto yy128;
-yy724:
-		YYDEBUG(724, *YYCURSOR);
+yy728:
+		YYDEBUG(728, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(725, *YYCURSOR);
+		YYDEBUG(729, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1753 "Zend/zend_language_scanner.l"
+#line 1759 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_TRAIT_C);
 }
-#line 6938 "Zend/zend_language_scanner.c"
-yy726:
-		YYDEBUG(726, *YYCURSOR);
+#line 6976 "Zend/zend_language_scanner.c"
+yy730:
+		YYDEBUG(730, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(727, *YYCURSOR);
+		YYDEBUG(731, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1218 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ENDDECLARE);
 }
-#line 6951 "Zend/zend_language_scanner.c"
-yy728:
-		YYDEBUG(728, *YYCURSOR);
+#line 6989 "Zend/zend_language_scanner.c"
+yy732:
+		YYDEBUG(732, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(729, *YYCURSOR);
+		YYDEBUG(733, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1210 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_ENDFOREACH);
 }
-#line 6964 "Zend/zend_language_scanner.c"
-yy730:
-		YYDEBUG(730, *YYCURSOR);
+#line 7002 "Zend/zend_language_scanner.c"
+yy734:
+		YYDEBUG(734, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(731, *YYCURSOR);
+		YYDEBUG(735, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1282 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_IMPLEMENTS);
 }
-#line 6977 "Zend/zend_language_scanner.c"
-yy732:
-		YYDEBUG(732, *YYCURSOR);
+#line 7015 "Zend/zend_language_scanner.c"
+yy736:
+		YYDEBUG(736, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy743;
-		if (yych == 'c') goto yy743;
+		if (yych == 'C') goto yy747;
+		if (yych == 'c') goto yy747;
 		goto yy128;
-yy733:
-		YYDEBUG(733, *YYCURSOR);
+yy737:
+		YYDEBUG(737, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(734, *YYCURSOR);
+		YYDEBUG(738, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1222 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_INSTANCEOF);
 }
-#line 6996 "Zend/zend_language_scanner.c"
-yy735:
-		YYDEBUG(735, *YYCURSOR);
+#line 7034 "Zend/zend_language_scanner.c"
+yy739:
+		YYDEBUG(739, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'C') goto yy744;
-		if (yych == 'c') goto yy744;
+		if (yych == 'C') goto yy748;
+		if (yych == 'c') goto yy748;
 		goto yy128;
-yy736:
-		YYDEBUG(736, *YYCURSOR);
+yy740:
+		YYDEBUG(740, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(737, *YYCURSOR);
+		YYDEBUG(741, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1145 "Zend/zend_language_scanner.l"
 		{
 	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN(T_YIELD_FROM);
 }
-#line 7013 "Zend/zend_language_scanner.c"
-yy738:
-		YYDEBUG(738, *YYCURSOR);
+#line 7051 "Zend/zend_language_scanner.c"
+yy742:
+		YYDEBUG(742, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy745;
+		if (yych == '_') goto yy749;
 		goto yy128;
-yy739:
-		YYDEBUG(739, *YYCURSOR);
+yy743:
+		YYDEBUG(743, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'P') goto yy746;
-		if (yych == 'p') goto yy746;
+		if (yych == 'P') goto yy750;
+		if (yych == 'p') goto yy750;
 		goto yy128;
-yy740:
-		YYDEBUG(740, *YYCURSOR);
+yy744:
+		YYDEBUG(744, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(741, *YYCURSOR);
+		YYDEBUG(745, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1761 "Zend/zend_language_scanner.l"
+#line 1767 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_METHOD_C);
 }
-#line 7037 "Zend/zend_language_scanner.c"
-yy742:
-		YYDEBUG(742, *YYCURSOR);
+#line 7075 "Zend/zend_language_scanner.c"
+yy746:
+		YYDEBUG(746, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy747;
-		if (yych == 'e') goto yy747;
+		if (yych == 'E') goto yy751;
+		if (yych == 'e') goto yy751;
 		goto yy128;
-yy743:
-		YYDEBUG(743, *YYCURSOR);
+yy747:
+		YYDEBUG(747, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy748;
-		if (yych == 'e') goto yy748;
+		if (yych == 'E') goto yy752;
+		if (yych == 'e') goto yy752;
 		goto yy128;
-yy744:
-		YYDEBUG(744, *YYCURSOR);
+yy748:
+		YYDEBUG(748, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy750;
-		if (yych == 'e') goto yy750;
+		if (yych == 'E') goto yy754;
+		if (yych == 'e') goto yy754;
 		goto yy128;
-yy745:
-		YYDEBUG(745, *YYCURSOR);
+yy749:
+		YYDEBUG(749, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy752;
+		if (yych == '_') goto yy756;
 		goto yy128;
-yy746:
-		YYDEBUG(746, *YYCURSOR);
+yy750:
+		YYDEBUG(750, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'I') goto yy754;
-		if (yych == 'i') goto yy754;
+		if (yych == 'I') goto yy758;
+		if (yych == 'i') goto yy758;
 		goto yy128;
-yy747:
-		YYDEBUG(747, *YYCURSOR);
+yy751:
+		YYDEBUG(751, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy755;
+		if (yych == '_') goto yy759;
 		goto yy128;
-yy748:
-		YYDEBUG(748, *YYCURSOR);
+yy752:
+		YYDEBUG(752, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(749, *YYCURSOR);
+		YYDEBUG(753, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1376 "Zend/zend_language_scanner.l"
+#line 1382 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_INCLUDE_ONCE);
 }
-#line 7084 "Zend/zend_language_scanner.c"
-yy750:
-		YYDEBUG(750, *YYCURSOR);
+#line 7122 "Zend/zend_language_scanner.c"
+yy754:
+		YYDEBUG(754, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(751, *YYCURSOR);
+		YYDEBUG(755, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1384 "Zend/zend_language_scanner.l"
+#line 1390 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_REQUIRE_ONCE);
 }
-#line 7097 "Zend/zend_language_scanner.c"
-yy752:
-		YYDEBUG(752, *YYCURSOR);
+#line 7135 "Zend/zend_language_scanner.c"
+yy756:
+		YYDEBUG(756, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(753, *YYCURSOR);
+		YYDEBUG(757, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1757 "Zend/zend_language_scanner.l"
+#line 1763 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_FUNC_C);
 }
-#line 7110 "Zend/zend_language_scanner.c"
-yy754:
-		YYDEBUG(754, *YYCURSOR);
+#line 7148 "Zend/zend_language_scanner.c"
+yy758:
+		YYDEBUG(758, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'L') goto yy756;
-		if (yych == 'l') goto yy756;
+		if (yych == 'L') goto yy760;
+		if (yych == 'l') goto yy760;
 		goto yy128;
-yy755:
-		YYDEBUG(755, *YYCURSOR);
+yy759:
+		YYDEBUG(759, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '_') goto yy757;
+		if (yych == '_') goto yy761;
 		goto yy128;
-yy756:
-		YYDEBUG(756, *YYCURSOR);
+yy760:
+		YYDEBUG(760, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'E') goto yy759;
-		if (yych == 'e') goto yy759;
+		if (yych == 'E') goto yy763;
+		if (yych == 'e') goto yy763;
 		goto yy128;
-yy757:
-		YYDEBUG(757, *YYCURSOR);
+yy761:
+		YYDEBUG(761, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(758, *YYCURSOR);
+		YYDEBUG(762, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1777 "Zend/zend_language_scanner.l"
+#line 1783 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_NS_C);
 }
-#line 7140 "Zend/zend_language_scanner.c"
-yy759:
-		YYDEBUG(759, *YYCURSOR);
+#line 7178 "Zend/zend_language_scanner.c"
+yy763:
+		YYDEBUG(763, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'R') goto yy760;
+		if (yych == 'R') goto yy764;
 		if (yych != 'r') goto yy128;
-yy760:
-		YYDEBUG(760, *YYCURSOR);
+yy764:
+		YYDEBUG(764, *YYCURSOR);
 		++YYCURSOR;
 		if (yybm[0+(yych = *YYCURSOR)] & 16) {
 			goto yy127;
 		}
-		YYDEBUG(761, *YYCURSOR);
+		YYDEBUG(765, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1412 "Zend/zend_language_scanner.l"
+#line 1418 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_HALT_COMPILER);
 }
-#line 7158 "Zend/zend_language_scanner.c"
+#line 7196 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_PROPERTY:
@@ -7193,32 +7231,32 @@ int start_line = CG(zend_lineno);
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(762, *YYCURSOR);
+		YYDEBUG(766, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yybm[0+yych] & 64) {
-			goto yy766;
+			goto yy770;
 		}
 		if (yych <= '^') {
 			if (yych <= '-') {
-				if (yych >= '-') goto yy769;
+				if (yych >= '-') goto yy773;
 			} else {
-				if (yych <= '@') goto yy764;
-				if (yych <= 'Z') goto yy770;
+				if (yych <= '@') goto yy768;
+				if (yych <= 'Z') goto yy774;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy770;
+				if (yych <= '_') goto yy774;
 			} else {
-				if (yych <= 'z') goto yy770;
-				if (yych >= 0x80) goto yy770;
+				if (yych <= 'z') goto yy774;
+				if (yych >= 0x80) goto yy774;
 			}
 		}
-yy764:
-		YYDEBUG(764, *YYCURSOR);
+yy768:
+		YYDEBUG(768, *YYCURSOR);
 		++YYCURSOR;
-yy765:
-		YYDEBUG(765, *YYCURSOR);
+yy769:
+		YYDEBUG(769, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1306 "Zend/zend_language_scanner.l"
 		{
@@ -7226,39 +7264,39 @@ int start_line = CG(zend_lineno);
 	yy_pop_state();
 	goto restart;
 }
-#line 7230 "Zend/zend_language_scanner.c"
-yy766:
-		YYDEBUG(766, *YYCURSOR);
+#line 7268 "Zend/zend_language_scanner.c"
+yy770:
+		YYDEBUG(770, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(767, *YYCURSOR);
+		YYDEBUG(771, *YYCURSOR);
 		if (yybm[0+yych] & 64) {
-			goto yy766;
+			goto yy770;
 		}
-		YYDEBUG(768, *YYCURSOR);
+		YYDEBUG(772, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1291 "Zend/zend_language_scanner.l"
 		{
 	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN(T_WHITESPACE);
 }
-#line 7247 "Zend/zend_language_scanner.c"
-yy769:
-		YYDEBUG(769, *YYCURSOR);
+#line 7285 "Zend/zend_language_scanner.c"
+yy773:
+		YYDEBUG(773, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '>') goto yy773;
-		goto yy765;
-yy770:
-		YYDEBUG(770, *YYCURSOR);
+		if (yych == '>') goto yy777;
+		goto yy769;
+yy774:
+		YYDEBUG(774, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(771, *YYCURSOR);
+		YYDEBUG(775, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy770;
+			goto yy774;
 		}
-		YYDEBUG(772, *YYCURSOR);
+		YYDEBUG(776, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1300 "Zend/zend_language_scanner.l"
 		{
@@ -7266,17 +7304,17 @@ int start_line = CG(zend_lineno);
 	zend_copy_value(zendlval, yytext, yyleng);
 	RETURN_TOKEN(T_STRING);
 }
-#line 7270 "Zend/zend_language_scanner.c"
-yy773:
-		YYDEBUG(773, *YYCURSOR);
+#line 7308 "Zend/zend_language_scanner.c"
+yy777:
+		YYDEBUG(777, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(774, *YYCURSOR);
+		YYDEBUG(778, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 1296 "Zend/zend_language_scanner.l"
 		{
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-#line 7280 "Zend/zend_language_scanner.c"
+#line 7318 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_VARNAME:
@@ -7315,79 +7353,79 @@ int start_line = CG(zend_lineno);
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(775, *YYCURSOR);
+		YYDEBUG(779, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy777;
-			if (yych <= 'Z') goto yy779;
-			if (yych >= '_') goto yy779;
+			if (yych <= '@') goto yy781;
+			if (yych <= 'Z') goto yy783;
+			if (yych >= '_') goto yy783;
 		} else {
-			if (yych <= '`') goto yy777;
-			if (yych <= 'z') goto yy779;
-			if (yych >= 0x80) goto yy779;
+			if (yych <= '`') goto yy781;
+			if (yych <= 'z') goto yy783;
+			if (yych >= 0x80) goto yy783;
 		}
-yy777:
-		YYDEBUG(777, *YYCURSOR);
+yy781:
+		YYDEBUG(781, *YYCURSOR);
 		++YYCURSOR;
-yy778:
-		YYDEBUG(778, *YYCURSOR);
+yy782:
+		YYDEBUG(782, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1611 "Zend/zend_language_scanner.l"
+#line 1617 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	yy_pop_state();
 	yy_push_state(ST_IN_SCRIPTING);
 	goto restart;
 }
-#line 7344 "Zend/zend_language_scanner.c"
-yy779:
-		YYDEBUG(779, *YYCURSOR);
+#line 7382 "Zend/zend_language_scanner.c"
+yy783:
+		YYDEBUG(783, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '_') {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy778;
-				if (yych <= '9') goto yy781;
-				goto yy778;
+				if (yych <= '/') goto yy782;
+				if (yych <= '9') goto yy785;
+				goto yy782;
 			} else {
-				if (yych <= '[') goto yy781;
-				if (yych <= '^') goto yy778;
-				goto yy781;
+				if (yych <= '[') goto yy785;
+				if (yych <= '^') goto yy782;
+				goto yy785;
 			}
 		} else {
 			if (yych <= '|') {
-				if (yych <= '`') goto yy778;
-				if (yych <= 'z') goto yy781;
-				goto yy778;
+				if (yych <= '`') goto yy782;
+				if (yych <= 'z') goto yy785;
+				goto yy782;
 			} else {
-				if (yych <= '}') goto yy781;
-				if (yych <= 0x7F) goto yy778;
-				goto yy781;
+				if (yych <= '}') goto yy785;
+				if (yych <= 0x7F) goto yy782;
+				goto yy785;
 			}
 		}
-yy780:
-		YYDEBUG(780, *YYCURSOR);
+yy784:
+		YYDEBUG(784, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-yy781:
-		YYDEBUG(781, *YYCURSOR);
+yy785:
+		YYDEBUG(785, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy780;
+			goto yy784;
 		}
-		if (yych <= '@') goto yy782;
-		if (yych <= '[') goto yy783;
-		if (yych == '}') goto yy783;
-yy782:
-		YYDEBUG(782, *YYCURSOR);
+		if (yych <= '@') goto yy786;
+		if (yych <= '[') goto yy787;
+		if (yych == '}') goto yy787;
+yy786:
+		YYDEBUG(786, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy778;
-yy783:
-		YYDEBUG(783, *YYCURSOR);
+		goto yy782;
+yy787:
+		YYDEBUG(787, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(784, *YYCURSOR);
+		YYDEBUG(788, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1602 "Zend/zend_language_scanner.l"
+#line 1608 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	zend_copy_value(zendlval, yytext, yyleng);
@@ -7395,18 +7433,18 @@ int start_line = CG(zend_lineno);
 	yy_push_state(ST_IN_SCRIPTING);
 	RETURN_TOKEN(T_STRING_VARNAME);
 }
-#line 7399 "Zend/zend_language_scanner.c"
+#line 7437 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_NOWDOC:
-	YYDEBUG(785, *YYCURSOR);
+	YYDEBUG(789, *YYCURSOR);
 	YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(787, *YYCURSOR);
+	YYDEBUG(791, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(788, *YYCURSOR);
+	YYDEBUG(792, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 2330 "Zend/zend_language_scanner.l"
+#line 2348 "Zend/zend_language_scanner.l"
 	{
 	int newline = 0;
 
@@ -7462,7 +7500,7 @@ int start_line = CG(zend_lineno);
 	HANDLE_NEWLINES(yytext, yyleng - newline);
 	RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE);
 }
-#line 7466 "Zend/zend_language_scanner.c"
+#line 7504 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
 	{
@@ -7500,57 +7538,57 @@ int start_line = CG(zend_lineno);
 			 32,  32,  32,  32,  32,  32,  32,  32, 
 			 32,  32,  32,  32,  32,  32,  32,  32, 
 		};
-		YYDEBUG(789, *YYCURSOR);
+		YYDEBUG(793, *YYCURSOR);
 		YYFILL(3);
 		yych = *YYCURSOR;
 		if (yych <= '0') {
 			if (yych <= ' ') {
 				if (yych <= '\f') {
-					if (yych <= 0x08) goto yy791;
-					if (yych <= '\n') goto yy793;
+					if (yych <= 0x08) goto yy795;
+					if (yych <= '\n') goto yy797;
 				} else {
-					if (yych <= '\r') goto yy793;
-					if (yych >= ' ') goto yy793;
+					if (yych <= '\r') goto yy797;
+					if (yych >= ' ') goto yy797;
 				}
 			} else {
 				if (yych <= '$') {
-					if (yych <= '"') goto yy795;
-					if (yych <= '#') goto yy793;
-					goto yy797;
+					if (yych <= '"') goto yy799;
+					if (yych <= '#') goto yy797;
+					goto yy801;
 				} else {
-					if (yych == '\'') goto yy793;
-					if (yych <= '/') goto yy795;
-					goto yy798;
+					if (yych == '\'') goto yy797;
+					if (yych <= '/') goto yy799;
+					goto yy802;
 				}
 			}
 		} else {
 			if (yych <= ']') {
 				if (yych <= 'Z') {
-					if (yych <= '9') goto yy800;
-					if (yych <= '@') goto yy795;
-					goto yy802;
+					if (yych <= '9') goto yy804;
+					if (yych <= '@') goto yy799;
+					goto yy806;
 				} else {
-					if (yych <= '[') goto yy795;
-					if (yych <= '\\') goto yy793;
-					goto yy805;
+					if (yych <= '[') goto yy799;
+					if (yych <= '\\') goto yy797;
+					goto yy809;
 				}
 			} else {
 				if (yych <= '`') {
-					if (yych == '_') goto yy802;
-					goto yy795;
+					if (yych == '_') goto yy806;
+					goto yy799;
 				} else {
-					if (yych <= 'z') goto yy802;
-					if (yych <= '~') goto yy795;
-					if (yych >= 0x80) goto yy802;
+					if (yych <= 'z') goto yy806;
+					if (yych <= '~') goto yy799;
+					if (yych >= 0x80) goto yy806;
 				}
 			}
 		}
-yy791:
-		YYDEBUG(791, *YYCURSOR);
+yy795:
+		YYDEBUG(795, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(792, *YYCURSOR);
+		YYDEBUG(796, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2387 "Zend/zend_language_scanner.l"
+#line 2405 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_TOKEN(END);
@@ -7559,13 +7597,13 @@ int start_line = CG(zend_lineno);
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
 	goto restart;
 }
-#line 7563 "Zend/zend_language_scanner.c"
-yy793:
-		YYDEBUG(793, *YYCURSOR);
+#line 7601 "Zend/zend_language_scanner.c"
+yy797:
+		YYDEBUG(797, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(794, *YYCURSOR);
+		YYDEBUG(798, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1884 "Zend/zend_language_scanner.l"
+#line 1890 "Zend/zend_language_scanner.l"
 		{
 	/* Invalid rule to return a more explicit parse error with proper line number */
 	yyless(0);
@@ -7573,54 +7611,54 @@ int start_line = CG(zend_lineno);
 	ZVAL_NULL(zendlval);
 	RETURN_TOKEN(T_ENCAPSED_AND_WHITESPACE);
 }
-#line 7577 "Zend/zend_language_scanner.c"
-yy795:
-		YYDEBUG(795, *YYCURSOR);
+#line 7615 "Zend/zend_language_scanner.c"
+yy799:
+		YYDEBUG(799, *YYCURSOR);
 		++YYCURSOR;
-yy796:
-		YYDEBUG(796, *YYCURSOR);
+yy800:
+		YYDEBUG(800, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1879 "Zend/zend_language_scanner.l"
+#line 1885 "Zend/zend_language_scanner.l"
 		{
 	/* Only '[' or '-' can be valid, but returning other tokens will allow a more explicit parse error */
 	RETURN_TOKEN(yytext[0]);
 }
-#line 7589 "Zend/zend_language_scanner.c"
-yy797:
-		YYDEBUG(797, *YYCURSOR);
+#line 7627 "Zend/zend_language_scanner.c"
+yy801:
+		YYDEBUG(801, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy796;
-			if (yych <= 'Z') goto yy807;
-			if (yych <= '^') goto yy796;
-			goto yy807;
+			if (yych <= '@') goto yy800;
+			if (yych <= 'Z') goto yy811;
+			if (yych <= '^') goto yy800;
+			goto yy811;
 		} else {
-			if (yych <= '`') goto yy796;
-			if (yych <= 'z') goto yy807;
-			if (yych <= 0x7F) goto yy796;
-			goto yy807;
+			if (yych <= '`') goto yy800;
+			if (yych <= 'z') goto yy811;
+			if (yych <= 0x7F) goto yy800;
+			goto yy811;
 		}
-yy798:
-		YYDEBUG(798, *YYCURSOR);
+yy802:
+		YYDEBUG(802, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'W') {
 			if (yych <= '9') {
-				if (yych >= '0') goto yy810;
+				if (yych >= '0') goto yy814;
 			} else {
-				if (yych == 'B') goto yy813;
+				if (yych == 'B') goto yy817;
 			}
 		} else {
 			if (yych <= 'b') {
-				if (yych <= 'X') goto yy815;
-				if (yych >= 'b') goto yy813;
+				if (yych <= 'X') goto yy819;
+				if (yych >= 'b') goto yy817;
 			} else {
-				if (yych == 'x') goto yy815;
+				if (yych == 'x') goto yy819;
 			}
 		}
-yy799:
-		YYDEBUG(799, *YYCURSOR);
+yy803:
+		YYDEBUG(803, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1719 "Zend/zend_language_scanner.l"
+#line 1725 "Zend/zend_language_scanner.l"
 		{ /* Offset could be treated as a long */
 	if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) {
 		char *end;
@@ -7636,131 +7674,131 @@ int start_line = CG(zend_lineno);
 	}
 	RETURN_TOKEN(T_NUM_STRING);
 }
-#line 7640 "Zend/zend_language_scanner.c"
-yy800:
-		YYDEBUG(800, *YYCURSOR);
+#line 7678 "Zend/zend_language_scanner.c"
+yy804:
+		YYDEBUG(804, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(801, *YYCURSOR);
+		YYDEBUG(805, *YYCURSOR);
 		if (yybm[0+yych] & 16) {
-			goto yy800;
+			goto yy804;
 		}
-		goto yy799;
-yy802:
-		YYDEBUG(802, *YYCURSOR);
+		goto yy803;
+yy806:
+		YYDEBUG(806, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(803, *YYCURSOR);
+		YYDEBUG(807, *YYCURSOR);
 		if (yybm[0+yych] & 32) {
-			goto yy802;
+			goto yy806;
 		}
-		YYDEBUG(804, *YYCURSOR);
+		YYDEBUG(808, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1892 "Zend/zend_language_scanner.l"
+#line 1898 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	RETURN_TOKEN(T_STRING);
 }
-#line 7667 "Zend/zend_language_scanner.c"
-yy805:
-		YYDEBUG(805, *YYCURSOR);
+#line 7705 "Zend/zend_language_scanner.c"
+yy809:
+		YYDEBUG(809, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(806, *YYCURSOR);
+		YYDEBUG(810, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1874 "Zend/zend_language_scanner.l"
+#line 1880 "Zend/zend_language_scanner.l"
 		{
 	yy_pop_state();
 	RETURN_TOKEN(']');
 }
-#line 7678 "Zend/zend_language_scanner.c"
-yy807:
-		YYDEBUG(807, *YYCURSOR);
+#line 7716 "Zend/zend_language_scanner.c"
+yy811:
+		YYDEBUG(811, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(808, *YYCURSOR);
+		YYDEBUG(812, *YYCURSOR);
 		if (yych <= '^') {
 			if (yych <= '9') {
-				if (yych >= '0') goto yy807;
+				if (yych >= '0') goto yy811;
 			} else {
-				if (yych <= '@') goto yy809;
-				if (yych <= 'Z') goto yy807;
+				if (yych <= '@') goto yy813;
+				if (yych <= 'Z') goto yy811;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= '_') goto yy807;
+				if (yych <= '_') goto yy811;
 			} else {
-				if (yych <= 'z') goto yy807;
-				if (yych >= 0x80) goto yy807;
+				if (yych <= 'z') goto yy811;
+				if (yych >= 0x80) goto yy811;
 			}
 		}
-yy809:
-		YYDEBUG(809, *YYCURSOR);
+yy813:
+		YYDEBUG(813, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1869 "Zend/zend_language_scanner.l"
+#line 1875 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	RETURN_TOKEN(T_VARIABLE);
 }
-#line 7708 "Zend/zend_language_scanner.c"
-yy810:
-		YYDEBUG(810, *YYCURSOR);
+#line 7746 "Zend/zend_language_scanner.c"
+yy814:
+		YYDEBUG(814, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(811, *YYCURSOR);
-		if (yych <= '/') goto yy812;
-		if (yych <= '9') goto yy810;
-yy812:
-		YYDEBUG(812, *YYCURSOR);
+		YYDEBUG(815, *YYCURSOR);
+		if (yych <= '/') goto yy816;
+		if (yych <= '9') goto yy814;
+yy816:
+		YYDEBUG(816, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1735 "Zend/zend_language_scanner.l"
+#line 1741 "Zend/zend_language_scanner.l"
 		{ /* Offset must be treated as a string */
 	ZVAL_STRINGL(zendlval, yytext, yyleng);
 	RETURN_TOKEN(T_NUM_STRING);
 }
-#line 7725 "Zend/zend_language_scanner.c"
-yy813:
-		YYDEBUG(813, *YYCURSOR);
+#line 7763 "Zend/zend_language_scanner.c"
+yy817:
+		YYDEBUG(817, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm[0+yych] & 64) {
-			goto yy816;
+			goto yy820;
 		}
-yy814:
-		YYDEBUG(814, *YYCURSOR);
+yy818:
+		YYDEBUG(818, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy799;
-yy815:
-		YYDEBUG(815, *YYCURSOR);
+		goto yy803;
+yy819:
+		YYDEBUG(819, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm[0+yych] & 128) {
-			goto yy818;
+			goto yy822;
 		}
-		goto yy814;
-yy816:
-		YYDEBUG(816, *YYCURSOR);
+		goto yy818;
+yy820:
+		YYDEBUG(820, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(817, *YYCURSOR);
+		YYDEBUG(821, *YYCURSOR);
 		if (yybm[0+yych] & 64) {
-			goto yy816;
+			goto yy820;
 		}
-		goto yy812;
-yy818:
-		YYDEBUG(818, *YYCURSOR);
+		goto yy816;
+yy822:
+		YYDEBUG(822, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(819, *YYCURSOR);
+		YYDEBUG(823, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy818;
+			goto yy822;
 		}
-		goto yy812;
+		goto yy816;
 	}
 }
-#line 2396 "Zend/zend_language_scanner.l"
+#line 2414 "Zend/zend_language_scanner.l"
 
 }
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 1ac7b53a89ec3..7e95a4f792034 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1345,7 +1345,13 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	RETURN_TOKEN(T_DOUBLE_CAST);
 }
 
-<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"|"binary"){TABS_AND_SPACES}")" {
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"){TABS_AND_SPACES}")" {
+	RETURN_TOKEN(T_STRING_CAST);
+}
+
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("binary"){TABS_AND_SPACES}")" {
+	zend_error(E_DEPRECATED, "The usage of the binary cast is deprecated");
+
 	RETURN_TOKEN(T_STRING_CAST);
 }
 
@@ -1968,6 +1974,10 @@ inline_char_handler:
 	char *end;
 	int bprefix = (yytext[0] != '\'') ? 1 : 0;
 
+	if (bprefix == 1) {
+		zend_error(E_DEPRECATED, "The usage of the 'b' prefix is deprecated");
+	}
+
 	while (1) {
 		if (YYCURSOR < YYLIMIT) {
 			if (*YYCURSOR == '\'') {
@@ -2035,6 +2045,10 @@ inline_char_handler:
 <ST_IN_SCRIPTING>b?["] {
 	int bprefix = (yytext[0] != '"') ? 1 : 0;
 
+	if (bprefix == 1) {
+		zend_error(E_DEPRECATED, "The usage of the 'b' prefix is deprecated");
+	}
+
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '"':
@@ -2079,6 +2093,10 @@ inline_char_handler:
 	int bprefix = (yytext[0] != '<') ? 1 : 0;
 	zend_heredoc_label *heredoc_label = emalloc(sizeof(zend_heredoc_label));
 
+	if (bprefix == 1) {
+		zend_error(E_DEPRECATED, "The usage of the 'b' prefix is deprecated");
+	}
+
 	CG(zend_lineno)++;
 	heredoc_label->length = yyleng-bprefix-3-1-(yytext[yyleng-2]=='\r'?1:0);
 	s = yytext+bprefix+3;