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

[stable10] owncloud coding standard #31657

Closed
wants to merge 12 commits into from
Closed

Conversation

phil-davis
Copy link
Contributor

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 --diff-format udiff --allow-risky yes

@phil-davis phil-davis self-assigned this Jun 6, 2018
@codecov
Copy link

codecov bot commented Jun 6, 2018

Codecov Report

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

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #31657      +/-   ##
==============================================
- Coverage       62.15%    62.1%   -0.06%     
+ Complexity      18249    18235      -14     
==============================================
  Files            1199     1199              
  Lines           71798    71882      +84     
  Branches         1248     1248              
==============================================
+ Hits            44629    44641      +12     
- Misses          26799    26871      +72     
  Partials          370      370
Flag Coverage Δ Complexity Δ
#javascript 52.64% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 63.13% <70.53%> (-0.07%) 18235 <660> (-14)
Impacted Files Coverage Δ Complexity Δ
apps/dav/lib/CardDAV/ContactsManager.php 100% <ø> (ø) 4 <0> (ø) ⬇️
...nnector/Sabre/Exception/PasswordLoginForbidden.php 0% <ø> (ø) 2 <0> (ø) ⬇️
apps/files/list.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files/templates/index.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files/simplelist.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files_external/lib/AppInfo/Application.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files/appinfo/routes.php 100% <ø> (ø) 0 <0> (ø) ⬇️
apps/dav/lib/Capabilities.php 0% <ø> (ø) 1 <0> (ø) ⬇️
apps/federation/lib/Hooks.php 100% <ø> (ø) 4 <0> (ø) ⬇️
.../federation/lib/Middleware/AddServerMiddleware.php 100% <ø> (ø) 3 <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 6f799c5...7f59cd4. Read the comment docs.

@DeepDiver1975
Copy link
Member

Conflicting - please merge after 10.0.9 - otherwise we are lost in rebase nightmare again ....

@phil-davis
Copy link
Contributor Author

Note: For now, this is just a place to keep a handy list of all the commits that make up implementing the code-style checks. The last commit(s) that actually apply the changes to the code can easily be dropped and then re-made by running the checker to make the fixes. That is often easier (and more reliable) than manually resolving loads of "rubbish" conflicts that happen here.

@phil-davis
Copy link
Contributor Author

Too many conflicts due to objectstore backport merging. It is much quicker to create a new branch, cherry-pick the functional commits and run php-cs-fixer again to make the code sttyle changes.
See new PR #31722

@phil-davis phil-davis closed this Jun 12, 2018
@PVince81 PVince81 deleted the stable10-coding-style-2 branch September 27, 2018 13:34
@lock lock bot locked as resolved and limited conversation to collaborators Sep 27, 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.

3 participants