PSR-2 + enhance phpdoc

| Q             | A
| ------------- | ---
| Bug fix?             | no
| Enhancement?  | yes
| New feature?     | no
| BC breaks?        | no
| Deprecations?   | no
| Tests pass?       | yes