[2.3] CS Fixes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request provides some cs fixes.
@fabpot Please tell me which style of code you prefer:

Option 1:
```php
class Foo
{
    public function bar()
    {

    }
}
```

Option 2:
```php
class Foo
{
    public function bar()
    {
    }
}
```