SF 6.4 and PHP attributes

Hi,
I've made changes to make the datagrid support SF6.4, but I'm facing problem with Tests (problem to mock the container).
I've also made a branch with PHP attributes instead of annotations (FredDut:annotations-to-attributes.
In Source, groups an groupBy are not anymore array.

Any help would be appreciate for tests.

Regards