Skip to content

Conversation

@reedy
Copy link
Contributor

@reedy reedy commented Jul 9, 2025

More pinging of #1336

Follows up #1585

@reedy reedy force-pushed the phpcs2 branch 2 times, most recently from ecd9626 to 99edcc0 Compare July 9, 2025 19:47
@reedy
Copy link
Contributor Author

reedy commented Jul 9, 2025

@TrystanLea This can land. Just be aware in future, patches really shouldn't be merged unless the tests pass - otherwise there's no point in having them :)

We should slowly go through these rules, and remove the exclude entries, fixing up the code.

@TrystanLea
Copy link
Member

Thanks @reedy I've added a few inline comments.

Are you just running this command but on a small number of files for the above changes?

phpcbf -p .

@reedy
Copy link
Contributor Author

reedy commented Jul 10, 2025

I'm just running 'composer fix' which runs on everything, excluding vendor and Lib.

@reedy
Copy link
Contributor Author

reedy commented Jul 10, 2025

The indenting issues is probably from files not having consistent (tabs or spaces) indenting, not to consistent levels. And without a specific config setting that, it may just be getting confused as part of doing other changes...

Seeing as it's not doing weird things on most of the files in the repo, we can probably just fix that by hand one time and should be good going forward.

Like I say, if we can decide whether we actually want tabs or spaces, getting that fixed should be easier.

@TrystanLea TrystanLea merged commit 25e3a46 into emoncms:master Jul 10, 2025
6 checks passed
@TrystanLea
Copy link
Member

Before we go any further with this, lets get json_i18b merged in first, seeing lots of merge conflicts

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