Fixed identation on file
Add apparmor change hat functionality to fpm
Bug 64744
Show the type of the non-object for more descriptive errors
configure output alignment
bump API versions
bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
OCI8 build change: Fix source variable definition for C89 compatibility
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (304 commits)
  OCI8 build change: Fix source variable definition for C89 compatibility
  bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
  bump API versions
  configure output alignment
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Update LiteSpeed SAPI code to V6.4
  Fixed typo in Makefile.frag
  updated NEWS
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  Fix English here
  limit virtual_cwd_activate() duplicated call to ZTS only
  ...
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
  bump API versions
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added tests for PHAR/OPCahce incompatibilities

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
Make all code paths in json_determine_array_type() return constants.

This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix broken test

Conflicts:
	NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  missing 'config.h' in 5dc37b3
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix failed test with recent glibc
  5.5.7 now
Merge branch 'PHP-5.6'