Unify the var_export helper

Author: Girgias

Zend/tests/offsets/array_container_offset_behaviour.phpt

@@ -88,7 +88,7 @@ $EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT
 ob_start();
 foreach ($offsets as $dimension) {
     $container = [];
-    $error = '[][' . makeOffset($dimension) . '] has different outputs' . "\n";
+    $error = '[][' . zend_test_var_export($dimension) . '] has different outputs' . "\n";
 
     include $var_dim_filename;
     $varOutput = ob_get_contents();

Zend/tests/offsets/false_container_offset_behaviour.phpt

@@ -92,7 +92,7 @@ $EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT
 ob_start();
 foreach ($offsets as $dimension) {
     $container = false;
-    $error = 'false[' . makeOffset($dimension) . '] has different outputs' . "\n";
+    $error = 'false[' . zend_test_var_export($dimension) . '] has different outputs' . "\n";
 
     include $var_dim_filename;
     $varOutput = ob_get_contents();

Zend/tests/offsets/invalid_container_offset_behaviour.phpt

@@ -42,7 +42,7 @@ Cannot unset offset in a non-array variable
 OUTPUT;
 
     foreach ($offsets as $dimension) {
-        $error = $containerStr . '[' . makeOffset($dimension) . '] has different outputs' . "\n";
+        $error = $containerStr . '[' . zend_test_var_export($dimension) . '] has different outputs' . "\n";
 
         include $var_dim_filename;
         $varOutput = ob_get_contents();

Zend/tests/offsets/null_container_offset_behaviour.phpt

@@ -86,7 +86,7 @@ $EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT
 ob_start();
 foreach ($offsets as $dimension) {
     $container = null;
-    $error = 'null[' . makeOffset($dimension) . '] has different outputs' . "\n";
+    $error = 'null[' . zend_test_var_export($dimension) . '] has different outputs' . "\n";
 
     include $var_dim_filename;
     $varOutput = ob_get_contents();

Zend/tests/offsets/object_container_offset_behaviour.phpt

@@ -28,7 +28,7 @@ OUTPUT;
 ob_start();
 foreach ($offsets as $dimension) {
     $container = new stdClass();
-    $error = '(new stdClass())[' . makeOffset($dimension) . '] has different outputs' . "\n";
+    $error = '(new stdClass())[' . zend_test_var_export($dimension) . '] has different outputs' . "\n";
 
     include $var_dim_filename;
     $varOutput = ob_get_contents();

Zend/tests/offsets/runtime_compile_time_offset_access.phpt

@@ -13,8 +13,8 @@ opcache.file_update_protection=1
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'test_offset_helpers.inc';
 
 function makeTestFile($container, $offset) {
-    $offset_p = makeOffset($offset);
-    $container_p = makeContainer($container);
+    $offset_p = zend_test_var_export($offset);
+    $container_p = zend_test_var_export($container);
     $fileContent = <<<test
 <?php
 
@@ -82,7 +82,7 @@ $const_dim_filename = __DIR__ . DIRECTORY_SEPARATOR . 'compare_binary_offsets_te
 ob_start();
 foreach ($containers as $container_orig) {
     foreach ($offsets as $offset) {
-        $error = makeContainer($container_orig) . '[' . makeOffset($offset) . '] has different outputs' . "\n";
+        $error = zend_test_var_export($container_orig) . '[' . zend_test_var_export($offset) . '] has different outputs' . "\n";
         file_put_contents($const_dim_filename, makeTestFile($container_orig, $offset));
 
         include $const_dim_filename;

Zend/tests/offsets/string_container_offset_behaviour.phpt

@@ -273,7 +273,7 @@ $EXPECTED_OUTPUT_INVALID_OFFSETS_AS_LEADING_NUMERIC_STRINGS_REGEX = '/^' . expec
 ob_start();
 foreach ($offsets as $dimension) {
     $container = '';
-    $error = '""[' . makeOffset($dimension) . '] has different outputs' . "\n";
+    $error = '""[' . zend_test_var_export($dimension) . '] has different outputs' . "\n";
 
     include $var_dim_filename;
     $varOutput = ob_get_contents();

Zend/tests/offsets/test_offset_helpers.inc

@@ -12,38 +12,32 @@ function get_zend_debug_type($v) {
     }
     return get_debug_type($v);
 }
-function makeContainer($container) {
-    if (is_array($container)) {
+function zend_test_var_export($value) {
+    if ($value === PHP_INT_MIN) {
+        return "PHP_INT_MIN";
+    }
+    if ($value === PHP_INT_MAX) {
+        return "PHP_INT_MAX";
+    }
+    if (is_array($value)) {
         return "[]";
     }
-    if (is_resource($container)) {
+    if (is_resource($value)) {
         return "STDERR";
     }
-    if ($container instanceof stdClass) {
+    if ($value instanceof stdClass) {
         return "new stdClass()";
     }
-    if ($container instanceof B) {
+    if ($value instanceof B) {
         return "new B()";
     }
-    if ($container instanceof A) {
+    if ($value instanceof A) {
         return "new A()";
     }
-    if ($container instanceof ArrayObject) {
+    if ($value instanceof ArrayObject) {
         return "new ArrayObject()";
     }
-    return var_export($container, true);
-}
-function makeOffset($offset) {
-    if ($offset === PHP_INT_MIN) {
-        return "PHP_INT_MIN";
-    }
-    if ($offset === PHP_INT_MAX) {
-        return "PHP_INT_MAX";
-    }
-    if (is_array($offset)) {
-        return "[]";
-    }
-    return var_export($offset, true);
+    return var_export($value, true);
 }
 
 /* Taken from run-tests.php */