Let disable-extension also disable zend extensions

nicelocal · Jan 17, 2024 · aa40383 · aa40383
1 parent d2c3f89
commit aa40383
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php
@@ -896,6 +896,10 @@ private static function restart(array $options, int $threads, Progress $progress
             'blackfire',
         ]);
 
+        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+            $ini_handler->disableExtensions(['opcache', 'Zend OPcache']);
+        }
+
         // If Xdebug is enabled, restart without it
         $ini_handler->check();
 

diff --git a/src/Psalm/Internal/Fork/PsalmRestarter.php b/src/Psalm/Internal/Fork/PsalmRestarter.php
@@ -141,7 +141,7 @@ private static function toBytes(string $value): int
     protected function restart($command): void
     {
         if ($this->required && $this->tmpIni) {
-            $regex = '/^\s*(extension\s*=.*(' . implode('|', $this->disabled_extensions) . ').*)$/mi';
+            $regex = '/^\s*((?:zend_)?extension\s*=.*(' . implode('|', $this->disabled_extensions) . ').*)$/mi';
             $content = file_get_contents($this->tmpIni);
             assert($content !== false);