From 8f7c5bcf5bba6fd50760de1707202a06978eb863 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 26 Apr 2022 12:19:57 +0200
Subject: update to 8.0.19RC1

---
 failed.txt              |  2 +-
 php-8.0.0-parser.patch  | 16 ----------------
 php-8.0.19-parser.patch | 16 ++++++++++++++++
 php.spec                | 11 +++++++----
 4 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 php-8.0.0-parser.patch
 create mode 100644 php-8.0.19-parser.patch

diff --git a/failed.txt b/failed.txt
index ee52391..c04db2a 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.0.18 (2022-04-13)
+===== 8.0.19RC1 (2022-04-28)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php-8.0.0-parser.patch b/php-8.0.0-parser.patch
deleted file mode 100644
index f5da3b5..0000000
--- a/php-8.0.0-parser.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
---- ./build/gen_stub.php.syslib	2020-06-25 08:11:51.782046813 +0200
-+++ ./build/gen_stub.php	2020-06-25 08:13:11.188860368 +0200
-@@ -1075,6 +1075,12 @@ function initPhpParser() {
-     }
- 
-     $isInitialized = true;
-+
-+    if (file_exists('/usr/share/php/PhpParser4/autoload.php')) {
-+        require_once '/usr/share/php/PhpParser4/autoload.php';
-+        return;
-+    }
-+
-     $version = "4.9.0";
-     $phpParserDir = __DIR__ . "/PHP-Parser-$version";
-     if (!is_dir($phpParserDir)) {
diff --git a/php-8.0.19-parser.patch b/php-8.0.19-parser.patch
new file mode 100644
index 0000000..8a28e4d
--- /dev/null
+++ b/php-8.0.19-parser.patch
@@ -0,0 +1,16 @@
+diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
+--- ./build/gen_stub.php.syslib	2020-06-25 08:11:51.782046813 +0200
++++ ./build/gen_stub.php	2020-06-25 08:13:11.188860368 +0200
+@@ -1075,6 +1075,12 @@ function initPhpParser() {
+     }
+ 
+     $isInitialized = true;
++
++    if (file_exists('/usr/share/php/PhpParser4/autoload.php')) {
++        require_once '/usr/share/php/PhpParser4/autoload.php';
++        return;
++    }
++
+     $version = "4.13.0";
+     $phpParserDir = __DIR__ . "/PHP-Parser-$version";
+     if (!is_dir($phpParserDir)) {
diff --git a/php.spec b/php.spec
index e284f0f..7060661 100644
--- a/php.spec
+++ b/php.spec
@@ -114,8 +114,8 @@
 #global gh_date      20200615
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        8.0.18
-#global rcver        RC1
+%global upver        8.0.19
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -167,7 +167,7 @@ Patch10: php-7.0.7-curl.patch
 
 # Functional changes
 # Use system nikic/php-parser
-Patch41: php-8.0.0-parser.patch
+Patch41: php-8.0.19-parser.patch
 # use system tzdata
 Patch42: php-8.0.10-systzdata-v21.patch
 # See http://bugs.php.net/53436
@@ -428,7 +428,7 @@ Requires: pcre2-devel%{?_isa} >= 10.30
 %endif
 Requires: zlib-devel%{?_isa}
 %if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: php-nikic-php-parser4 >= 4.3.0
+Recommends: php-nikic-php-parser4 >= 4.13.0
 %endif
 
 %description devel
@@ -1846,6 +1846,9 @@ fi
 
 
 %changelog
+* Tue Apr 26 2022 Remi Collet <remi@remirepo.net> - 8.0.19~RC1-1
+- update to 8.0.19RC1
+
 * Wed Apr 13 2022 Remi Collet <remi@remirepo.net> - 8.0.18-1
 - Update to 8.0.18 - http://www.php.net/releases/8_0_18.php
 
-- 
cgit