Skip to content

Conversation

mmoll
Copy link
Contributor

@mmoll mmoll commented Oct 1, 2020

No description provided.

@codecov
Copy link

codecov bot commented Oct 1, 2020

Codecov Report

Merging #162 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##              master      #162   +/-   ##
===========================================
  Coverage     100.00%   100.00%           
  Complexity       133       133           
===========================================
  Files              6         6           
  Lines            553       553           
===========================================
  Hits             553       553           

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 5801f54...ff6a47d. Read the comment docs.

@mmoll mmoll force-pushed the psr12 branch 3 times, most recently from 41ef5f3 to 573a145 Compare October 3, 2020 00:00
@mmoll mmoll marked this pull request as ready for review October 3, 2020 00:06
<rule ref="SlevomatCodingStandard.Namespaces.UseSpacing">
<properties>
<property name="linesCountBeforeFirstUse" value="1"/>
<property name="linesCountBetweenUseTypes" value="0"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This didn't get support in GH-126, however, PSR-12 also wants to see it like this, so I'm trying again...

<!-- exclude sniffs that are disabled on purpose by this standard -->
<exclude name="Generic.Files.LineLength.TooLong"/>
<!-- not compatible with other rules we have later on -->
<exclude name="PSR12.ControlStructures.ControlStructureSpacing"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Really puzzled by these multi line condition rules: https://www.php-fig.org/psr/psr-12/#51-if-elseif-else

@mmoll
Copy link
Contributor Author

mmoll commented Oct 3, 2020

I tried to pull in as much as possible from PSR12 while minimizing conflicts. In projects that extend MO4 and have own rules, there might be some new conflicts that need to get resolved by adjusting the other rules or excluding PSR12 stuff, but that's expected.

@xalopp xalopp merged commit db04cbd into mayflower:master Oct 28, 2020
@xalopp
Copy link
Contributor

xalopp commented Oct 28, 2020

Merci @mmoll

@mmoll mmoll deleted the psr12 branch October 28, 2020 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants