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

If cronErros is empty json_decode will return NULL #9920

Merged
merged 2 commits into from
Jun 19, 2018

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Jun 19, 2018

Fixes #9867

Signed-off-by: Roeland Jago Douma [email protected]

Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

❤️ 💃

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 👍

@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 Jun 19, 2018
Signed-off-by: Morris Jobke <[email protected]>
@MorrisJobke
Copy link
Member

I added some fixes for the tests.

@codecov
Copy link

codecov bot commented Jun 19, 2018

Codecov Report

Merging #9920 into master will decrease coverage by 17.09%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master    #9920      +/-   ##
============================================
- Coverage     52.08%   34.99%   -17.1%     
- Complexity    25902    25904       +2     
============================================
  Files          1642     1642              
  Lines         95879    95884       +5     
  Branches       1318     1318              
============================================
- Hits          49942    33550   -16392     
- Misses        45937    62334   +16397
Impacted Files Coverage Δ Complexity Δ
settings/Controller/CheckSetupController.php 5.22% <0%> (-52.16%) 76 <2> (+2)
core/Command/Background/Cron.php 0% <0%> (-100%) 1% <0%> (ø)
lib/private/App/AppStore/Bundles/Bundle.php 0% <0%> (-100%) 2% <0%> (ø)
...pFramework/Db/MultipleObjectsReturnedException.php 0% <0%> (-100%) 1% <0%> (ø)
lib/public/RichObjectStrings/Definitions.php 0% <0%> (-100%) 2% <0%> (ø)
apps/dav/lib/Files/Sharing/FilesDropPlugin.php 0% <0%> (-100%) 6% <0%> (ø)
apps/files/lib/Activity/Settings/FileRestored.php 0% <0%> (-100%) 8% <0%> (ø)
...te/Authentication/Token/DefaultTokenCleanupJob.php 0% <0%> (-100%) 1% <0%> (ø)
...s/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php 0% <0%> (-100%) 7% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Setting/Event.php 0% <0%> (-100%) 8% <0%> (ø)
... and 533 more

@MorrisJobke
Copy link
Member

CI failure is a hiccup -> merging.

@MorrisJobke MorrisJobke merged commit 0cf0ef0 into master Jun 19, 2018
@MorrisJobke MorrisJobke deleted the fix/9867/fix_setup_check branch June 19, 2018 16:16
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 enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants