Merge branch 'master' into integer_semantics

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt
index cca528e29c..0b8cf2650e 100644
--- a/tests/classes/inheritance_002.phpt
+++ b/tests/classes/inheritance_002.phpt
@@ -17,13 +17,13 @@ class Child_php4 extends Base_php4 {
   }
 }
 
-class Base_php5 {
+class Base_php7 {
   function __construct() {
     var_dump('Base constructor');
   }
   }
 
-class Child_php5 extends Base_php5 {
+class Child_php7 extends Base_php7 {
   function __construct() {
     var_dump('Child constructor');
     parent::__construct();
@@ -37,7 +37,7 @@ class Child_mx1 extends Base_php4 {
   }
 }
 
-class Child_mx2 extends Base_php5 {
+class Child_mx2 extends Base_php7 {
   function Child_mx2() {
     var_dump('Child constructor');
     parent::__construct();
@@ -47,8 +47,8 @@ class Child_mx2 extends Base_php5 {
 echo "### PHP 4 style\n";
 $c4= new Child_php4();
 
-echo "### PHP 5 style\n";
-$c5= new Child_php5();
+echo "### PHP 7 style\n";
+$c5= new Child_php7();
 
 echo "### Mixed style 1\n";
 $cm= new Child_mx1();
@@ -60,7 +60,7 @@ $cm= new Child_mx2();
 ### PHP 4 style
 string(17) "Child constructor"
 string(16) "Base constructor"
-### PHP 5 style
+### PHP 7 style
 string(17) "Child constructor"
 string(16) "Base constructor"
 ### Mixed style 1
diff --git a/tests/lang/bug24396.phpt b/tests/lang/bug24396.phpt
index b78e4b8757..80862191de 100644
--- a/tests/lang/bug24396.phpt
+++ b/tests/lang/bug24396.phpt
@@ -6,7 +6,7 @@ Bug #24396 (global $$variable broken)
 $arr = array('a' => 1, 'b' => 2, 'c' => 3);
 
 foreach($arr as $k=>$v)  {
-    global $$k; // comment this out and it works in PHP 5 too..
+    global $$k; // comment this out and it works in PHP 7 too..
                
     echo "($k => $v)\n";