[PropertyAccess] Set a NullLogger in ApcuAdapter when Apcu is disabled in CLI #24251
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
nicolas-grekas
approved these changes
Sep 19, 2017
1a8acf9 to
9f1feb0
Compare
xabbuh
approved these changes
Sep 19, 2017
stof
approved these changes
Sep 25, 2017
stof
reviewed
Sep 25, 2017
| @@ -928,7 +929,9 @@ public static function createCache($namespace, $defaultLifetime, $version, Logge | |||
| } | |||
|
|
|||
| $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version); | |||
| if (null !== $logger) { | |||
| if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) { | |||
There was a problem hiding this comment.
I suggest using a fully-qualified name for the constant, so that OPCache can exclude this branch at compile time for other SAPIs
9f1feb0 to
4a01cd8
Compare
|
Thank you @iamluc. |
nicolas-grekas
added a commit
that referenced
this pull request
Sep 26, 2017
… is disabled in CLI (iamluc) This PR was merged into the 3.3 branch. Discussion ---------- [PropertyAccess] Set a NullLogger in ApcuAdapter when Apcu is disabled in CLI | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Same check as in https://github.com/symfony/symfony/pull/23390/files#diff-a5185cd58702e8e073786794a423cb27R112 Commits ------- 4a01cd8 Set a NullLogger in ApcuAdapter when Apcu is disabled in 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.
Same check as in https://github.com/symfony/symfony/pull/23390/files#diff-a5185cd58702e8e073786794a423cb27R112