Got rid of some IF nesting by continuing early (ref #3519)

Author: gsherwood

src/Runner.php

@@ -717,52 +717,55 @@ private function processChildProcs($childProcs)
 
         while (count($childProcs) > 0) {
             $pid = pcntl_waitpid(0, $status);
-            if ($pid > 0) {
-                $out = $childProcs[$pid];
-                unset($childProcs[$pid]);
-                if (file_exists($out) === true) {
-                    include $out;
-
-                    unlink($out);
-
-                    $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;
-                    }
+            if ($pid <= 0) {
+                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'];
+            $out = $childProcs[$pid];
+            unset($childProcs[$pid]);
+            if (file_exists($out) === false) {
+                continue;
+            }
 
-                    if (isset($debugOutput) === true) {
-                        echo $debugOutput;
-                    }
+            include $out;
+            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.
-                    $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 if
+            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'];
+
+            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 while
 
         return $success;