Merge branch 'R_2_5'

diff --combined scripts/gen_travis_yml.php
index 4bb37b775a461b54e0e2787e97e312d7e0ca8f64,771ee8f4023a1821517e6b3a3312ad3d05163b45..e42ec312b66e0a1b46f5388d80893c31cb3c4101
--- 1/scripts/gen_travis_yml.php
--- 2/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@@ -17,14 -17,12 +17,14 @@@ env
  
  $gen = include "./travis/pecl/gen-matrix.php";
  $env = $gen([
 -      "PHP" => ["5.4", "5.5", "5.6"],
 +      "PHP" => ["master"],
        "enable_debug",
        "enable_maintainer_zts",
        "enable_json",
        "enable_hash" => ["yes"],
 -      "enable_iconv" => ["yes"]
 +      "enable_iconv" => ["yes"],
 +      "enable_phar" => ["yes"],
 +      "enable_posix" => ["yes"]
  ]);
  foreach ($env as $e) {
        printf(" - %s\n", $e);
@@@ -34,7 -32,8 +34,7 @@@
  
  before_script:
   - make -f travis/pecl/Makefile php
 - - make -f travis/pecl/Makefile pecl PECL=raphf
 - - make -f travis/pecl/Makefile pecl PECL=propro
 + - make -f travis/pecl/Makefile pharext/raphf-master pharext/propro-master
  
  script:
   - make -f travis/pecl/Makefile ext PECL=http
@@@ -44,3 -43,10 +44,10 @@@ after_script
   - test -e tests/helper/server.log && cat tests/helper/server.log
  
  sudo: false
+ notifications:
+  webhooks:
+   urls:
+    - https://webhooks.gitter.im/e/28d35158ac7e385bd14d
+   on_success: change
+   on_failure: always
+   on_start: never