Add php-cs-fixer #5859
Closed
Add php-cs-fixer #5859
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
icewind1991
force-pushed
the
php-cs-fixer
branch
from
7a9c611
to
cfe7111
Compare
|
Some tests fail with "composer not found" - could you have a look? |
icewind1991
force-pushed
the
php-cs-fixer
branch
from
cfe7111
to
cc516f2
Compare
Codecov Report
@@ Coverage Diff @@
## master #5859 +/- ##
============================================
- Coverage 53.01% 52.67% -0.34%
+ Complexity 22759 22743 -16
============================================
Files 1404 1406 +2
Lines 88059 88890 +831
Branches 1327 1327
============================================
+ Hits 46685 46824 +139
- Misses 41374 42066 +692
|
|
Conflicts 🙈 |
icewind1991
force-pushed
the
php-cs-fixer
branch
2 times, most recently
from
c1aec2c
to
4be09c3
Compare
|
Acceptance test failure: |
icewind1991
force-pushed
the
php-cs-fixer
branch
2 times, most recently
from
2a30d59
to
b069ce6
Compare
Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
force-pushed
the
php-cs-fixer
branch
2 times, most recently
from
a827037
to
e09879f
Compare
Codecov Report
@@ Coverage Diff @@
## master #5859 +/- ##
============================================
- Coverage 53.01% 52.56% -0.46%
+ Complexity 22759 22714 -45
============================================
Files 1404 1406 +2
Lines 88059 89369 +1310
Branches 1327 1327
============================================
+ Hits 46685 46975 +290
- Misses 41374 42394 +1020
|
icewind1991
force-pushed
the
php-cs-fixer
branch
from
e09879f
to
c287d55
Compare
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
force-pushed
the
php-cs-fixer
branch
from
c287d55
to
ef5ffa9
Compare
|
All green, all rebased! Quick @rullzer @MorrisJobke @nickvergessen review before everything starts conflicting again. |
MorrisJobke
approved these changes
Jul 31, 2017
|
I also did some smoketests |
ChristophWurst
approved these changes
Jul 31, 2017
| @@ -126,7 +125,7 @@ public function setName($name) { | |||
| throw new \Sabre\DAV\Exception\Forbidden(); | |||
| } | |||
|
|
|||
| list($parentPath,) = \Sabre\HTTP\URLUtil::splitPath($this->path); | |||
| list($parentPath, ) = \Sabre\HTTP\URLUtil::splitPath($this->path); | |||
There was a problem hiding this comment.
interesting formatting 🙈
| $this->currentStream = $this->getStream($this->nodes[0]); | ||
|
|
||
| if (count( | ||
| $this->nodes |
There was a problem hiding this comment.
this does have to be on its own line? It's hard to read now
| ) > 0) { | ||
| $this->currentStream = | ||
| $this->getStream( | ||
| $this->nodes[0] |
There was a problem hiding this comment.
would it be possible to indent this line?
| @@ -37,9 +37,11 @@ | |||
| * @param int $seconds Seconds to look back at | |||
| * @return int | |||
| */ | |||
| public function getAttempts($methodIdentifier, | |||
| public function getAttempts( | |||
| $methodIdentifier, | |||
There was a problem hiding this comment.
shouldn't all parameters be indented by the same number of tabs?
There was a problem hiding this comment.
(saw the same issue at other methods too)
|
Conflicts \o/ - looks like it needs to be done in smaller steps. @icewind1991 |
| $this->nodes | ||
| ) > 0) { | ||
| $this->currentStream = | ||
| $this->getStream( |
There was a problem hiding this comment.
also I'd expect this on the line with the =
MorrisJobke
added
2. developing
|
While thinking more about this I'm not a fan of this. My bet is it leads to a lot of frustrated devs because they have to force push 5 times because there are tiny error according to the (limited) style rules... |
|
Let's not do this for now. Just too much hassle for very little advantage. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add php-cs-fixer rules, run them and add them to cli.
This also finally formalizes the coding standard to "PSR2 with tabs and braces on the same line" which seems to be the closest to what is currently used from what I can tell.
(also secretly part of my plan to ensure that I'm the top contributor by lines of code)