Fixed compatibility with ext/phar
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compatibility with ext/phar
Made test compatible with O+
Merge branch 'PHP-5.5'

* PHP-5.5:
  Made test compatible with O+