Use EXPECT instead of EXPECTF when possible

EXPECTF logic in run-tests.php is considerable, so let's avoid it.

Author: carusogabriel

Zend/tests/010.phpt

@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 bool(false)
 bool(false)
 string(3) "foo"

Zend/tests/ErrorException_getSeverity.phpt

@@ -862,7 +862,7 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 This exception severity is: 1bool(true)
 bool(true)
 bool(true)

Zend/tests/abstract-static.phpt

@@ -8,6 +8,6 @@ abstract class TestClass
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 
 ===DONE===

Zend/tests/access_modifiers_011.phpt

@@ -32,7 +32,7 @@ echo $a->func1(),"\n";
 echo $a->func2(),"\n";
 
 ?>
---EXPECTF--	
+--EXPECT--	
 var1 value
 var2 value
 in func1

Zend/tests/access_modifiers_012.phpt

@@ -15,7 +15,7 @@ call_user_func(array($c, 'none'));
 call_user_func(array($c, 'prot'));
 call_user_func(array($c, 'priv'));
 ?>
---EXPECTF--
+--EXPECT--
 In __call() for method none()
 In __call() for method prot()
 In __call() for method priv()

Zend/tests/add_001.phpt

@@ -29,7 +29,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(3) {
   [0]=>
   int(1)

Zend/tests/add_005.phpt

@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 float(2834756759.1231)
 float(2834756759.1231)
 Done

Zend/tests/and_001.phpt

@@ -30,7 +30,7 @@ var_dump($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(3) "020"
 string(4) "pead"
 string(4) "pead"

Zend/tests/anon/002.phpt

@@ -15,7 +15,7 @@ $a = new class extends A implements B {
 };
 
 var_dump($a instanceof A, $a instanceof B);
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 

Zend/tests/anon/013.phpt

@@ -10,6 +10,6 @@ $foo = function() {
 $closure = Closure::bind($foo, $class, $class);
 var_dump($closure());
 ?>
---EXPECTF--
+--EXPECT--
 object(class@anonymous)#1 (0) {
 }

Zend/tests/anon/014.phpt

@@ -12,5 +12,5 @@ $class = new class() {
 };
 var_dump($class->run());
 ?>
---EXPECTF--
+--EXPECT--
 string(10) "Running..."

Zend/tests/arg_unpack/by_ref.phpt

@@ -50,7 +50,7 @@ test2($a, $b, $c, $d, ...$array);
 var_dump($a, $b, $c, $d, $array);
 
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   int(2)

Zend/tests/arg_unpack/string_keys.phpt

@@ -19,6 +19,6 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 string(36) "Cannot unpack array with string keys"
 string(42) "Cannot unpack Traversable with string keys"

Zend/tests/argument_restriction_004.phpt

@@ -14,4 +14,4 @@ class Sub extends Base {
 	}	
 }
 ?>
---EXPECTF--
+--EXPECT--

Zend/tests/assert/expect_001.phpt

@@ -8,5 +8,5 @@ assert.exception=1
 assert(true);
 var_dump(true);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)

Zend/tests/assert/expect_019.phpt

@@ -12,7 +12,7 @@ var_dump(\assert(true));
 var_dump(assert(false));
 var_dump(assert(true));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)

Zend/tests/assign_to_var_001.phpt

@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(2)
 int(2)
 Done

Zend/tests/assign_to_var_002.phpt

@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(1) "g"
 string(1) "g"
 Done

Zend/tests/assign_to_var_003.phpt

@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 NULL
 NULL
 Done

Zend/tests/assign_to_var_004.phpt

@@ -15,7 +15,7 @@ var_dump($var2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(5) "space"
 string(5) "space"
 string(5) "space"

Zend/tests/bug22836.phpt

@@ -13,7 +13,7 @@ for ($i = 0; $i < 8; $i++) {
 	$h =& f();
 }
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "foo"
 'foo'
 string(3) "foo"

Zend/tests/bug26229.phpt

@@ -24,6 +24,6 @@ catch(Exception $e)
 }
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator
 ===DONE===

Zend/tests/bug26697.phpt

@@ -13,7 +13,7 @@ var_dump(class_exists('NotExistingClass'));
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 {closure}(NotExistingClass)
 bool(false)
 {closure}(NotExistingClass), done

Zend/tests/bug28442.phpt

@@ -45,7 +45,7 @@ var_dump(ClassC::$prop);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===INIT===
 string(1) "A"
 string(1) "C"

Zend/tests/bug29210.phpt

@@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) {
 $object = new foo();
 $object->test();
 ?>
---EXPECTF--
+--EXPECT--
 test_func1
 test_func2
 test_func3

Zend/tests/bug29368.phpt

@@ -28,7 +28,7 @@ unset($bar);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Foo::__construct
 Caught exception!
 ===DONE===

Zend/tests/bug32290.phpt

@@ -96,7 +96,7 @@ var_dump($x->doSomethingStatic(1));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===A===
 TestB::doSomething(1)
 TestA::doSomething(2)

Zend/tests/bug33771.phpt

@@ -33,7 +33,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(32767)
 int(32767)
 int(30719)

Zend/tests/bug40815.phpt

@@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh");
 throw new Exception ("Whiii");
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 foo

Zend/tests/bug41026.phpt

@@ -20,7 +20,7 @@ try_class::main ();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done
 
 Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0

Zend/tests/bug41075.phpt

@@ -26,6 +26,6 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(40) "Creating default object from empty value"
 Done

Zend/tests/bug43027.phpt

@@ -6,5 +6,5 @@ declare(ticks=1);
 namespace test;
 echo "ok\n";
 ?>
---EXPECTF--
+--EXPECT--
 ok

Zend/tests/bug43200_2.phpt

@@ -21,5 +21,5 @@ $o = new C();
 $o->foo();
 
 ?>
---EXPECTF--
+--EXPECT--
 works

Zend/tests/bug46196.phpt

@@ -23,7 +23,7 @@ function myErrorHandler($errno, $errstr, $errfile, $errline)
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing restore_error_handler() : error bug #46196 ***
 NULL
 bool(true)

Zend/tests/bug46811.phpt

@@ -7,7 +7,7 @@ arg_separator.output=&
 var_dump(ini_set("arg_separator.output", ""));
 var_dump(ini_get("arg_separator.output"));
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(1) "&"
 

Zend/tests/bug47353.phpt

@@ -22,5 +22,5 @@ $a = new A();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done

Zend/tests/bug47981.phpt

@@ -13,5 +13,5 @@ interface a{}
 class b implements a { function f($a=1) {}}
 class c extends b {function f() {}}
 ?>
---EXPECTF--
+--EXPECT--
 string(60) "Declaration of c::f() should be compatible with b::f($a = 1)"

Zend/tests/bug48215.phpt

@@ -28,7 +28,7 @@ $b = new B();
 $b->A();
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 B::__construct
 A::__construct
 B::A

Zend/tests/bug48770.phpt

@@ -49,5 +49,5 @@ $c = new C;
 $c->func('This should work!');
 
 ?>
---EXPECTF--
+--EXPECT--
 string(26) "A::func: This should work!"

Zend/tests/bug53632.phpt

@@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done

Zend/tests/bug53748.phpt

@@ -30,7 +30,7 @@ $o= myHelloWorld::getInstance(array(1=>2));
 $o= myHelloWorld::getInstance(array(1=>2));
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 int(2)
 array(1) {

Zend/tests/bug54624.phpt

@@ -22,5 +22,5 @@ eval('
 
 echo "DONE\n";
 ?>
---EXPECTF--
+--EXPECT--
 DONE

Zend/tests/bug55156.phpt

@@ -26,7 +26,7 @@ namespace foo {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(12) "/** test1 */"
 string(12) "/** test2 */"

Zend/tests/bug55445.phpt

@@ -4,5 +4,5 @@ Bug #55445 (Lexer error with short open tags)
 short_open_tag=0
 --FILE--
 <?php $u = "chris"; ?><p>Welcome <?= $u ?></p>
---EXPECTF--
+--EXPECT--
 <p>Welcome chris</p>

Zend/tests/bug60536_004.phpt

@@ -28,7 +28,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2

Zend/tests/bug60536_005.phpt

@@ -27,7 +27,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2

Zend/tests/bug61761.phpt

@@ -15,5 +15,5 @@ class B extends A
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 ==DONE==

Zend/tests/bug62892.phpt

@@ -16,6 +16,6 @@ $class = new \ReflectionClass('myClass');
 var_dump($class->getTraitAliases());
 
 ?>
---EXPECTF--
+--EXPECT--
 array(0) {
 }