8000 Don’t compile when Opcache is not enabled on CLI by ruudk · Pull Request #20883 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Don’t compile when Opcache is not enabled on CLI #20883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Don’t compile when Opcache is not enabled on CLI #20883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403f5ce
Fix incorrect argument for InvalidArgumentException
ruudk Dec 12, 2016
508a876
Don’t compile when opcache is not enabled on CLI
ruudk Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected function doSave(array $values, $lifetime)
$ok = true;
$data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');

foreach ($values as $id => $value) {
foreach ($values as $key => $value) {
if (null === $value || is_object($value)) {
$value = serialize($value);
} elseif (is_array($value)) {
Expand All @@ -109,13 +109,16 @@ 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('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
}

$data[1] = $value;
$file = $this->getFile($id, true);
$file = $this->getFile($key, true);
$ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;
@opcache_compile_file($file);

if ('cli' !== PHP_SAPI || ini_get('opcache.enable_cli')) {
@opcache_compile_file($file);
}
}

return $ok;
Expand Down
0