Skip to content
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.

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

Only enforce schema limits for supported apps #10555

Merged
merged 3 commits into from
Jan 3, 2019

Conversation

nickvergessen
Copy link
Member

Fix #10518

$infoParser = new InfoParser();
$info = $infoParser->parse($appPath . '/appinfo/info.xml');
if (!isset($info['dependencies']['database'])) {
$this->checkOracle = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so by default we check always check oracle?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah if the author did not define a db, you can install it on any. It a db is given the dependency check ensures it. So that mathes the logic here

@rullzer rullzer added this to the Nextcloud 15 milestone Aug 8, 2018
@rullzer
Copy link
Member

rullzer commented Aug 8, 2018

Lets do this properly for 15

@MorrisJobke
Copy link
Member

@nickvergessen Could you please rebase to fix the conflict?

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Oct 2, 2018
@nickvergessen
Copy link
Member Author

nickvergessen commented Oct 8, 2018

Done, the "conflict" was f5c63d7

@nickvergessen nickvergessen force-pushed the bugfix/10518/only-check-added-items branch from bba82f1 to 9af5d4c Compare October 8, 2018 10:58
@nickvergessen nickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 8, 2018
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works with shipped apps 👍

@MorrisJobke
Copy link
Member

Looks like some tests fail 🙈

@nickvergessen nickvergessen force-pushed the bugfix/10518/only-check-added-items branch from 9af5d4c to cc1253a Compare October 10, 2018 08:45
@MorrisJobke
Copy link
Member

Looks like some tests fail 🙈

Resolved.

@MorrisJobke
Copy link
Member

@rullzer @danielkesselberg @blizzz Mind to review this one?

@MorrisJobke
Copy link
Member

@nickvergessen @rullzer Should we do this now or wait for 16?

@MorrisJobke MorrisJobke mentioned this pull request Nov 7, 2018
29 tasks
@nickvergessen
Copy link
Member Author

I'm always in favor of it. but well I manually cross check that oracle still works via the notifications tests…

@MorrisJobke MorrisJobke mentioned this pull request Nov 8, 2018
24 tasks
@MorrisJobke
Copy link
Member

Let's move it to 16 and merge it early this time.

@nickvergessen
Copy link
Member Author

#12446 🙈

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/10518/only-check-added-items branch from cc1253a to 85a0e10 Compare December 17, 2018 12:52
@nickvergessen
Copy link
Member Author

Rebased to re-execuite the tests, please merge soonish

@blizzz blizzz merged commit 6895230 into master Jan 3, 2019
@blizzz blizzz deleted the bugfix/10518/only-check-added-items branch January 3, 2019 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants