Merge pull request #7443 from brainlock/fix-proc-open-stub

fix proc_open stub for php >= 8.0
vimeo · Jan 21, 2022 · f9ea275 · f9ea275
2 parents 5c4be6b + d39ccb5
commit f9ea275
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -10291,7 +10291,7 @@
 'proc_close' => ['int', 'process'=>'resource'],
 'proc_get_status' => ['array{command: string, pid: int, running: bool, signaled: bool, stopped: bool, exitcode: int, termsig: int, stopsig: int}', 'process'=>'resource'],
 'proc_nice' => ['bool', 'priority'=>'int'],
-'proc_open' => ['resource|false', 'cmd'=>'string|array', 'descriptorspec'=>'array', '&w_pipes'=>'resource[]', 'cwd='=>'?string', 'env='=>'?array', 'other_options='=>'array'],
+'proc_open' => ['resource|false', 'command'=>'string|array', 'descriptor_spec'=>'array', '&pipes'=>'resource[]', 'cwd='=>'?string', 'env_vars='=>'?array', 'options='=>'?array'],
 'proc_terminate' => ['bool', 'process'=>'resource', 'signal='=>'int'],
 'projectionObj::__construct' => ['void', 'projectionString'=>'string'],
 'projectionObj::getUnits' => ['int'],

diff --git a/dictionaries/CallMap_74_delta.php b/dictionaries/CallMap_74_delta.php
@@ -33,8 +33,8 @@
       'new' => ['bool', 'hash'=>'string', 'algo'=>'int|string|null', 'options='=>'array'],
     ],
     'proc_open' => [
-      'old' => ['resource|false', 'command'=>'string', 'descriptorspec'=>'array', '&w_pipes'=>'resource[]', 'cwd='=>'?string', 'env='=>'?array', 'other_options='=>'array'],
-      'new' => ['resource|false', 'cmd'=>'string|array', 'descriptorspec'=>'array', '&w_pipes'=>'resource[]', 'cwd='=>'?string', 'env='=>'?array', 'other_options='=>'array'],
+      'old' => ['resource|false', 'command'=>'string', 'descriptor_spec'=>'array', '&pipes'=>'resource[]', 'cwd='=>'?string', 'env_vars='=>'?array', 'options='=>'?array'],
+      'new' => ['resource|false', 'command'=>'string|array', 'descriptor_spec'=>'array', '&pipes'=>'resource[]', 'cwd='=>'?string', 'env_vars='=>'?array', 'options='=>'?array'],
     ],
   ],
   'removed' => [

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -14473,7 +14473,7 @@
     'proc_close' => ['int', 'process'=>'resource'],
     'proc_get_status' => ['array{command: string, pid: int, running: bool, signaled: bool, stopped: bool, exitcode: int, termsig: int, stopsig: int}|false', 'process'=>'resource'],
     'proc_nice' => ['bool', 'priority'=>'int'],
-    'proc_open' => ['resource|false', 'command'=>'string', 'descriptorspec'=>'array', '&w_pipes'=>'resource[]', 'cwd='=>'?string', 'env='=>'?array', 'other_options='=>'array'],
+    'proc_open' => ['resource|false', 'command'=>'string', 'descriptor_spec'=>'array', '&pipes'=>'resource[]', 'cwd='=>'?string', 'env_vars='=>'?array', 'options='=>'?array'],
     'proc_terminate' => ['bool', 'process'=>'resource', 'signal='=>'int'],
     'projectionObj::__construct' => ['void', 'projectionString'=>'string'],
     'projectionObj::getUnits' => ['int'],

diff --git a/tests/CoreStubsTest.php b/tests/CoreStubsTest.php
@@ -18,5 +18,20 @@ public function providerValidCodeParse(): iterable
 
             new RecursiveArrayIterator([], RecursiveArrayIterator::CHILD_ARRAYS_ONLY);'
         ];
+        yield 'proc_open() named arguments' => [
+            '<?php
+
+            proc_open(
+                command: "ls",
+                descriptor_spec: [],
+                pipes: $pipes,
+                cwd: null,
+                env_vars: null,
+                options: null
+            );',
+            'assertions' => [],
+            'error_levels' => [],
+            'php_version' => '8.0',
+        ];
     }
 }