Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Tue, 19 Jan 2016 12:59:09 +0000 (13:59 +0100)
committerMichael Wallner <mike@php.net>
Tue, 19 Jan 2016 12:59:09 +0000 (13:59 +0100)
1  2 
README.md
gen_travis_yml.php

diff --combined README.md
index db97f918df83d544aea9f88853ee259d479960d0,38da65b9bed83f8350e1acee6728cb8498d15dd0..4c4a52c4a513b6e3fcc69a1d090aa1b7ea6a89fd
+++ 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 d579da1e7d2b0df7ba943ff90e6eae6e9e64e8f2,a96a3384ee68a45d98d72faf3d6debe69977a2f8..2d28a22867f65dcfd3779c16f1d2d556f2d6c168
@@@ -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"