Merge pull request #10614 from weirdan/fix-json-mapping-with-opcache.save_comments-0

weirdan · web-flow · commit e02276a17fbf · 2024-01-30T00:06:11.000-04:00
diff --git a/src/Psalm/Internal/Fork/PsalmRestarter.php b/src/Psalm/Internal/Fork/PsalmRestarter.php
@@ -84,6 +84,11 @@ protected function requiresRestart($default): bool
             }
         }
 
+        // opcache.save_comments is required for json mapper (used in language server) to work
+        if ($opcache_loaded && in_array(ini_get('opcache.save_comments'), ['0', 'false', 0, false])) {
+            return true;
+        }
+
         return $default || $this->required;
     }
 
@@ -152,6 +157,10 @@ protected function restart($command): void
             ];
         }
 
+        if ($opcache_loaded) {
+            $additional_options[] = '-dopcache.save_comments=1';
+        }
+
         array_splice(
             $command,
             1,

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,11 @@ protected function requiresRestart($default): bool`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
	`87`	`+ // opcache.save_comments is required for json mapper (used in language server) to work`
	`88`	`+ if ($opcache_loaded && in_array(ini_get('opcache.save_comments'), ['0', 'false', 0, false])) {`
	`89`	`+ return true;`
	`90`	`+ }`
	`91`	`+`
`87`	`92`	`return $default \|\| $this->required;`
`88`	`93`	`}`
`89`	`94`
`@@ -152,6 +157,10 @@ protected function restart($command): void`
`152`	`157`	`];`
`153`	`158`	`}`
`154`	`159`
	`160`	`+ if ($opcache_loaded) {`
	`161`	`+ $additional_options[] = '-dopcache.save_comments=1';`
	`162`	`+ }`
	`163`	`+`
`155`	`164`	`array_splice(`
`156`	`165`	`$command,`
`157`	`166`	`1,`