From: Lars Strojny <lstrojny@php.net>
Date: Tue, 15 Jul 2008 08:47:23 +0000 (+0000)
Subject: Merging from 5_3
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc58c00c00807f01e49cd6ed2ba5bea12f23e2ee;p=php

Merging from 5_3
---

diff --git a/tests/lang/033.phpt b/tests/lang/033.phpt
index 724c67b225..21e3768e1b 100644
--- a/tests/lang/033.phpt
+++ b/tests/lang/033.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Alternative syntaxes test
---SKIPIF--
-<?php if(version_compare(zend_version(), "2.0.0-dev", '>=')) echo "skip removed in Zend Engine 2\n"; ?>
 --FILE--
 <?php
 $a = 1;
@@ -38,16 +36,12 @@ switch ($a):
 		echo 0;
 		break;
 endswitch;
-
-echo "\nold_function: ";
-old_function foo $bar, $baz (
-	return sprintf("foo(%s, %s);\n", $bar, $baz);
-);
-echo foo(1,2);
 ?>
+
+===DONE===
 --EXPECT--
 If: 11
 While: 12346789
 For: 0123401234
 Switch: 1
-old_function: foo(1, 2);
+===DONE===