DAT-2364 Use the value of city_variable instead of object

* Use the value
* Fix PHP strict warning
* Why, oh why PHP doesn't have static typing? :(