Skip to content

[stable10] owncloud coding standard#31453

Closed
phil-davis wants to merge 11 commits intostable10from
stable10-coding-style
Closed

[stable10] owncloud coding standard#31453
phil-davis wants to merge 11 commits intostable10from
stable10-coding-style

Conversation

@phil-davis
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis commented May 16, 2018

Backport #31442

The first commits backport the various interim php-cs-fixer changes from PR #31198 #31236 #31250 #31271 #31273

That was the easy way to make a list of cherry-picks that all fit nicely on top of each other. And its brings along the Makefile and drone changes etc that were already done before #31442

The last commit uses php-cs-fixer to make the automatic fixes needed for the code in stable10

lib/composer/bin/php-cs-fixer fix -v --diff --allow-risky yes

@phil-davis phil-davis added this to the development milestone May 16, 2018
@phil-davis phil-davis self-assigned this May 16, 2018
@phil-davis phil-davis force-pushed the stable10-coding-style branch 2 times, most recently from 90e3d93 to fd5cdec Compare May 16, 2018 07:37
@codecov
Copy link
Copy Markdown

codecov bot commented May 16, 2018

Codecov Report

Merging #31453 into stable10 will decrease coverage by 0.05%.
The diff coverage is 70.53%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #31453      +/-   ##
==============================================
- Coverage       62.13%   62.07%   -0.06%     
+ Complexity      18241    18227      -14     
==============================================
  Files            1195     1195              
  Lines           71743    71827      +84     
  Branches         1248     1248              
==============================================
+ Hits            44574    44586      +12     
- Misses          26799    26871      +72     
  Partials          370      370
Flag Coverage Δ Complexity Δ
#javascript 52.64% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 63.1% <70.53%> (-0.07%) 18227 <660> (-14)
Impacted Files Coverage Δ Complexity Δ
...al/lib/Controller/UserGlobalStoragesController.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php 0% <ø> (ø) 0 <0> (ø) ⬇️
...s/federation/lib/Controller/SettingsController.php 92.3% <ø> (ø) 7 <0> (ø) ⬇️
apps/files/templates/index.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/federatedfilesharing/lib/TokenHandler.php 100% <ø> (ø) 2 <0> (ø) ⬇️
apps/files_external/lib/AppInfo/Application.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files/templates/appnavigation.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files/appinfo/app.php 25% <ø> (ø) 0 <0> (ø) ⬇️
apps/federatedfilesharing/lib/AdminPanel.php 100% <ø> (ø) 4 <0> (ø) ⬇️
apps/files_external/appinfo/app.php 0% <ø> (ø) 0 <0> (ø) ⬇️
... and 578 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 af54ac4...0170270. Read the comment docs.

Copy link
Copy Markdown
Contributor

@patrickjahns patrickjahns left a comment

Choose a reason for hiding this comment

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

Please wait until we have a final agreement when to do the backport

@phil-davis phil-davis force-pushed the stable10-coding-style branch from 606693f to 35bfd29 Compare May 16, 2018 15:09
@phil-davis
Copy link
Copy Markdown
Contributor Author

@patrickjahns @DeepDiver1975 now that the coding standard has been merged to master, this can also be reviewed and merged whenever you are happy.

Lately when doing backports I have been having to process "mindless" conflicts due to the previously-applied coding standards in master that has not been backported. So having this backport done in stable10 should make the code match better in the 2 branches and reduce "rubbish" conflicts.

@phil-davis phil-davis dismissed patrickjahns’s stale review May 17, 2018 09:19

master PR has been merged, this backport is ready for review now

@patrickjahns
Copy link
Copy Markdown
Contributor

@phil-davis

There are some open tasks that need to be checked on stable10 - especially if native_function breaks polyfill components

@phil-davis phil-davis force-pushed the stable10-coding-style branch 2 times, most recently from 02f6886 to 95b4b19 Compare May 23, 2018 09:13
@phil-davis phil-davis force-pushed the stable10-coding-style branch from 95b4b19 to 9af83a0 Compare May 29, 2018 08:04
@phil-davis phil-davis force-pushed the stable10-coding-style branch from 9af83a0 to 0170270 Compare June 6, 2018 02:13
@phil-davis
Copy link
Copy Markdown
Contributor Author

PR #31657 has a newer/cleaner set of commits for this.

@phil-davis phil-davis closed this Jun 6, 2018
@phil-davis phil-davis deleted the stable10-coding-style branch June 6, 2018 07:13
@PVince81 PVince81 modified the milestones: development, QA Jun 13, 2018
@lock
Copy link
Copy Markdown

lock bot commented Jul 31, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Jul 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants