ProcessFinger 0.1.2

Author: nabeghe

README.md

@@ -14,7 +14,7 @@ Includes the following helpers:
 - [Levex](https://github.com/nabeghe/levex-php) <small>v1.0.1</small>
 - [Matcher](https://github.com/nabeghe/matcher-php)<small> v1.0.0</small>
 - [Mem](https://github.com/nabeghe/mem-php) <small>v1.2.0</small>
-- [ProcessFinger](https://github.com/nabeghe/process-finger-php) <small>v0.1.1</small>
+- [ProcessFinger](https://github.com/nabeghe/process-finger-php) <small>v0.1.2</small>
 - [Reflecty](https://github.com/nabeghe/reflecty-php) <small>v0.5.2</small>
 - [Servery](https://github.com/nabeghe/servery-php) <small>v0.3.0</small>
 - [Shortnum](https://github.com/nabeghe/shortnum-php) <small>v1.0.0</small>

src/ProcessFinger/ProcessFinger.php

@@ -106,28 +106,41 @@ public static function getScriptPath(?int $pid = null): ?string
         }
 
         if ($os === 'WIN') {
-            $command = "powershell -NoProfile -Command \"(Get-CimInstance Win32_Process -Filter \\\"ProcessId='$pid'\\\").CommandLine\" 2>&1";
-            $output = trim((string) shell_exec($command));
+            $command = 'powershell -NoProfile -Command '
+                . '"(Get-CimInstance Win32_Process -Filter \"ProcessId=' . $pid . '\").CommandLine" 2>&1';
 
-            if ($output === '') {
+            $commandLine = trim((string) shell_exec($command));
+            if ($commandLine === '') {
                 return null;
             }
 
-            preg_match_all('/"([^"]+)"|(\S+)/', $output, $matches);
-            $args = array_values(array_filter(array_merge($matches[1], $matches[2])));
+            // Parse Windows command line (handles quotes properly)
+            preg_match_all('/"([^"]+)"|(\S+)/u', $commandLine, $m);
+            $args = array_values(array_filter(array_merge($m[1], $m[2])));
 
-            foreach ($args as $arg) {
-                if ($arg[0] === '-') {
-                    continue;
-                }
+            // Remove php.exe
+            array_shift($args);
 
-                if (substr($arg, -4) !== '.php') {
+            // Get process working directory
+            $cwd = trim((string) shell_exec(
+                'powershell -NoProfile -Command '
+                . '"(Get-CimInstance Win32_Process -Filter \"ProcessId=' . $pid . '\").WorkingDirectory"'
+            ));
+
+            foreach ($args as $arg) {
+                if ($arg === '' || $arg[0] === '-') {
                     continue;
                 }
 
+                // Direct path
                 if (is_file($arg)) {
                     return realpath($arg);
                 }
+
+                /// Relative path
+                if ($cwd && is_file($cwd . DIRECTORY_SEPARATOR . $arg)) {
+                    return realpath($cwd . DIRECTORY_SEPARATOR . $arg);
+                }
             }
 
             return null;