From: Michael Wallner <mike@php.net>
Date: Tue, 19 Jan 2016 12:59:09 +0000 (+0100)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v2.0.0~5
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=commitdiff_plain;h=9e4e6b948aa03c04e66e808efa6a3522b92449d8;hp=-c

Merge branch 'v1.0.x'
---

9e4e6b948aa03c04e66e808efa6a3522b92449d8
diff --combined README.md
index db97f91,38da65b..4c4a52c
--- a/README.md
+++ b/README.md
@@@ -1,6 -1,6 +1,6 @@@
  # pecl/pq
  
 -[![Build Status](https://travis-ci.org/m6w6/ext-pq.svg?branch=v1.0.x)](https://travis-ci.org/m6w6/ext-pq)
 +[![Build Status](https://travis-ci.org/m6w6/ext-pq.svg?branch=master)](https://travis-ci.org/m6w6/ext-pq)
  
  ## About:
  
@@@ -26,6 -26,11 +26,11 @@@ Known issues are listed in [BUGS](./BUG
  	pecl install pq
  
  Watch out for [PECL replicates](https://replicator.pharext.org?pq)
+ and pharext packages attached to [releases](./releases).
+ 
+ ### PHARext
+ 
+ Watch out for [PECL replicates](https://replicator.pharext.org?pq)
  and pharext packages attached to [releases](./releases).
  
  ### Checkout
diff --combined gen_travis_yml.php
index d579da1,a96a338..2d28a22
--- a/gen_travis_yml.php
+++ b/gen_travis_yml.php
@@@ -17,13 -17,11 +17,13 @@@ env
  
  $gen = include "./travis/pecl/gen-matrix.php";
  $env = $gen([
 -	"PHP" => ["5.4", "5.5", "5.6"],
 +	"PHP" => ["7.0", "master"],
  	"enable_debug",
  	"enable_maintainer_zts",
  	"enable_json",
  	"enable_hash" => ["yes"],
 +	"enable_phar" => ["yes"],
 +	"enable_posix" => ["yes"]
  ]);
  foreach ($env as $e) {
  	printf("  - %s\n", $e);
@@@ -33,7 -31,7 +33,7 @@@
  
  before_script:
   - make -f travis/pecl/Makefile php
-  - make -f travis/pecl/Makefile pharext/raphf-master
 - - make -f travis/pecl/Makefile pecl PECL=raphf:raphf:1.1.2
++ - make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0
   - make -f travis/pecl/Makefile ext PECL=pq
   - psql -U postgres -c "CREATE DATABASE test"