From: Michael Wallner <mike@php.net>
Date: Tue, 29 Sep 2015 07:03:45 +0000 (+0200)
Subject: Merge branch 'R_2_5'
X-Git-Tag: RELEASE_3_0_0_RC1~11
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=a5e66b221dbf5a52cc770f4d7f46f05fe88784ba;hp=-c

Merge branch 'R_2_5'
---

a5e66b221dbf5a52cc770f4d7f46f05fe88784ba
diff --combined scripts/gen_travis_yml.php
index 4bb37b7,771ee8f..e42ec31
--- a/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