CakePHP 2.3 fixes

Updated DataSource to make it compatible with PHP 5.4 and CakePHP 2.3 declarations of functions (warning without it).