Restoring require-dev in composer
caching calls to php_sapi_name()
Shortening some calls
Merge branch '3.0-session' of github.com:cakephp/cakephp into 3.0-session