Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vimeo/psalm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.7.0
Choose a base ref
...
head repository: vimeo/psalm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.7.1
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 19, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    weirdan Bruce Weirdan
    Copy the full SHA
    5df21fe View commit details
  2. Merge pull request #9342 from danog/fix_9340

    Always use 0x7FFEBFFF opcache optimization level (fixes #9340)
    weirdan authored Feb 19, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fbef36a View commit details

Commits on Feb 20, 2023

  1. Fix PsalmRestarter::restart() signature

    XdebugHandler v2 did not have the param type hint
    
    Fixes #9345
    weirdan committed Feb 20, 2023
    Copy the full SHA
    1b0f322 View commit details
  2. Copy the full SHA
    8e0fd88 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 src/Psalm/Internal/Fork/PsalmRestarter.php
8 changes: 7 additions & 1 deletion src/Psalm/Internal/Fork/PsalmRestarter.php
Original file line number Diff line number Diff line change
@@ -66,6 +66,10 @@ protected function requiresRestart($default): bool
if (((int) ini_get('opcache.jit')) === 0) {
return true;
}

if (ini_get('opcache.optimization_level') !== '0x7FFEBFFF') {
return true;
}
}

return $default || $this->required;
@@ -75,8 +79,9 @@ protected function requiresRestart($default): bool
* No type hint to allow xdebug-handler v1 and v2 usage
*
* @param string[] $command
* @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
*/
protected function restart(array $command): void
protected function restart($command): void
{
if ($this->required && $this->tmpIni) {
$regex = '/^\s*(extension\s*=.*(' . implode('|', $this->disabled_extensions) . ').*)$/mi';
@@ -98,6 +103,7 @@ protected function restart(array $command): void
'-dopcache.enable_cli=true',
'-dopcache.jit_buffer_size=512M',
'-dopcache.jit=1205',
'-dopcache.optimization_level=0x7FFEBFFF',
];
}