[WIP] merge pull-requests locally

                    
|Q            |A   |
|---          |--- |
|Bug Fix?     |no  |
|New Feature? |yes |
|BC Breaks?   |no  |
|Deprecations?|no  |
|Fixed Tickets|#323|
|License      |MIT |
                    
**Work in progress**

- [ ] Tests
- [ ] Make usage of temp files more uniform (to much duplication right now)

Sent using [Gush](https://github.com/gushphp/gush)
Yep, I need to run the PHP-cs-fixer :)