Avoid duplicate App container creation#14548
Merged
MorrisJobke merged 3 commits intomasterfrom Mar 8, 2019
Merged
Conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Member
|
How to verify this? |
MorrisJobke
reviewed
Mar 5, 2019
| try { | ||
| $this->container = \OC::$server->getRegisteredAppContainer($appName); | ||
| } catch (QueryException $e) { | ||
| $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams); |
Member
There was a problem hiding this comment.
Doesn't the container need to be registered then in the server container to avoid it being instantiated twice again?
Member
Author
There was a problem hiding this comment.
that's what DIContainer does already.
Member
Author
|
Member
|
Ah ok so this doesn't solve the 2 constructor calls (let do that separatly). But it is quite elegant. However. it does seem like our tests are not as clean as we'd like... |
Member
|
CI failure :/ |
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
🤖 beep boop beep 🤖 Here are the logs for the failed build: Status of 16809: failureDB=mysql, ENABLE_REDIS=false, PHP=7.3Show full logDB=mysqlmb4, ENABLE_REDIS=false, PHP=7.3Show full logTESTS=integration-federation_features
Show full logTESTS=integration-sharing-v1
Show full logTESTS=acceptance, TESTS-ACCEPTANCE=app-files
Show full logTESTS=acceptance, TESTS-ACCEPTANCE=app-files-sharing-link
Show full logTESTS=acceptance, TESTS-ACCEPTANCE=login
Show full log |
MorrisJobke
approved these changes
Mar 6, 2019
Member
MorrisJobke
left a comment
MorrisJobke
left a comment
There was a problem hiding this comment.
Code looks good, tested and works 👍
|
This patch breaks the
|
|
Will this and all other relevant patches which are required to fix regressions be backported to 15 and 14? |
Member
Author
|
14 is running out of support pretty soon And as for 15, I'm not sure, since it might require work by other apps to fix stuff too. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Signed-off-by: Joas Schilling coding@schilljs.com