From 589ab054f0eb2512e2d5ce200580b689ac3f87a9 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 17 Jun 2019 13:51:28 +0200
Subject: [PATCH] travis: explicitly test against 7.4

---
 .travis.yml                | 2 ++
 scripts/gen_travis_yml.php | 4 ++--
 travis/pecl                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42997f3..ce23bc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
  - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+ - PHP=7.4 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=7.3 enable_json=yes enable_debug=no enable_maintainer_zts=no
  - PHP=7.3 enable_json=yes enable_debug=yes enable_maintainer_zts=no
@@ -23,6 +24,7 @@ env:
 matrix:
  fast_finish: true
  allow_failures:
+  - env: PHP=7.4 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - env: PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
 
 before_script:
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 0e4bba7..3f09445 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -15,7 +15,7 @@ env:
 $gen = include "./travis/pecl/gen-matrix.php";
 $cur = "7.3";
 $env = $gen([
-	"PHP" => ["7.0", "7.1", "7.2", "master"],
+	"PHP" => ["7.0", "7.1", "7.2", "7.4", "master"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
@@ -43,7 +43,7 @@ matrix:
  allow_failures:
 <?php
 $allow_failures = array_merge( ... array_map(function($a) {
-	return preg_grep('/^PHP=master /', $a);
+	return preg_grep('/^PHP=(master|7.4) /', $a);
 }, $env));
 foreach ($allow_failures as $e) {
 	printf("  - env: %s\n", $e);
diff --git a/travis/pecl b/travis/pecl
index 309d295..54a746a 160000
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 309d295271f95d9267c64535de8c2e638f6614cc
+Subproject commit 54a746ab5e068060f53796d0aca55f76656bb8b1
-- 
2.30.2