Fix infinite reload after tracked file changed (php-pm#400)

Prophet777 · andig · commit 7291118bfa0f · 2018-07-14T20:54:20.000+02:00
diff --git a/src/ProcessManager.php b/src/ProcessManager.php
@@ -875,7 +875,15 @@ protected function checkChangedFiles($restartSlaves = true)
                 continue;
             }
 
-            if ($knownMTime !== filemtime($filePath) && $this->filesLastMd5[$filePath] !== md5_file($filePath, true)) {
+            $actualFileTime = filemtime($filePath);
+            $actualFileHash = md5_file($filePath);
+
+            if ($knownMTime !== $actualFileTime && $this->filesLastMd5[$filePath] !== $actualFileHash) {
+
+                // update tracked entry metadata
+                $this->filesLastMd5[$filePath] = $actualFileHash;
+                $this->filesLastMTime[$filePath] = $actualFileTime;
+
                 $this->output->writeln(
                     sprintf("<info>[%s] File %s has changed.</info>", date('d/M/Y:H:i:s O'), $filePath)
                 );
@@ -1030,7 +1038,7 @@ public function closeSlaves($graceful = false, $onSlaveClosed = null)
                 $onSlaveClosed($slave);
             }
         }
-        
+
         if ($this->reloadTimeoutTimer !== null) {
             $this->reloadTimeoutTimer->cancel();
         }

Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,15 @@ protected function checkChangedFiles($restartSlaves = true)`
`875`	`875`	`continue;`
`876`	`876`	`}`
`877`	`877`
`878`		`- if ($knownMTime !== filemtime($filePath) && $this->filesLastMd5[$filePath] !== md5_file($filePath, true)) {`
	`878`	`+ $actualFileTime = filemtime($filePath);`
	`879`	`+ $actualFileHash = md5_file($filePath);`
	`880`	`+`
	`881`	`+ if ($knownMTime !== $actualFileTime && $this->filesLastMd5[$filePath] !== $actualFileHash) {`
	`882`	`+`
	`883`	`+ // update tracked entry metadata`
	`884`	`+ $this->filesLastMd5[$filePath] = $actualFileHash;`
	`885`	`+ $this->filesLastMTime[$filePath] = $actualFileTime;`
	`886`	`+`
`879`	`887`	`$this->output->writeln(`
`880`	`888`	`sprintf("<info>[%s] File %s has changed.</info>", date('d/M/Y:H:i:s O'), $filePath)`
`881`	`889`	`);`
`@@ -1030,7 +1038,7 @@ public function closeSlaves($graceful = false, $onSlaveClosed = null)`
`1030`	`1038`	`$onSlaveClosed($slave);`
`1031`	`1039`	`}`
`1032`	`1040`	`}`
`1033`		`-`
	`1041`	`+`
`1034`	`1042`	`if ($this->reloadTimeoutTimer !== null) {`
`1035`	`1043`	`$this->reloadTimeoutTimer->cancel();`
`1036`	`1044`	`}`