Merge branch 'issues/3144' of https://github.com/morozov/php-code-sniffer

Author: gsherwood

src/Runner.php

@@ -460,10 +460,7 @@ private function run()
                 if ($pid === -1) {
                     throw new RuntimeException('Failed to create child process');
                 } else if ($pid !== 0) {
-                    $childProcs[] = [
-                        'pid' => $pid,
-                        'out' => $childOutFilename,
-                    ];
+                    $childProcs[$pid] = $childOutFilename;
                 } else {
                     // Move forward to the start of the batch.
                     $todo->rewind();
@@ -536,7 +533,7 @@ private function run()
 
                     $output .= ";\n?".'>';
                     file_put_contents($childOutFilename, $output);
-                    exit($pid);
+                    exit();
                 }//end if
             }//end for
 
@@ -719,54 +716,53 @@ private function processChildProcs($childProcs)
         $success = true;
 
         while (count($childProcs) > 0) {
-            foreach ($childProcs as $key => $procData) {
-                $res = pcntl_waitpid($procData['pid'], $status, WNOHANG);
-                if ($res === $procData['pid']) {
-                    if (file_exists($procData['out']) === true) {
-                        include $procData['out'];
-
-                        unlink($procData['out']);
-                        unset($childProcs[$key]);
-
-                        $numProcessed++;
-
-                        if (isset($childOutput) === false) {
-                            // The child process died, so the run has failed.
-                            $file = new DummyFile('', $this->ruleset, $this->config);
-                            $file->setErrorCounts(1, 0, 0, 0);
-                            $this->printProgress($file, $totalBatches, $numProcessed);
-                            $success = false;
-                            continue;
-                        }
-
-                        $this->reporter->totalFiles    += $childOutput['totalFiles'];
-                        $this->reporter->totalErrors   += $childOutput['totalErrors'];
-                        $this->reporter->totalWarnings += $childOutput['totalWarnings'];
-                        $this->reporter->totalFixable  += $childOutput['totalFixable'];
-                        $this->reporter->totalFixed    += $childOutput['totalFixed'];
+            $pid = pcntl_waitpid(0, $status);
+            if ($pid > 0) {
+                $out = $childProcs[$pid];
+                unset($childProcs[$pid]);
+                if (file_exists($out) === true) {
+                    include $out;
 
-                        if (isset($debugOutput) === true) {
-                            echo $debugOutput;
-                        }
+                    unlink($out);
 
-                        if (isset($childCache) === true) {
-                            foreach ($childCache as $path => $cache) {
-                                Cache::set($path, $cache);
-                            }
-                        }
+                    $numProcessed++;
 
-                        // Fake a processed file so we can print progress output for the batch.
+                    if (isset($childOutput) === false) {
+                        // The child process died, so the run has failed.
                         $file = new DummyFile('', $this->ruleset, $this->config);
-                        $file->setErrorCounts(
-                            $childOutput['totalErrors'],
-                            $childOutput['totalWarnings'],
-                            $childOutput['totalFixable'],
-                            $childOutput['totalFixed']
-                        );
+                        $file->setErrorCounts(1, 0, 0, 0);
                         $this->printProgress($file, $totalBatches, $numProcessed);
-                    }//end if
+                        $success = false;
+                        continue;
+                    }
+
+                    $this->reporter->totalFiles    += $childOutput['totalFiles'];
+                    $this->reporter->totalErrors   += $childOutput['totalErrors'];
+                    $this->reporter->totalWarnings += $childOutput['totalWarnings'];
+                    $this->reporter->totalFixable  += $childOutput['totalFixable'];
+                    $this->reporter->totalFixed    += $childOutput['totalFixed'];
+
+                    if (isset($debugOutput) === true) {
+                        echo $debugOutput;
+                    }
+
+                    if (isset($childCache) === true) {
+                        foreach ($childCache as $path => $cache) {
+                            Cache::set($path, $cache);
+                        }
+                    }
+
+                    // Fake a processed file so we can print progress output for the batch.
+                    $file = new DummyFile('', $this->ruleset, $this->config);
+                    $file->setErrorCounts(
+                        $childOutput['totalErrors'],
+                        $childOutput['totalWarnings'],
+                        $childOutput['totalFixable'],
+                        $childOutput['totalFixed']
+                    );
+                    $this->printProgress($file, $totalBatches, $numProcessed);
                 }//end if
-            }//end foreach
+            }//end if
         }//end while
 
         return $success;