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

Minor: remove duplicated lines #19537

Merged

Conversation

alamirault
Copy link
Contributor

I searched for duplicated lines ^(.*)(\r?\n\1)+$ and found these "issues"

This add more consistency and avoid copy/paste extra blank line

@carsonbot carsonbot added this to the 5.4 milestone Feb 8, 2024
@OskarStark
Copy link
Contributor

You could also switch max blank lines to 1

@alamirault

This comment was marked as outdated.

@OskarStark
Copy link
Contributor

Oh yes...

@alamirault
Copy link
Contributor Author

alamirault commented Feb 8, 2024

@OskarStark

With 1, this file is invalid. As is an expected output, we should exclude violation or remove this line ? Or don't change rule ?

$ php bin/console debug:exception
Command "debug:exception" is not defined.

@OskarStark
Copy link
Contributor

Lets keep it as is, we don't need to be too strict, one and two lines is ok

@javiereguiluz
Copy link
Member

This kind of changes might look unexciting ... but I love them because it makes the source of our docs look better ... and I think we should care about the internals as much as about the externals. Thanks Antoine!

@javiereguiluz javiereguiluz merged commit 0786d34 into symfony:5.4 Feb 9, 2024
2 of 3 checks passed
@javiereguiluz
Copy link
Member

When upmerging there were a ton of conflicts...

... and now I see this when merging from 6.4 to 7.0: 847493b#diff-278a8e1908e2f0de9f2753d344b248e41eebde795a8e340569d2d0a3514cb29e

Is that a merge error?

@alamirault
Copy link
Contributor Author

When upmerging there were a ton of conflicts...

I'm sorry to hear that :/

secret section is already documented in this page (with better explanation btw), so we can remove this new section. I will do it on the 7.0 PR if is not done before

@alamirault alamirault deleted the feature/minor-remove-duplicated-lines branch February 9, 2024 18:04
OskarStark added a commit that referenced this pull request Feb 12, 2024
This PR was merged into the 6.4 branch.

Discussion
----------

Minor: remove duplicated lines

Continue #19537 on 6.4 branch

Commits
-------

07c2d48 Minor: remove duplicated lines
OskarStark added a commit that referenced this pull request Feb 13, 2024
This PR was squashed before being merged into the 7.0 branch.

Discussion
----------

Minor: remove duplicated lines

Continue #19537 on 7.0 branch

Commits
-------

f4d9b2c Minor: remove duplicated lines
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.

None yet

4 participants