From 6f5faabcca700632d224a301c32cff88ef49d11e Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 4 Dec 2019 17:45:33 +0100
Subject: [PATCH] move to PHP-7.4 as current GA

---
 .travis.yml                | 15 +++++++--------
 scripts/gen_travis_yml.php |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5c3d68c..23cbd18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,19 +24,18 @@ 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=7.3 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=no
-  - 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
-  - PHP=7.3 enable_json=yes enable_debug=no enable_maintainer_zts=yes
-  - PHP=7.3 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
-  - PHP=7.3 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
+  - PHP=7.4 enable_json=no
+  - PHP=7.4 enable_json=yes enable_debug=no enable_maintainer_zts=no
+  - PHP=7.4 enable_json=yes enable_debug=yes enable_maintainer_zts=no
+  - PHP=7.4 enable_json=yes enable_debug=no enable_maintainer_zts=yes
+  - PHP=7.4 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.4 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
 
 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
 
 install:
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index d1678ab..7e05a54 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -25,9 +25,9 @@ env:
 <?php
 
 $gen = include "./travis/pecl/gen-matrix.php";
-$cur = "7.3";
+$cur = "7.4";
 $env = $gen([
-	"PHP" => ["7.0", "7.1", "7.2", "7.4", "master"],
+	"PHP" => ["7.0", "7.1", "7.2", "7.3", "master"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
@@ -58,7 +58,7 @@ matrix:
  allow_failures:
 <?php
 $allow_failures = array_merge( ... array_map(function($a) {
-	return preg_grep('/^PHP=(master|7.4) /', $a);
+	return preg_grep('/^PHP=(master) /', $a);
 }, $env));
 foreach ($allow_failures as $e) {
 	printf("  - env: %s\n", $e);
-- 
2.30.2