Remove invalid mail addresses when updating the license header

[juliusknorr]

Follow up of #6864

This will make sure we only have valid email addresses in the license header, so parsing of the phpdoc block will succeed.

Should i also run the script and commit the changes or is that done only during the release build process?

[MorrisJobke]

The problem is, that for some users we only have a pseudonym. We should check if removing them from the license header is even possible. cc @schiessle

[juliusknorr]

The problem is, that for some users we only have a pseudonym. We should check if removing them from the license header is even possible.

Ah yes, that could be a problem. We also could just remove the <> around the email then, so we keep the invalid mail besides the name.

[rullzer]

Reminder to myself to kick @schiessle about this

[schiessle]

We also could just remove the <> around the email then, so we keep the invalid mail besides the name.

I think that's a good compromise. I would not remove anyone or any information which might be technically not correct (e.g. email) but still useful for a human who might be able to spot the typo easily and fix it. So I think removing the <> from not valid emails is a good approach in order to keep all information but still make it readable by a parser.

[juliusknorr]

Ok, fixed the commit to just remove the brackets.

Please review @MorrisJobke @schiessle @rullzer

[codecov]

Codecov Report

Merging #6926 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #6926      +/-   ##
============================================
+ Coverage     50.73%   50.73%   +<.01%     
  Complexity    24413    24413              
============================================
  Files          1579     1579              
  Lines         93294    93294              
  Branches       1359     1359              
============================================
+ Hits          47332    47333       +1     
+ Misses        45962    45961       -1

Impacted Files	Coverage Δ	Complexity Δ
apps/files_trashbin/lib/Trashbin.php	72.53% <0%> (+0.24%)	136% <0%> (ø)	⬇️

[MorrisJobke]

I would like to see #7083 in before that and will have a look at this afterwards to see the actual difference.

[MorrisJobke]

Rebased and testing the output now :)

[MorrisJobke]

Please remove the leading space. Otherwise it will look like this:

diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 8e718b0232..af3d7a3c0c 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -2,7 +2,7 @@
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
- * @author Administrator <Administrator@WINDOWS-2012>
+ * @author AdministratorAdministrator@WINDOWS-2012
  * @author Arthur Schiwon <[email protected]>
  * @author Bart Visscher <[email protected]>
  * @author Bernhard Posselt <[email protected]>

And maybe also add quotes around it to more easily recognise what was the email.

[juliusknorr]

🙈 Fixed.

[MorrisJobke]

What about the quotes around the "email"?

[MorrisJobke]

Could we have quotes around the previous email? Something like str_replace('<'.$mailMatch[1].'>', '"'.$mailMatch[1].'"', $author);

[juliusknorr]

Sorry, I somehow missed that. Fixed as well.

[MorrisJobke]

Tested, works, and updated headers are committed to this branch as well 👍