Skip to content

Adjust edition string#37654

Merged
micbar merged 3 commits intorelease-10.5.0from
adjust_edition_string
Jul 6, 2020
Merged

Adjust edition string#37654
micbar merged 3 commits intorelease-10.5.0from
adjust_edition_string

Conversation

@jvillafanez
Copy link
Copy Markdown
Member

Description

Expired demo key will return community edition instead of enterprise

Related Issue

https://github.com/owncloud/enterprise/issues/4020

Motivation and Context

How Has This Been Tested?

Manually tested

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

PR targets release-10.5.0 branch, It's expected to be merged into master along with the release changes

@jvillafanez jvillafanez requested a review from micbar July 6, 2020 10:16
@jvillafanez jvillafanez self-assigned this Jul 6, 2020
@update-docs
Copy link
Copy Markdown

update-docs bot commented Jul 6, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@micbar
Copy link
Copy Markdown
Contributor

micbar commented Jul 6, 2020

@jvillafanez Can you cover the complex "edition" logic in a unit test?

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
... and 9 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 91cb255...3cd5e44. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
... and 9 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 91cb255...3cd5e44. Read the comment docs.

1 similar comment
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
... and 9 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 91cb255...3cd5e44. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
... and 9 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 91cb255...3cd5e44. Read the comment docs.

1 similar comment
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
... and 9 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 91cb255...3cd5e44. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
... and 9 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 91cb255...3cd5e44. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
... and 9 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 91cb255...5967072. Read the comment docs.

@jvillafanez
Copy link
Copy Markdown
Member Author

Added tests matching the current logic

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.07%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.07%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48962      +77     
+ Misses                26323    26273      -50     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.08%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
lib/private/legacy/util.php 74.45% <0.00%> (-0.08%) 222.00% <0.00%> (+3.00%) ⬇️
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
... and 9 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 91cb255...5967072. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.08%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.08%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48965      +80     
+ Misses                26323    26270      -53     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.09%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
settings/Controller/CorsController.php 97.56% <0.00%> (+0.06%) 10.00% <0.00%> (ø%)
... and 9 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 91cb255...5967072. Read the comment docs.

1 similar comment
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.08%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.08%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48965      +80     
+ Misses                26323    26270      -53     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.09%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
settings/Controller/CorsController.php 97.56% <0.00%> (+0.06%) 10.00% <0.00%> (ø%)
... and 9 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 91cb255...5967072. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.08%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.08%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48965      +80     
+ Misses                26323    26270      -53     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.09%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Controller/CorsController.php 97.56% <0.00%> (+0.06%) 10.00% <0.00%> (ø%)
... and 9 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 91cb255...5967072. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.08%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.08%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48965      +80     
+ Misses                26323    26270      -53     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.09%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
settings/Controller/CorsController.php 97.56% <0.00%> (+0.06%) 10.00% <0.00%> (ø%)
... and 9 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 91cb255...5967072. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.08%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.08%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48965      +80     
+ Misses                26323    26270      -53     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.09%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Controller/CorsController.php 97.56% <0.00%> (+0.06%) 10.00% <0.00%> (ø%)
... and 9 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 91cb255...5967072. Read the comment docs.

1 similar comment
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 6, 2020

Codecov Report

Merging #37654 into release-10.5.0 will increase coverage by 0.08%.
The diff coverage is 97.05%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.5.0   #37654      +/-   ##
====================================================
+ Coverage             64.66%   64.74%   +0.08%     
- Complexity            19343    19363      +20     
====================================================
  Files                  1279     1281       +2     
  Lines                 75600    75627      +27     
  Branches               1333     1333              
====================================================
+ Hits                  48885    48965      +80     
+ Misses                26323    26270      -53     
  Partials                392      392              
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (-0.01%) 0.00 <ø> (ø)
#phpunit 65.92% <97.05%> (+0.09%) 19363.00 <9.00> (+20.00)
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Command/TransferOwnership.php 84.00% <96.77%> (+2.42%) 49.00 <9.00> (+6.00)
...ps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php 32.29% <100.00%> (+8.88%) 31.00 <0.00> (+1.00)
lib/private/Archive/Archive.php 65.00% <0.00%> (-3.43%) 11.00% <0.00%> (+1.00%) ⬇️
settings/Application.php 53.65% <0.00%> (-0.33%) 2.00% <0.00%> (ø%)
core/js/js.js 55.04% <0.00%> (-0.02%) 0.00% <0.00%> (ø%)
apps/dav/lib/Files/PublicFiles/SharedFolder.php 0.00% <0.00%> (ø) 11.00% <0.00%> (ø%)
..._sharing/lib/Controller/NotificationController.php 42.10% <0.00%> (ø) 14.00% <0.00%> (ø%)
settings/Panels/Admin/PersistentLocking.php 100.00% <0.00%> (ø) 4.00% <0.00%> (?%)
...tings/templates/panels/admin/persistentlocking.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
settings/Controller/CorsController.php 97.56% <0.00%> (+0.06%) 10.00% <0.00%> (ø%)
... and 9 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 91cb255...5967072. Read the comment docs.

@jvillafanez
Copy link
Copy Markdown
Member Author

@micbar this is ready

@phil-davis
Copy link
Copy Markdown
Contributor

@micbar if you want to merge this like it is, to release-10.5.0 then please do that. And I can then update the merge-back PR #37648 so that it includes this (or if you do not want to do merge-back then say so)

@micbar micbar merged commit 0f017d4 into release-10.5.0 Jul 6, 2020
@delete-merged-branch delete-merged-branch bot deleted the adjust_edition_string branch July 6, 2020 15:07
@phil-davis phil-davis mentioned this pull request Jul 6, 2020
11 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.

3 participants