code cleanup

[craue]

Another one. 😏

[halfdan]

Hi @craue
Would you mind squashing down the commits into a single one?

[craue]

@halfdan: Really? I separated them on purpose.

[sgiehl]

Imho it is fine as it is. Every commit is fixing a different type.

[halfdan]

@sgiehl In that case we can probably create a few hundred more commits.. I'd like to keep the history clean.

[sgiehl]

Sure. But having more 'atomic' commits makes it easier to revert them if required. And it is easier to understand why something was changed.

[tsteur]

+1 for @sgiehl atomic commits.

@craue the tests fail as there were whitespace changes / newline changes in *.xml files. See https://travis-ci.org/piwik/piwik/jobs/30532901 . Would you mind undoing them? In our integration tests there are *.xml files generated and exactly compared with those files in the repository. If there is any whitespace different the tests fail. There are for instance some multiple newlines because we empty some lines in the comparison. For instances lines which contain a date.

[craue]

@tsteur: Sure, I've excluded the tests/PHPUnit/Integration/expected folder and rebased the branch. Let's see if tests pass...

[tsteur]

Would you mind checking plugins/CustomVariables/tests/expected/, plugins/CustomVariables/tests/processed/, plugins/ExamplePlugin/tests/processed/ and plugins/ExamplePlugin/tests/expected/ as well?

[craue]

Done, @tsteur.

[tsteur]

Thx!