Add empty array as offset in tests

Author: Girgias

Zend/tests/offsets/array_container_offset_behaviour.phpt

@@ -78,9 +78,13 @@ empty():
 Cannot access offset of type %s in isset or empty
 Coalesce():
 Cannot access offset of type %s on array
+unset():
+Cannot unset offset of type %s on array
 
 OUTPUT;
 
+$EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT_INVALID_OFFSETS) . '$/s';
+
 ob_start();
 foreach ($offsets as $dimension) {
     $container = [];
@@ -97,7 +101,7 @@ foreach ($offsets as $dimension) {
 
     if (
         !preg_match($EXPECTED_OUTPUT_VALID_OFFSETS_REGEX, $varOutput)
-        && $varOutput !== EXPECTED_OUTPUT_INVALID_OFFSETS
+        && !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
     ) {
         file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_array_container_{$failuresNb}.txt", $varOutput);

Zend/tests/offsets/false_container_offset_behaviour.phpt

@@ -83,10 +83,12 @@ Cannot access offset of type %s in isset or empty
 Coalesce():
 Cannot access offset of type %s on array
 unset():
-Cannot unset offset in a non-array variable
+Cannot unset offset of type %s on array
 
 OUTPUT;
 
+$EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT_INVALID_OFFSETS) . '$/s';
+
 ob_start();
 foreach ($offsets as $dimension) {
     $container = false;
@@ -103,7 +105,7 @@ foreach ($offsets as $dimension) {
 
     if (
         $varOutput !== EXPECTED_OUTPUT_VALID_OFFSETS
-        && $varOutput !== EXPECTED_OUTPUT_INVALID_OFFSETS
+        && !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
     ) {
         file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_false_container_{$failuresNb}.txt", $varOutput);

Zend/tests/offsets/null_container_offset_behaviour.phpt

@@ -77,9 +77,12 @@ Cannot access offset of type %s in isset or empty
 Coalesce():
 Cannot access offset of type %s on array
 unset():
+Cannot unset offset of type %s on array
 
 OUTPUT;
 
+$EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT_INVALID_OFFSETS) . '$/s';
+
 ob_start();
 foreach ($offsets as $dimension) {
     $container = null;
@@ -96,7 +99,7 @@ foreach ($offsets as $dimension) {
 
     if (
         $varOutput !== EXPECTED_OUTPUT_VALID_OFFSETS
-        && $varOutput !== EXPECTED_OUTPUT_INVALID_OFFSETS
+        && !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
     ) {
         file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_null_container_{$failuresNb}.txt", $varOutput);

Zend/tests/offsets/test_offset_helpers.inc

@@ -40,6 +40,9 @@ function makeOffset($offset) {
     if ($offset === PHP_INT_MAX) {
         return "PHP_INT_MAX";
     }
+    if (is_array($offset)) {
+        return "[]";
+    }
     return var_export($offset, true);
 }
 
@@ -162,6 +165,7 @@ $offsets = [
     '-17.0',
     (string) PHP_INT_MAX * 2,
     (string) PHP_INT_MIN * 2,
+    [],
 ];
 
 $failures = [];