X Tutup
Skip to content

[stable10] Have a real controller handling cron requests#34932

Merged
DeepDiver1975 merged 3 commits intostable10from
stable10-tech-dept/json.php
Jul 4, 2019
Merged

[stable10] Have a real controller handling cron requests#34932
DeepDiver1975 merged 3 commits intostable10from
stable10-tech-dept/json.php

Conversation

@phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Mar 29, 2019

Backport #31914

The last commit removes some PHP7.1-only : void return declarations so that the unit tests pass here in stable10 with PHP 7.0.

Note: since the PR in master, cron.php was modified by PR #32404 - that PR changed some exception logging https://github.com/owncloud/core/pull/32404/files

I did not see where to apply a similar "fix" to this new code with CronController. I think there is nothing needed. But someone please confirm that while reviewing. - see comment below, this is OK.

@PVince81
Copy link
Contributor

PVince81 commented Apr 1, 2019

the logger change was needed only because cron.php was what I call a "naked PHP file".

now that the logic is streamlined within the app framework, exceptions should already be properly caught there, so no need to add this change

@phil-davis ready for review then ?

@phil-davis phil-davis force-pushed the stable10-tech-dept/json.php branch from e0a536b to a351f5c Compare April 1, 2019 13:50
@codecov
Copy link

codecov bot commented Apr 1, 2019

Codecov Report

Merging #34932 into stable10 will increase coverage by 0.08%.
The diff coverage is 74.07%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34932      +/-   ##
==============================================
+ Coverage       64.21%    64.3%   +0.08%     
- Complexity      19908    19924      +16     
==============================================
  Files            1277     1279       +2     
  Lines           76365    76284      -81     
  Branches         1292     1292              
==============================================
+ Hits            49036    49052      +16     
+ Misses          26950    26853      -97     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.47% <74.07%> (+0.09%) 19924 <19> (+16) ⬆️
Impacted Files Coverage Δ Complexity Δ
...rivate/AppFramework/Routing/RouteActionHandler.php 66.66% <ø> (ø) 2 <0> (ø) ⬇️
core/routes.php 65.51% <ø> (ø) 0 <0> (ø) ⬇️
cron.php 0% <0%> (ø) 0 <0> (ø) ⬇️
core/register_command.php 0% <0%> (ø) 0 <0> (ø) ⬇️
core/Application.php 39.23% <25%> (-0.94%) 25 <1> (+1)
core/Command/System/Cron.php 87.23% <87.23%> (ø) 12 <12> (?)
core/Controller/CronController.php 94.44% <94.44%> (ø) 6 <6> (?)
lib/private/Files/Config/CachedMountInfo.php 65% <0%> (-7.23%) 7% <0%> (+1%)
lib/private/Repair/RepairUnmergedShares.php 30% <0%> (-2.26%) 41% <0%> (ø)
apps/files/lib/AppInfo/Application.php 39.02% <0%> (-1.46%) 7% <0%> (ø)
... and 42 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cf50c62...a351f5c. Read the comment docs.

@codecov
Copy link

codecov bot commented Apr 1, 2019

Codecov Report

Merging #34932 into stable10 will increase coverage by 0.07%.
The diff coverage is 74.07%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34932      +/-   ##
==============================================
+ Coverage       64.94%   65.02%   +0.07%     
- Complexity      20260    20279      +19     
==============================================
  Files            1300     1302       +2     
  Lines           77346    77353       +7     
  Branches         1301     1301              
==============================================
+ Hits            50236    50296      +60     
+ Misses          26725    26672      -53     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.19% <74.07%> (+0.07%) 20279 <19> (+19) ⬆️
Impacted Files Coverage Δ Complexity Δ
...rivate/AppFramework/Routing/RouteActionHandler.php 66.66% <ø> (ø) 2 <0> (ø) ⬇️
core/routes.php 65.51% <ø> (ø) 0 <0> (ø) ⬇️
cron.php 0% <0%> (ø) 0 <0> (ø) ⬇️
core/register_command.php 0% <0%> (ø) 0 <0> (ø) ⬇️
core/Application.php 39.23% <25%> (-0.94%) 25 <1> (+1)
core/Command/System/Cron.php 87.23% <87.23%> (ø) 12 <12> (?)
core/Controller/CronController.php 94.44% <94.44%> (ø) 6 <6> (?)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7b0db6...64b1887. Read the comment docs.

@phil-davis
Copy link
Contributor Author

Rebased to get a new run of CI and investigate why some unit tests are failing.

@phil-davis phil-davis force-pushed the stable10-tech-dept/json.php branch from a351f5c to e8820ca Compare April 3, 2019 08:20
@phil-davis phil-davis force-pushed the stable10-tech-dept/json.php branch from e8820ca to 061b04b Compare June 11, 2019 05:19
@phil-davis phil-davis force-pushed the stable10-tech-dept/json.php branch from 061b04b to 26651a3 Compare June 24, 2019 03:18
@phil-davis phil-davis force-pushed the stable10-tech-dept/json.php branch from 26651a3 to df7fc1b Compare July 4, 2019 05:46
@phil-davis phil-davis force-pushed the stable10-tech-dept/json.php branch from 3c34330 to 64b1887 Compare July 4, 2019 07:43
@phil-davis phil-davis marked this pull request as ready for review July 4, 2019 08:55
@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 4, 2019

@DeepDiver1975 @PVince81 I'm not sure why I left this here so long. It works fine, just needed that last commit to remove the PHP7.1+ : void code so that unit tests pass on PHP 7.0

This is another bit of crud to get stable10 closer to master

Ready for review.

@DeepDiver1975 DeepDiver1975 merged commit e0bf50f into stable10 Jul 4, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-tech-dept/json.php branch July 4, 2019 15:08
@davitol davitol mentioned this pull request Sep 3, 2019
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

X Tutup