Don’t compile when Opcache is not enabled on CLI #20883
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -109,15 +109,28 @@ protected function doSave(array $values, $lifetime) | |||
| $value = serialize($value); | |||
| } | |||
| } elseif (!is_scalar($value)) { | |||
| throw new InvalidArgumentException(sprintf('Value of type "%s" is not serializable', $key, gettype($value))); | |||
| throw new InvalidArgumentException(sprintf('Value of type "%s" is not serializable', gettype($value))); | |||
There was a problem hiding this comment.
Borrowed from PhpArrayAdapter:
throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
| */ | ||
| private function compileFile($file) | ||
| { | ||
| if ('cli' === php_sapi_name() && !ini_get('opcache.enable_cli')) { |
There was a problem hiding this comment.
Use PHP_SAPI constant instead
| /** | ||
| * @param string $file | ||
| */ | ||
| private function compileFile($file) |
There was a problem hiding this comment.
Not sure the extra method is worth it.
sstok
reviewed
Dec 13, 2016
| */ | ||
| private function compileFile($file) | ||
| { | ||
| if ('cli' === php_sapi_name() && !ini_get('opcache.enable_cli')) { |
There was a problem hiding this comment.
This can be changed to an or-case with the @opcache_compile_file($file);
if ('cli' === PHP_SAPI || !ini_get('opcache.enable_cli')) {
@opcache_compile_file($file);
}There was a problem hiding this comment.
I just typed these lines, haha :)
cd47130 to
508a876
Compare
|
Thank you @ruudk. |
fabpot
added a commit
that referenced
this pull request
Dec 13, 2016
This PR was squashed before being merged into the 3.2 branch (closes #20883). Discussion ---------- Don’t compile when Opcache is not enabled on CLI | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20878 | License | MIT This should fix #20878 "Zend OPcache seems to be disabled, can't compile file" when Opcache is enabled, but `opcache.enable_cli` is turned off. Commits ------- 5222643 Don’t compile when Opcache is not enabled on CLI
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should fix #20878 "Zend OPcache seems to be disabled, can't compile file" when Opcache is enabled, but
opcache.enable_cliis turned off.