Skip to content

[12] Properly encapsulate require_once for app.php - #8632

Merged
nickvergessen merged 2 commits into
stable12from
stable12-8372
Mar 5, 2018
Merged

[12] Properly encapsulate require_once for app.php#8632
nickvergessen merged 2 commits into
stable12from
stable12-8372

Conversation

@juliusknorr

Copy link
Copy Markdown
Member

If an app has an appinfo/app.php file, that includes a variable called $app, this would lead to a type error when calling getAppInfo otherwise.

Backport of #8372

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@codecov

codecovBot commented Mar 2, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8632 into stable12 will increase coverage by <.01%.
The diff coverage is 33.33%.

@@ Coverage Diff @@## stable12 #8632 +/- ##
==============================================
+ Coverage 53.92% 53.92% +<.01% 
Complexity 22764 22764 ==============================================
Files 1387 1387 Lines 87251 87251 Branches 1331 1331 ==============================================
+ Hits 47050 47051 +1 + Misses 40201 40200 -1
Impacted FilesCoverage ΔComplexity Δ
lib/private/legacy/app.php52.8% <33.33%> (ø)219 <0> (ø)⬇️
lib/private/Server.php84.68% <0%> (-0.13%)121% <0%> (ø)
core/js/js.js61.94% <0%> (+0.11%)0% <0%> (ø)⬇️
lib/private/Security/CertificateManager.php92.07% <0%> (+0.99%)39% <0%> (ø)⬇️

* load a single app
*
* @param string $app
* @throws Exception

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this still true?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes. This is another exception outside of this try catch.

@nickvergessen
nickvergessen merged commit af8d300 into stable12Mar 5, 2018
@MorrisJobke
MorrisJobke deleted the stable12-8372 branch March 5, 2018 13:22
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
2 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugtechnical debt🧱 🤔🚀

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@juliusknorr@rullzer@nickvergessen@MorrisJobke