Fix php cart to work with cart repo changes.

[merge]