From aec191bc6cbb83884466800a750ecad0b37e254f Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Thu, 5 Nov 2015 10:25:57 +0100
Subject: remove test framework, it never works, most of the bugs found by the
 test framework turn out to be caused by errors in the tests instead of errors
 in the real code, people complain about it all the time, and basically this
 whole test framework causes more problems than it solves, solves issue #215
 and solves issue #221

---
 tests/php/phpt/variables/001-process_globals.phpt  |  47 -------
 .../php/phpt/variables/002-get_complex_array.phpt  |  33 -----
 tests/php/phpt/variables/003-value-types.phpt      |  72 ----------
 .../phpt/variables/004-store-scalar-variables.phpt |  58 --------
 .../variables/005-cast-objects-to-scalars.phpt     |  22 ---
 tests/php/phpt/variables/006-casting-obj2str.phpt  |  31 -----
 .../phpt/variables/007-overloaded-operators.phpt   |  51 -------
 tests/php/phpt/variables/008-value-arrays.phpt     |  89 ------------
 tests/php/phpt/variables/009-value-object.phpt     |  24 ----
 tests/php/phpt/variables/010-value-object2.phpt    |  24 ----
 .../variables/011-value-casting-operators.phpt     | 153 ---------------------
 .../012-value-casting-operators-double.phpt        |  80 -----------
 .../phpt/variables/013-calling-php-functions.phpt  | 113 ---------------
 .../phpt/variables/014-calling-php-functions.phpt  | 113 ---------------
 .../phpt/variables/015-calling-php-functions.phpt  | 109 ---------------
 .../phpt/variables/016-calling-php-functions.phpt  | 113 ---------------
 .../phpt/variables/017-calling-php-functions.phpt  | 115 ----------------
 .../phpt/variables/018-calling-php-functions.phpt  |  32 -----
 tests/php/phpt/variables/019-HashMember-1.phpt     |  27 ----
 tests/php/phpt/variables/020-HashMember-2.phpt     |  76 ----------
 tests/php/phpt/variables/021-HashMember-3.phpt     |  26 ----
 tests/php/phpt/variables/022-HashMember-4.phpt     |  37 -----
 tests/php/phpt/variables/023-cookie.phpt           |  16 ---
 tests/php/phpt/variables/024-get-post.phpt         |  26 ----
 tests/php/phpt/variables/025-post-raw1.phpt        |  27 ----
 tests/php/phpt/variables/026-post-raw2.phpt        |  38 -----
 tests/php/phpt/variables/027-env.phpt              |  25 ----
 tests/php/phpt/variables/028-compare1.phpt         |  53 -------
 tests/php/phpt/variables/029-compare2.phpt         |  74 ----------
 tests/php/phpt/variables/readme                    |   5 -
 30 files changed, 1709 deletions(-)
 delete mode 100644 tests/php/phpt/variables/001-process_globals.phpt
 delete mode 100644 tests/php/phpt/variables/002-get_complex_array.phpt
 delete mode 100644 tests/php/phpt/variables/003-value-types.phpt
 delete mode 100644 tests/php/phpt/variables/004-store-scalar-variables.phpt
 delete mode 100644 tests/php/phpt/variables/005-cast-objects-to-scalars.phpt
 delete mode 100644 tests/php/phpt/variables/006-casting-obj2str.phpt
 delete mode 100644 tests/php/phpt/variables/007-overloaded-operators.phpt
 delete mode 100644 tests/php/phpt/variables/008-value-arrays.phpt
 delete mode 100644 tests/php/phpt/variables/009-value-object.phpt
 delete mode 100644 tests/php/phpt/variables/010-value-object2.phpt
 delete mode 100644 tests/php/phpt/variables/011-value-casting-operators.phpt
 delete mode 100644 tests/php/phpt/variables/012-value-casting-operators-double.phpt
 delete mode 100644 tests/php/phpt/variables/013-calling-php-functions.phpt
 delete mode 100644 tests/php/phpt/variables/014-calling-php-functions.phpt
 delete mode 100644 tests/php/phpt/variables/015-calling-php-functions.phpt
 delete mode 100644 tests/php/phpt/variables/016-calling-php-functions.phpt
 delete mode 100644 tests/php/phpt/variables/017-calling-php-functions.phpt
 delete mode 100644 tests/php/phpt/variables/018-calling-php-functions.phpt
 delete mode 100644 tests/php/phpt/variables/019-HashMember-1.phpt
 delete mode 100644 tests/php/phpt/variables/020-HashMember-2.phpt
 delete mode 100644 tests/php/phpt/variables/021-HashMember-3.phpt
 delete mode 100644 tests/php/phpt/variables/022-HashMember-4.phpt
 delete mode 100644 tests/php/phpt/variables/023-cookie.phpt
 delete mode 100644 tests/php/phpt/variables/024-get-post.phpt
 delete mode 100644 tests/php/phpt/variables/025-post-raw1.phpt
 delete mode 100644 tests/php/phpt/variables/026-post-raw2.phpt
 delete mode 100644 tests/php/phpt/variables/027-env.phpt
 delete mode 100644 tests/php/phpt/variables/028-compare1.phpt
 delete mode 100644 tests/php/phpt/variables/029-compare2.phpt
 delete mode 100644 tests/php/phpt/variables/readme

(limited to 'tests/php/phpt/variables')

diff --git a/tests/php/phpt/variables/001-process_globals.phpt b/tests/php/phpt/variables/001-process_globals.phpt
deleted file mode 100644
index 022e99c..0000000
--- a/tests/php/phpt/variables/001-process_globals.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-Global variables in PHP-CPP
---DESCRIPTION--
-The author of the original: Jasper van Eck<jasper.vaneck@copernica.com>
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-// we first need to set a number of globals
-$b = 10;
-$d = function($a,$b,$c) {
-    return $a+$b+$c;
-};
-
-// fun global var
-$e = array(
-    function($a) {
-        return $a;
-    }
-);
-
-
-// call the C++ function that will do something
-$d = TestVariables\process_globals();
-
-// the global variable $a should not have the value 1
-echo("a = $a\n");
-
-// the variable $b should not be 11
-echo("b = $b\n");
-
-// $c should be an array with value 200
-echo("c['member'] = ".$c['member']."\n");
-
-// $d is overwritten and now is 6
-echo("d = $d\n");
-
-// e should be replaced by a string
-echo("e = $e\n");
-
---EXPECT--
-a = 1
-b = 11
-c['member'] = 200
-d = 6
-e = hello
\ No newline at end of file
diff --git a/tests/php/phpt/variables/002-get_complex_array.phpt b/tests/php/phpt/variables/002-get_complex_array.phpt
deleted file mode 100644
index 716fda9..0000000
--- a/tests/php/phpt/variables/002-get_complex_array.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-get_complex_array
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-/*
-function get_complex_array()
-{
-    return array(
-        "a" => 123,
-        "b" => 456,
-        "c" => array("nested value","example",7)
-    );
-}
-var_export(get_complex_array());
-*/
-var_export(TestVariables\get_complex_array());
-
-
-echo PHP_EOL;
---EXPECT--
-array (
-  'a' => 123,
-  'b' => 456,
-  'c' => 
-  array (
-    0 => 'nested value',
-    1 => 'example',
-    2 => 7,
-  ),
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/003-value-types.phpt b/tests/php/phpt/variables/003-value-types.phpt
deleted file mode 100644
index 477fbe2..0000000
--- a/tests/php/phpt/variables/003-value-types.phpt
+++ /dev/null
@@ -1,72 +0,0 @@
---TEST--
-get_complex_array
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-# check Callable: http://php.net/manual/en/function.is-callable.php
-function  ret5() {return 5;}
-class someClass {
-  function someMethod() {return 5;}
-}
-class CallableClass {
-    public function __invoke(){}
-}
-
-$anObject = new someClass();
-$methodVariable = array($anObject, 'someMethod');
-
-
-# check array
-$arr = array(
-    'Null'            =>   NULL,
-    'Numeric'         =>   2014,
-    'Float'           =>   3.14,
-    'Bool'            =>   true,
-    'Array'           =>   array(5,'a' => 33, 'str'),
-    'Object'          =>   new stdClass(),
-    'String'          =>   'String',
-    'Resource'        =>   7,
-    'Constant'        =>   5,
-    'ConstantArray'   =>   11,
-    'Callable1'        =>  'ret5',
-    'Callable2'        =>  $methodVariable,
-    'Callable3'        =>  function () {return 5;},
-    'Callable4'        =>  new CallableClass()
-);
-
-TestVariables\value_types($arr);
-
-//To check uncomment the following lines:
-/*
-echo "\n\nCallable1:";
-var_export(is_callable($arr['Callable1']));
-echo PHP_EOL,'Callable2:';
-var_export(is_callable($arr['Callable2']));
-echo PHP_EOL,'Callable3:';
-var_export(is_callable($arr['Callable3']));
-echo PHP_EOL,'Callable4:';
-var_export(is_callable($arr['Callable4']));
-echo PHP_EOL,'No Callable:';
-var_export(is_callable(new stdClass));
-*/
-
-
-echo PHP_EOL;
---EXPECT--
-Null: Yes
-Numeric: Yes
-Float: Yes
-Bool: Yes
-Array: Yes
-Object: Yes
-String: Yes
-Resource: No
-Constant: No
-ConstantArray: No
-Callable1: Yes
-Callable2: Yes
-Callable3: Yes
-Callable4: Yes
\ No newline at end of file
diff --git a/tests/php/phpt/variables/004-store-scalar-variables.phpt b/tests/php/phpt/variables/004-store-scalar-variables.phpt
deleted file mode 100644
index 53cc681..0000000
--- a/tests/php/phpt/variables/004-store-scalar-variables.phpt
+++ /dev/null
@@ -1,58 +0,0 @@
---TEST--
-Test variables defined in PHP-CPP
---DESCRIPTION--
-in PHP-CPP:
-Php::Value scalar_store(void) {
-    
-    Php::Value value1 = 1234;
-    Php::Value value2 = "this is a string";
-    Php::Value value3 = std::string("another string");
-    Php::Value value4 = nullptr;
-    Php::Value value5 = 123.45;
-    Php::Value value6 = true;
-    
-    Php::Value r;
-    r[0] = value1;
-    r[1] = value2;
-    r[2] = value3;
-    r[3] = value4;
-    r[4] = value5;
-    r[5] = value6;
-    
-    r[6]  = 1234;
-    r[7]  = "this is a string";
-    r[8]  = std::string("another string");
-    r[9]  = nullptr;        // NULL
-    r[10] = Php::Value();   // NULL
-    r[11] = 123.45;
-    r[12] = false;
-    
-    return r;
-}
-
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-var_export(TestVariables\scalar_store());
-
-
-//echo PHP_EOL;
---EXPECT--
-array (
-  0 => 1234,
-  1 => 'this is a string',
-  2 => 'another string',
-  3 => NULL,
-  4 => 123.45,
-  5 => true,
-  6 => 1234,
-  7 => 'this is a string',
-  8 => 'another string',
-  9 => NULL,
-  10 => NULL,
-  11 => 123.45,
-  12 => false,
-)
diff --git a/tests/php/phpt/variables/005-cast-objects-to-scalars.phpt b/tests/php/phpt/variables/005-cast-objects-to-scalars.phpt
deleted file mode 100644
index 9de9ba5..0000000
--- a/tests/php/phpt/variables/005-cast-objects-to-scalars.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-cast objects to scalars
---DESCRIPTION--
-http://www.phpcpp.com/documentation/special-features#casting-functions
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-function bool2str($b) {
-    return $b ? "Yes" : "No";
-}
-$obj = new TestVariables\Obj2Scalar();
-echo  "   long: ", (int)$obj, "\n string: ", (string)$obj, "\n double: ", (double)$obj, "\n   bool: ", bool2str((bool)$obj);
-
-
---EXPECT--
-   long: 27032014
- string: Mount Meru, also called Sumeru (Sanskrit)
- double: 3.14159265359
-   bool: Yes
diff --git a/tests/php/phpt/variables/006-casting-obj2str.phpt b/tests/php/phpt/variables/006-casting-obj2str.phpt
deleted file mode 100644
index 53d9707..0000000
--- a/tests/php/phpt/variables/006-casting-obj2str.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-Test Php::Value casting operators (object to string)
---DESCRIPTION--
-
-Converting a php object to a string
-
-
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-function native_value_casting($value) {
-    echo  (string)$value, PHP_EOL;
-}
-class TestClass
-{
-    public function __toString() {return "I am TestClass";}
-}
-
-TestVariables\value_cast2str(new TestClass());
-//native_value_casting(new TestClass());
-
-TestVariables\value_cast2str("some string");
-
-
-
---EXPECT--
-I am TestClass
-some string
\ No newline at end of file
diff --git a/tests/php/phpt/variables/007-overloaded-operators.phpt b/tests/php/phpt/variables/007-overloaded-operators.phpt
deleted file mode 100644
index a26b1a4..0000000
--- a/tests/php/phpt/variables/007-overloaded-operators.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-Test Php::Value overloaded operators 
---DESCRIPTION--
-
-Many different operators are overloaded too so that you can use a Php::Value object directly in arithmetric operations,
-compare it with other variables, or send it to an output stream. 
-
-
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-TestVariables\overloaded_op(5);
-TestVariables\overloaded_op(3.14);
-TestVariables\overloaded_op(12);
-TestVariables\overloaded_op(120);
-TestVariables\overloaded_op(-1000);
-TestVariables\overloaded_op("some string");
-
-
-
---EXPECT--
-15
-7
-1851.75
-0.121507
-13.14
-5
-1622.13
-0.10644
-value == 12
-22
-14
-2715.9
-0.17821
-value > 100
-130
-122
-16048.5
-1.05306
--990
--998
--122216
--8.01944
-value == 'some string'
-10
-2
-1234.5
-0.0810045
\ No newline at end of file
diff --git a/tests/php/phpt/variables/008-value-arrays.phpt b/tests/php/phpt/variables/008-value-arrays.phpt
deleted file mode 100644
index 6950780..0000000
--- a/tests/php/phpt/variables/008-value-arrays.phpt
+++ /dev/null
@@ -1,89 +0,0 @@
---TEST--
-Test Php::Value arrays 
---DESCRIPTION--
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-$r = TestVariables\value_arrays();
-
-    // To check:
-/*
-    $array;
-    $array[0] = "apple";
-    $array[1] = "banana";
-    $array[2] = "tomato";
-
-    // an initializer list can be used to create a filled array 
-    $filled = ["a", "b", "c", "d"];
-
-    // create an associative array
-    $assoc["apple"] = "green";
-    $assoc["banana"] = "yellow";
-    $assoc["tomato"] = "green";
-
-    // the variables in an array do not all have to be of the same type
-    $assoc2["x"] = "info@example.com";
-    $assoc2["y"] = NULL;
-    $assoc2["z"] = 123;
-
-    // nested arrays are possible too
-    $assoc3["x"] = "info@example.com";
-    $assoc3["y"] = NULL;
-    $assoc3["z"][0] = "a";
-    $assoc3["z"][1] = "b";
-    $assoc3["z"][2] = "c";
-
-    $r = [];
-    $r["array"]  = $array;
-    $r["filled"] = $filled;
-    $r["assoc"]  = $assoc;
-    $r["assoc2"] = $assoc2;
-    $r["assoc3"] = $assoc3;
-*/
-    
-var_export($r);
-
-
-
---EXPECT--
-array (
-  'array' => 
-  array (
-    0 => 'apple',
-    1 => 'banana',
-    2 => 'tomato',
-  ),
-  'filled' => 
-  array (
-    0 => 'a',
-    1 => 'b',
-    2 => 'c',
-    3 => 'd',
-  ),
-  'assoc' => 
-  array (
-    'apple' => 'green',
-    'banana' => 'yellow',
-    'tomato' => 'green',
-  ),
-  'assoc2' => 
-  array (
-    'x' => 'info@example.com',
-    'y' => NULL,
-    'z' => 123,
-  ),
-  'assoc3' => 
-  array (
-    'x' => 'info@example.com',
-    'y' => NULL,
-    'z' => 
-    array (
-      0 => 'a',
-      1 => 'b',
-      2 => 'c',
-    ),
-  ),
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/009-value-object.phpt b/tests/php/phpt/variables/009-value-object.phpt
deleted file mode 100644
index c45cae8..0000000
--- a/tests/php/phpt/variables/009-value-object.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Test Php::Value object #1
---DESCRIPTION--
- create empty object of type stdClass
- object properties can be accessed with square brackets
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-$object = TestVariables\value_object1();
-
-//$object = (object)array("property1" => "value1", "property2" => "value2");
-
-var_export($object);
-
-
-
---EXPECT--
-stdClass::__set_state(array(
-   'property1' => 'value1',
-   'property2' => 'value2',
-))
\ No newline at end of file
diff --git a/tests/php/phpt/variables/010-value-object2.phpt b/tests/php/phpt/variables/010-value-object2.phpt
deleted file mode 100644
index 8697a69..0000000
--- a/tests/php/phpt/variables/010-value-object2.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Test Php::Value object #2
---DESCRIPTION--
- create empty object of type stdClass
- object properties can be accessed with square brackets
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-//date_default_timezone_set('Europe/Amsterdam');
-var_export(TestVariables\value_object2());
-
-
---EXPECT--
-2014-03-27 00:37:15
-2016-03-31 15:48:00
-7200
-DateTime::__set_state(array(
-   'date' => '2014-03-27 00:37:15',
-   'timezone_type' => 3,
-   'timezone' => 'Europe/Amsterdam',
-))
\ No newline at end of file
diff --git a/tests/php/phpt/variables/011-value-casting-operators.phpt b/tests/php/phpt/variables/011-value-casting-operators.phpt
deleted file mode 100644
index 27e92c7..0000000
--- a/tests/php/phpt/variables/011-value-casting-operators.phpt
+++ /dev/null
@@ -1,153 +0,0 @@
---TEST--
-Test Php::Value casting operators (64bit OS only)
---DESCRIPTION--
-The Php::Value class has casting operators to cast the object to almost every thinkable native type.
-
-native_value_casting - repeats the behavior of c++ functions TestVariables\value_casting
-the output of each of these functions should be the same
-
-Skip if the current OS is not 64-bit architecture.
-
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests") || 'x86_64' != php_uname('m') ) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-function bool2str($b) {
-    return $b ? "Yes" : "No";
-}
-function native_value_casting($value) {
-    //echo  "   long:", (int)$value, "\n string:", (string)$value, "\n double:", (double)$value, "\n   bool:", bool2str((bool)$value), PHP_EOL;
-    echo  "   long:", (int)$value, "\n string:", (string)$value, "\n   bool:", bool2str((bool)$value), PHP_EOL;
-}
-
-
-function out($v) {
-    echo 'Test ';
-    var_export($v);
-    echo ':', PHP_EOL;
-    TestVariables\value_casting($v);
-    //native_value_casting($v);
-    echo PHP_EOL;
-}
-
-out(5555555555555555);
-out("9223372036854775807");
-out(9223372036854775807);
-out(5);
-out(-99999999);
-out("18");
-out("3.14159265359");
-out(3.14159265359);
-out(25/7);
-out(" this is a string ");
-out(" 2-nd string ");
-out("false");
-out(false);
-out("true");
-out(true);
-out(0);
-out("0");
-out(0123); // octal number (equivalent to 83 decimal)
-out(0x1A); // hexadecimal number (equivalent to 26 decimal)
-
-
-
-
-//echo PHP_EOL;
---EXPECT--
-Test 5555555555555555:
-   long:5555555555555555
- string:5555555555555555
-   bool:Yes
-
-Test '9223372036854775807':
-   long:9223372036854775807
- string:9223372036854775807
-   bool:Yes
-
-Test 9223372036854775807:
-   long:9223372036854775807
- string:9223372036854775807
-   bool:Yes
-
-Test 5:
-   long:5
- string:5
-   bool:Yes
-
-Test -99999999:
-   long:-99999999
- string:-99999999
-   bool:Yes
-
-Test '18':
-   long:18
- string:18
-   bool:Yes
-
-Test '3.14159265359':
-   long:3
- string:3.14159265359
-   bool:Yes
-
-Test 3.14159265359:
-   long:3
- string:3.14159265359
-   bool:Yes
-
-Test 3.5714285714286:
-   long:3
- string:3.5714285714286
-   bool:Yes
-
-Test ' this is a string ':
-   long:0
- string: this is a string 
-   bool:Yes
-
-Test ' 2-nd string ':
-   long:2
- string: 2-nd string 
-   bool:Yes
-
-Test 'false':
-   long:0
- string:false
-   bool:Yes
-
-Test false:
-   long:0
- string:
-   bool:No
-
-Test 'true':
-   long:0
- string:true
-   bool:Yes
-
-Test true:
-   long:1
- string:1
-   bool:Yes
-
-Test 0:
-   long:0
- string:0
-   bool:No
-
-Test '0':
-   long:0
- string:0
-   bool:No
-
-Test 83:
-   long:83
- string:83
-   bool:Yes
-
-Test 26:
-   long:26
- string:26
-   bool:Yes
\ No newline at end of file
diff --git a/tests/php/phpt/variables/012-value-casting-operators-double.phpt b/tests/php/phpt/variables/012-value-casting-operators-double.phpt
deleted file mode 100644
index babd476..0000000
--- a/tests/php/phpt/variables/012-value-casting-operators-double.phpt
+++ /dev/null
@@ -1,80 +0,0 @@
---TEST--
-Test Php::Value casting operators (double)
---DESCRIPTION--
-The Php::Value class has casting operators to cast the object to almost every thinkable native type.
-
-native_value_casting - repeats the behavior of c++ functions TestVariables\value_casting
-the output of each of these functions should be the same
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-
-function out($v) {
-    echo 'Test ';
-    var_export($v);
-    echo ':', PHP_EOL;
-    TestVariables\value_cast2double($v);
-    //echo  (double)$v, PHP_EOL;;
-    //echo PHP_EOL;
-}
-
-out(5555555555555);
-out("999999999999999");
-out(99999999999999);
-out(5);
-out(-99999999);
-out("18");
-out("3.14159265359");
-out(3.14159265359);
-out(" this is a string ");
-out(" 2-nd string ");
-out("false");
-out(false);
-out("true");
-out(true);
-out(0);
-out("0");
-out(0123); // octal number (equivalent to 83 decimal)
-out(0x1A); // hexadecimal number (equivalent to 26 decimal)
-
-
---EXPECT--
-Test 5555555555555:
-5555555555555
-Test '999999999999999':
-999999999999999
-Test 99999999999999:
-99999999999999
-Test 5:
-5
-Test -99999999:
--99999999
-Test '18':
-18
-Test '3.14159265359':
-3.14159265359
-Test 3.14159265359:
-3.14159265359
-Test ' this is a string ':
-0
-Test ' 2-nd string ':
-2
-Test 'false':
-0
-Test false:
-0
-Test 'true':
-0
-Test true:
-1
-Test 0:
-0
-Test '0':
-0
-Test 83:
-83
-Test 26:
-26
\ No newline at end of file
diff --git a/tests/php/phpt/variables/013-calling-php-functions.phpt b/tests/php/phpt/variables/013-calling-php-functions.phpt
deleted file mode 100644
index 5ec6644..0000000
--- a/tests/php/phpt/variables/013-calling-php-functions.phpt
+++ /dev/null
@@ -1,113 +0,0 @@
---TEST--
-calling-php-functions from userspace
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-
-function some_function($param) {
-    echo("userspace function called with parameters:\n");
-    var_export(func_get_args ());
-}
-    
-TestVariables\fnFromUserSpace();
-
-
-
---EXPECT--
-fnFromUserSpace
-userspace function called with parameters:
-array (
-  0 => 'param1',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-  5 => 
-  DateTime::__set_state(array(
-     'date' => '2014-03-28 19:42:15',
-     'timezone_type' => 3,
-     'timezone' => 'Asia/Yekaterinburg',
-  )),
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-)userspace function called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-  9 => 'param10',
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/014-calling-php-functions.phpt b/tests/php/phpt/variables/014-calling-php-functions.phpt
deleted file mode 100644
index 4a05e2a..0000000
--- a/tests/php/phpt/variables/014-calling-php-functions.phpt
+++ /dev/null
@@ -1,113 +0,0 @@
---TEST--
-calling-php-Callback-functions 
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-
-function some_function($param) {
-    echo("Callback called with parameters:\n");
-    var_export(func_get_args ());
-}
-    
-TestVariables\fnCallback("some_function");
-
-
-
---EXPECT--
-call callback
-Callback called with parameters:
-array (
-  0 => 'param1',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-  5 => 
-  DateTime::__set_state(array(
-     'date' => '2014-03-28 19:42:15',
-     'timezone_type' => 3,
-     'timezone' => 'Asia/Yekaterinburg',
-  )),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-  9 => 'param10',
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/015-calling-php-functions.phpt b/tests/php/phpt/variables/015-calling-php-functions.phpt
deleted file mode 100644
index e9382b2..0000000
--- a/tests/php/phpt/variables/015-calling-php-functions.phpt
+++ /dev/null
@@ -1,109 +0,0 @@
---TEST--
-calling-php-Callback-functions (lambda)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-TestVariables\fnCallback( function($param) {
-    echo("Callback called with parameters:\n");
-    var_export(func_get_args ());
-});
-
-
---EXPECT--
-call callback
-Callback called with parameters:
-array (
-  0 => 'param1',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-  5 => 
-  DateTime::__set_state(array(
-     'date' => '2014-03-28 19:42:15',
-     'timezone_type' => 3,
-     'timezone' => 'Asia/Yekaterinburg',
-  )),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-  9 => 'param10',
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/016-calling-php-functions.phpt b/tests/php/phpt/variables/016-calling-php-functions.phpt
deleted file mode 100644
index 46fda6e..0000000
--- a/tests/php/phpt/variables/016-calling-php-functions.phpt
+++ /dev/null
@@ -1,113 +0,0 @@
---TEST--
-calling-php-Callback-functions (__invoke)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-class CallableClass {
-    public function __invoke() {
-        echo("Callback called with parameters:\n");
-        var_export(func_get_args ());
-    }
-}
-
-TestVariables\fnCallback(new CallableClass());
-
-
---EXPECT--
-call callback
-Callback called with parameters:
-array (
-  0 => 'param1',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-  5 => 
-  DateTime::__set_state(array(
-     'date' => '2014-03-28 19:42:15',
-     'timezone_type' => 3,
-     'timezone' => 'Asia/Yekaterinburg',
-  )),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-  9 => 'param10',
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/017-calling-php-functions.phpt b/tests/php/phpt/variables/017-calling-php-functions.phpt
deleted file mode 100644
index 630399a..0000000
--- a/tests/php/phpt/variables/017-calling-php-functions.phpt
+++ /dev/null
@@ -1,115 +0,0 @@
---TEST--
-calling-php-Callback-functions (method of class)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-class someClass {
-    function someMethod() {
-        echo("Callback called with parameters:\n");
-        var_export(func_get_args ());
-    }
-}
-
-$anObject = new someClass();
-$methodVariable = array($anObject, 'someMethod');
-TestVariables\fnCallback($methodVariable);
-
-
---EXPECT--
-call callback
-Callback called with parameters:
-array (
-  0 => 'param1',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 
-  array (
-    0 => 'param5',
-    1 => 3.14159265359,
-    2 => 28032014,
-    'key' => 'value',
-  ),
-  5 => 
-  DateTime::__set_state(array(
-     'date' => '2014-03-28 19:42:15',
-     'timezone_type' => 3,
-     'timezone' => 'Asia/Yekaterinburg',
-  )),
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-)Callback called with parameters:
-array (
-  0 => 'param1',
-  1 => 'param2',
-  2 => 'param3',
-  3 => 'param4',
-  4 => 'param5',
-  5 => 'param6',
-  6 => 'param7',
-  7 => 'param8',
-  8 => 'param9',
-  9 => 'param10',
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/018-calling-php-functions.phpt b/tests/php/phpt/variables/018-calling-php-functions.phpt
deleted file mode 100644
index 1b8bfeb..0000000
--- a/tests/php/phpt/variables/018-calling-php-functions.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-calling-php-callable
---DESCRIPTION--
-call callable object of class from user space
-call method of class from user space
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-
-class CallableClass {
-    public function __construct($a){ $this->a = $a;}
-    public function __invoke($b){ echo "CallableClass({$this->a})::__invoke($b)";}
-    private $a = "";
-}
-
-class usrspClass {
-  function __construct($a){ $this->a = $a;}
-  function someMethod($b) {echo "usrspClass({$this->a})::someMethod($b)";}
-  private $a = "";
-}
-
-
-TestVariables\fnFromUserSpace2();
-
-
---EXPECT--
-2014-03-28 21:22:15
-2014-03-28 21:22:15
-usrspClass(Mount Meru)::someMethod(is in the Arctics)
-CallableClass(Arctics around mount Meru)::__invoke(is the birthplace of the Hyperboreans)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/019-HashMember-1.phpt b/tests/php/phpt/variables/019-HashMember-1.phpt
deleted file mode 100644
index ebc126f..0000000
--- a/tests/php/phpt/variables/019-HashMember-1.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-get_complex_array (test HashMember #1)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-/*
-$r = array();
-$r["key1"] = array();
-$r["key1"]["key2"] = "val2";
-$r["key1"]["key3"] = "val3";
-var_export($r);echo "\n";
-*/
-
-var_export(TestVariables\test_HashMember_1());
-
-
-echo PHP_EOL;
---EXPECT--
-array (
-  'key1' => 
-  array (
-    'key2' => 'val2',
-    'key3' => 'val3',
-  ),
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/020-HashMember-2.phpt b/tests/php/phpt/variables/020-HashMember-2.phpt
deleted file mode 100644
index bb48d06..0000000
--- a/tests/php/phpt/variables/020-HashMember-2.phpt
+++ /dev/null
@@ -1,76 +0,0 @@
---TEST--
-get_complex_array (test HashMember #2)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-/*
-$r = array();
-$r["k1"]["k3"] = "v1";
-$r["k1"]["k2"]["k4"] = "v2";
-$r["k5"][1] = "v3";
-$r[2]["k6"][1] = "v4";
-$r[3][4][1] = "v5";
-$r[3][4][2][5][7][11] = "v5";
-$r[3][4][2][5][7]["k"] = "v5";
-$r["c"][0] = "nested value";
-$r["c"][1] = NULL;
-$r["c"][2] = array();
-$r["c"][3] = "example";
-var_export($r);echo "\n";
-*/
-
-var_export(TestVariables\test_HashMember_2());
-
-
-echo PHP_EOL;
---EXPECT--
-array (
-  'k1' => 
-  array (
-    'k3' => 'v1',
-    'k2' => 
-    array (
-      'k4' => 'v2',
-    ),
-  ),
-  'k5' => 
-  array (
-    1 => 'v3',
-  ),
-  2 => 
-  array (
-    'k6' => 
-    array (
-      1 => 'v4',
-    ),
-  ),
-  3 => 
-  array (
-    4 => 
-    array (
-      1 => 'v5',
-      2 => 
-      array (
-        5 => 
-        array (
-          7 => 
-          array (
-            11 => 'v5',
-            'k' => 'v5',
-          ),
-        ),
-      ),
-    ),
-  ),
-  'c' => 
-  array (
-    0 => 'nested value',
-    1 => NULL,
-    2 => 
-    array (
-    ),
-    3 => 'example',
-  ),
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/021-HashMember-3.phpt b/tests/php/phpt/variables/021-HashMember-3.phpt
deleted file mode 100644
index 20f43ba..0000000
--- a/tests/php/phpt/variables/021-HashMember-3.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-get_complex_array (test HashMember #3)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-/*
-$r = array();
-$r["key1"] = array();
-$r["key1"]["key2"] = "val1-2";
-$r["key1"]["key3"] = "val1-3";
-var_export($r);echo "\n";
-*/
-
-var_export(TestVariables\test_HashMember_3());
-
-
-echo PHP_EOL;
---EXPECT--
-array (
-  'key1' => 
-  array (
-    'key2' => 'val1-2',
-  ),
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/022-HashMember-4.phpt b/tests/php/phpt/variables/022-HashMember-4.phpt
deleted file mode 100644
index cbdc8b0..0000000
--- a/tests/php/phpt/variables/022-HashMember-4.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-get_complex_array (test HashMember #4)
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-var_export(TestVariables\test_HashMember_4());
-
-
-echo PHP_EOL;
---EXPECT--
-array (
-  0 => 
-  array (
-    'key1' => 
-    array (
-      'key2' => 
-      array (
-        'key3' => 'val',
-      ),
-    ),
-  ),
-  1 => 
-  array (
-    'str1' => 'example',
-    'str2' => 'example',
-  ),
-  2 => 
-  array (
-    'str1' => 
-    array (
-      'str2' => 'val1-2',
-      'str3' => 'val1-3',
-    ),
-  ),
-)
\ No newline at end of file
diff --git a/tests/php/phpt/variables/023-cookie.phpt b/tests/php/phpt/variables/023-cookie.phpt
deleted file mode 100644
index 0648188..0000000
--- a/tests/php/phpt/variables/023-cookie.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-test cookie
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---COOKIE--
-peace=toTheWorld;freedom=toThePeople
---FILEEOF--
-<?php
-
-
-TestVariables\getCookie();
-
---EXPECT--
-_COOKIE[peace]   = toTheWorld
-_COOKIE[freedom] = toThePeople
-_COOKIE[empty]   =
\ No newline at end of file
diff --git a/tests/php/phpt/variables/024-get-post.phpt b/tests/php/phpt/variables/024-get-post.phpt
deleted file mode 100644
index 9ac1243..0000000
--- a/tests/php/phpt/variables/024-get-post.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-test get and post
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---GET--
-a=<b>test</b>&b=http://phpcpp.com&ar[elm1]=1234&ar[elm2]=0660&a=0234
---POST--
-c=<p>string</p>&d=12345.7&e[]=e1&e[]=e2
---FILEEOF--
-<?php
-
-
-TestVariables\get_post();
-
---EXPECTF--
-_GET[a] = 0234
-_GET[b] = http://phpcpp.com
-_GET[ar][elm1] = 1234
-_GET[ar][elm2] = 0660
-_POST[c]   = <p>string</p>
-_POST[d]   = 12345.7
-
-Notice: Array to string conversion in %s/024-get-post.php on line %d
-_POST[e]   = Array
-_POST[e][0]   = e1
-_POST[e][1]   = e2
\ No newline at end of file
diff --git a/tests/php/phpt/variables/025-post-raw1.phpt b/tests/php/phpt/variables/025-post-raw1.phpt
deleted file mode 100644
index 76fed0f..0000000
--- a/tests/php/phpt/variables/025-post-raw1.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-test post raw #1
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---POST_RAW--
-Content-type: multipart/form-data, boundary=AaB03x
-
---AaB03x
-content-disposition: form-data; name="username"
-
-valmat
---AaB03x
-content-disposition: form-data; name="text"
-
-Hellow World!
---AaB03x
---FILEEOF--
-<?php
-
-
-TestVariables\post_raw1();
-
-//foreach($_POST as $k => $v) {echo "\n$k => $v";}
-
---EXPECTF--
-username => valmat
-text => Hellow World!
\ No newline at end of file
diff --git a/tests/php/phpt/variables/026-post-raw2.phpt b/tests/php/phpt/variables/026-post-raw2.phpt
deleted file mode 100644
index 4bee44c..0000000
--- a/tests/php/phpt/variables/026-post-raw2.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-Post files
---DESCRIPTION--
-Simulates the file upload method post
-test post raw #2
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---POST_RAW--
-Content-type: multipart/form-data, boundary=AaB03x
-
---AaB03x
-content-disposition: form-data; name="flnm[]"; filename="file1.txt"
-Content-Type: text/plain
-
-abcdef123456789
---AaB03x
-content-disposition: form-data; name="flnm[]"; filename="file2.txt"
-Content-Type: text/plain
-
-«£¥§©®°±¶Я⅓⅘⅞Ⅻↆ❄❅❆⚑⚐⌛⌚〰»
---AaB03x
---FILEEOF--
-<?php
-
-
-TestVariables\post_raw2();
-
---EXPECTF--
-name1 : file1.txt
-name2 : file2.txt
-type1 : text/plain
-type2 : text/plain
-error1 : 0
-error2 : 0
-size1 : 15
-size2 : 61
-content1 : abcdef123456789
-content2 : «£¥§©®°±¶Я⅓⅘⅞Ⅻↆ❄❅❆⚑⚐⌛⌚〰»
\ No newline at end of file
diff --git a/tests/php/phpt/variables/027-env.phpt b/tests/php/phpt/variables/027-env.phpt
deleted file mode 100644
index 4e84cfe..0000000
--- a/tests/php/phpt/variables/027-env.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-test superglobal _ENV
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---ENV--
-return <<<END
-ENVVAR1=ENVVAL1
-HTTP_REFERER=http://spb.1gs.ru/
-HTTP_USER_AGENT=Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:28.0) Gecko/20100101 Firefox/28.0
-HTTP_COOKIE=usr=1cfa6e9905; pc=0; PHPSESSID=4d08j9phpe1c6; vmode=0
-HTTP_HOST=phpcpp.com
-END;
---FILEEOF--
-<?php
-
-
-TestVariables\test_env();
-//var_export($_SERVER); echo PHP_EOL, PHP_EOL, PHP_EOL;
-
---EXPECTF--
-HTTP_USER_AGENT => Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:28.0) Gecko/20100101 Firefox/28.0
-ENVVAR1 => ENVVAL1
-HTTP_REFERER => http://spb.1gs.ru/
-REQUEST_METHOD => GET
-HTTP_HOST => phpcpp.com
diff --git a/tests/php/phpt/variables/028-compare1.phpt b/tests/php/phpt/variables/028-compare1.phpt
deleted file mode 100644
index 2885fe8..0000000
--- a/tests/php/phpt/variables/028-compare1.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-Test bool Value::operator==(const Value &value) const
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-TestVariables\test_compare1();
-
---EXPECT--
-true:
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-false:
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-Compare array:
-0
-0
-0
-1
-0
-Compare NULL:
-0
-0
-0
-1
-1
-1
\ No newline at end of file
diff --git a/tests/php/phpt/variables/029-compare2.phpt b/tests/php/phpt/variables/029-compare2.phpt
deleted file mode 100644
index 333ede1..0000000
--- a/tests/php/phpt/variables/029-compare2.phpt
+++ /dev/null
@@ -1,74 +0,0 @@
---TEST--
-Test bool Value::operator< (const Value &value) const
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-TestVariables\test_compare2();
-
---EXPECT--
-false:
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-true:
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-false:
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-Compare array:
-1
-1
-0
-1
-0
-1
-Compare NULL:
-0
-0
-0
-1
-1
-1
-0
-0
-0
\ No newline at end of file
diff --git a/tests/php/phpt/variables/readme b/tests/php/phpt/variables/readme
deleted file mode 100644
index a47cb89..0000000
--- a/tests/php/phpt/variables/readme
+++ /dev/null
@@ -1,5 +0,0 @@
-tests variables
-
-TODO: more tests for globals variables
-including separate test for $_GET, $_POST, $_COOKIE, $_FILES, $_SERVER, $_REQUEST and $_ENV (Php::GET, Php::POST, Php::COOKIE, Php::FILES, Php::SERVER, Php::REQUEST and Php::ENV) variables.
-
-- 
cgit v1.2.3