Engine: Make second parameter mandatory (Fix open_basedir restriction) #5
Conversation
This file contains 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
Machy8
reviewed
Mar 12, 2018
| @@ -91,16 +91,12 @@ private function setupWebLoader() | |||
| { | |||
| $webLoader = $this->builder->addDefinition($this->prefix(self::ENGINE_PREFIX)) | |||
| ->setFactory(self::ENGINE_CLASSNAME) | |||
| ->setArguments([$this->config['outputDir']]); | |||
| ->setArguments([$this->config['outputDir'], $this->config['documentRoot']]); | |||
There was a problem hiding this comment.
Thank you for the pull request!
I think that this change don't need to be a BC break. If the condition from below would be used here, then the parameter could still be optional. Could you please try it on your project where it cause problems? If it works, then the other changes could be reverted.
$arguments = [$this->config['outputDir']];
if ($this->config['documentRoot']) {
$arguments[] = $this->config['documentRoot'];
}
$webLoader = $this->builder->addDefinition($this->prefix(self::ENGINE_PREFIX))
->setFactory(self::ENGINE_CLASSNAME)
->setArguments($arguments);
|
@Machy8 Done without BC break. |
|
@RiKap thanks! Released https://github.com/Machy8/webloader/releases/tag/v1.1.2. |
RiKap
changed the title
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.
Hi @Machy8
If server is using
open_basedirrestrictions it is not working.Main problem is default value of $documentRoot in Engine. Because it is root of server. Function
setDocumentRoot()in Compiler will try check if given value/is directory, but it fails because ofopen_basedirrestrictions.After these changes it is OK. But it is BC break because $documentRoot is now mandatory.