From f7e5308f4b0a5a47c3edf80e14d37768d30213d8 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Fri, 15 Aug 2014 18:31:54 +0200
Subject: [PATCH] Fix test to conform with UVS changes

---
 tests/classes/method_call_variation_001.phpt | 36 +++++++-------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt
index dd43cfd1cb5..7950b7deb36 100644
--- a/tests/classes/method_call_variation_001.phpt
+++ b/tests/classes/method_call_variation_001.phpt
@@ -1,37 +1,27 @@
 --TEST--
-In $a->$b[Y](), $b[Y] represents a method name on $a. But in $a->X[Y](), $a->X[Y] represents a global function name.
+In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global function name
 --FILE--
 <?php
-  class C
-  {
-      function foo($a, $b)
-      {
-          echo "Called C::foo($a, $b)\n";
-      }
-  }
-  
-  $c = new C;
-  
-  $functions[0] = 'foo';
-  $functions[1][2][3][4] = 'foo';
-  
-  $c->$functions[0](1, 2);
-  $c->$functions[1][2][3][4](3, 4);
-  
-  
-  function foo($a, $b)
-  {
+  class C {}
+
+  function foo($a, $b) {
       echo "Called global foo($a, $b)\n";
   }
-  
+
+  $name = 'functions';
+
+  $c = new C;
   $c->functions[0] = 'foo';
   $c->functions[1][2][3][4] = 'foo';
   
+  $c->$name[0](1, 2);
+  $c->$name[1][2][3][4](3, 4);
+  
   $c->functions[0](5, 6);
   $c->functions[1][2][3][4](7, 8);
 ?>
 --EXPECTF--
-Called C::foo(1, 2)
-Called C::foo(3, 4)
+Called global foo(1, 2)
+Called global foo(3, 4)
 Called global foo(5, 6)
 Called global foo(7, 8)