Separate test for C variables

Author: KapitanOczywisty

ext/ffi/tests/gh11934.phpt

@@ -135,25 +135,6 @@ $target[0] = $source;
 
 var_dump($target[0]);
 
-echo "--- Existing C variables ---\n";
-
-if (PHP_OS_FAMILY === 'Linux') {
-    $ffi = FFI::cdef(
-        "int errno;",
-        "libc.so.6"
-    );
-    $ffi->errno = 0;
-    var_dump($ffi->errno);
-    $source = $ffi->new('int');
-    $source->cdata = 31;
-    $ffi->errno = $source;
-    var_dump($ffi->errno);
-} else {
-    // Untested on non-Linux due to lack of libc.so.6
-    var_dump(0);
-    var_dump(31);
-}
-
 ?>
 --EXPECTF--
 --- Primitive types ---
@@ -206,6 +187,3 @@ int(42)
 int(123)
 --- Array element ---
 int(123)
---- Existing C variables ---
-int(0)
-int(31)

ext/ffi/tests/gh11934b.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Feature GH-11934 (Allow to pass CData into C variables)
+--EXTENSIONS--
+ffi
+zend_test
+--FILE--
+<?php
+require_once __DIR__ . '/utils.inc';
+$header = <<<HEADER
+extern int gh11934b_ffi_var_test_cdata;
+HEADER;
+
+if (PHP_OS_FAMILY !== 'Windows') {
+    $ffi = FFI::cdef($header);
+} else {
+    try {
+        $ffi = FFI::cdef($header, 'php_zend_test.dll');
+    } catch (FFI\Exception $ex) {
+        $ffi = FFI::cdef($header, ffi_get_php_dll_name());
+    }
+}
+
+var_dump($ffi->gh11934b_ffi_var_test_cdata);
+$source = $ffi->new('int');
+$source->cdata = 31;
+$ffi->gh11934b_ffi_var_test_cdata = $source;
+var_dump($ffi->gh11934b_ffi_var_test_cdata);
+
+?>
+--EXPECT--
+int(2)
+int(31)

ext/zend_test/test.c

@@ -1108,6 +1108,8 @@ PHP_ZEND_TEST_API void bug_gh9090_void_int_char_var(int i, char *fmt, ...) {
     va_end(args);
 }
 
+PHP_ZEND_TEST_API int gh11934b_ffi_var_test_cdata = 2;
+
 #ifdef HAVE_COPY_FILE_RANGE
 /**
  * This function allows us to simulate early return of copy_file_range by setting the limit_copy_file_range ini setting.