CS fixes
Minor phpcs fixes
fix session restart on PHP 5.3

this also removes some useless code
Merge branch '2.3' into 2.5

* 2.3:
  remove short array syntax
  fix session restart on PHP 5.3