Fix coding style in old (pre-2014) files #1431

Merged
merged 4 commits into from Jul 13, 2015

Projects

None yet

5 participants

@job
Contributor
job commented Jul 10, 2015

Used the Squiz standard, with manual editing where the phpcbf made a mess

for i in $(cat list_of_old_files); do phpcbf --standard=Squiz $i; vim $i; echo $i; git diff; read; git commit -a ; read; done
@f0o
Member
f0o commented Jul 10, 2015

๐Ÿ‘

@f0o
Member
f0o commented Jul 10, 2015

Running the patch for some hours on an install with several device types and it works. ๐Ÿ‘

@f0o f0o added the Core label Jul 10, 2015
@laf
Member
laf commented Jul 10, 2015

@f0o Also looks good on my install.

I don't want to merge right now as I won't be around so if you can merge in the morning and that way any systems auto updating in the day can shout for help if anything does break :)

@paulgear
Member

Some comments:

  1. There's no point in removing the .exe file; it's in a subtree which is used to pull upstream, and it will only get put back, or worse, cause merge conflicts.
  2. The addition of 'set -e' to scripts/*.sh is non-transparent and could cause problems. I would recommend backing that out until we've checked over the component scripts.
@job
Contributor
job commented Jul 11, 2015

@paulgear Unsure what you mean with non-transparent, would you prefer set -ev ? Currently those scripts have a yolo approach :-)

@job
Contributor
job commented Jul 11, 2015

I removed the shellscript and .exe related commits from this PR

@f0o
Member
f0o commented Jul 11, 2015

๐Ÿ‘

@f0o
Member
f0o commented Jul 11, 2015

Ok this needs a rebase now, sorry

job added some commits Jul 9, 2015
@job job Remove effectively empty file e4f4eb4
@job job Apply "Squiz" code style on old (pre-2014) files ebd0f6f
@job job Remove empty file 7663670
@job job Remove empty file
fa0d021
@job
Contributor
job commented Jul 11, 2015

@f0o rebase done, solved merge conflicts & pushed

@paulgear
Member

Looks good to me!

@laf laf merged commit 89206b3 into librenms:master Jul 13, 2015

2 checks passed

Auto-Deploy Build finished.
Details
Scrutinizer 1825 Issues, 21 Patches
Details
@job job deleted the job:coding_style_old_files branch Jul 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment