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

Properly encapsulate require_once for app.php #8372

Merged
merged 2 commits into from
Feb 15, 2018

Conversation

juliushaertl
Copy link
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.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
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.

I had exactly this just minutes ago :)

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 15, 2018
@@ -133,6 +133,7 @@ public static function loadApps($types = null) {
* load a single app
*
* @param string $app
* @throws Exception
Copy link
Member

Choose a reason for hiding this comment

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

This should be added to requireAppFile 😉

Copy link
Member Author

Choose a reason for hiding this comment

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

Added an annotation for Error to requireAppFile, but Exception can be thrown by loadApps though self::disable

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

codecov bot commented Feb 15, 2018

Codecov Report

Merging #8372 into master will decrease coverage by 0.06%.
The diff coverage is 33.33%.

@@             Coverage Diff              @@
##             master    #8372      +/-   ##
============================================
- Coverage     51.76%   51.69%   -0.07%     
  Complexity    25395    25395              
============================================
  Files          1599     1599              
  Lines         95110    95111       +1     
  Branches       1376     1376              
============================================
- Hits          49232    49166      -66     
- Misses        45878    45945      +67
Impacted Files Coverage Δ Complexity Δ
lib/private/legacy/app.php 55.9% <33.33%> (ø) 207 <0> (ø) ⬇️
lib/private/Files/ObjectStore/Swift.php 0% <0%> (-49.62%) 45% <0%> (ø)
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
settings/templates/settings/personal/security.php 0% <0%> (ø) 0% <0%> (ø) ⬇️

@juliushaertl
Copy link
Member Author

stable12 #8632
stable13 #8631

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug technical debt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants