add php:remi-8.0 stream

2 files changed, 15 insertions, 8 deletions

diff --git a/mkmodular b/mkmodular
index 135b3a1e..c01b92c5 100755
--- a/mkmodular
+++ b/mkmodular
@@ -42,7 +42,6 @@ data:
       - php-cli
       - php-common
       - php-fpm
-      - php-json
       - php-mbstring
       - php-xml
     devel:
@@ -52,7 +51,6 @@ data:
       - php-common
       - php-devel
       - php-fpm
-      - php-json
       - php-mbstring
       - php-pear
       - php-pecl-zip
@@ -344,7 +342,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) {
 	$deps = ['platform' => 'f31'];
 	$mod  = genModule('fedora/31/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/31/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', 'remi-7.3', ['remi-7.3', 'remi-7.4']);
+	$mod .= genModule('fedora/31/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', 'remi-7.3', ['remi-7.3', 'remi-7.4', 'remi-8.0']);
 	$mod .= genModule('fedora/31/glpi93/x86_64', $dest, '*.rpm',         '9.3', 'x86_64', $deps, $template_glpi);
 	$mod .= genModule('fedora/31/glpi94/x86_64', $dest, '*.rpm',         '9.4', 'x86_64', $deps, $template_glpi);
 	$mod .= genDefaults('glpi', '9.4', ['9.3', '9.4']);
@@ -356,6 +355,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) {
 	$deps = ['platform' => 'f31'];
 	$mod  = genModule('fedora/31/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/31/test74/x86_64', $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/31/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -365,7 +365,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) {
 	cleanup($dest);
 	$deps = ['platform' => 'f32'];
 	$mod  = genModule('fedora/32/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4']);
+	$mod .= genModule('fedora/32/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/32/modular-test/x86_64';
@@ -373,6 +374,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) {
 	cleanup($dest);
 	$deps = ['platform' => 'f32'];
 	$mod  = genModule('fedora/32/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/32/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -382,7 +384,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	cleanup($dest);
 	$deps = ['platform' => 'f33'];
 	$mod  = genModule('fedora/33/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4']);
+	$mod .= genModule('fedora/33/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/33/modular-test/x86_64';
@@ -390,6 +393,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	cleanup($dest);
 	$deps = ['platform' => 'f33'];
 	$mod  = genModule('fedora/33/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/33/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -401,6 +405,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$mod  = genModule('enterprise/8/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'enterprise/8/modular/x86_64';
@@ -410,7 +415,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$mod  = genModule('enterprise/8/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4']);
+	$mod .= genModule('enterprise/8/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0']);
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/8/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
@@ -443,7 +449,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
 	$mod  = genModule('enterprise/7/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-//	$mod .= genModule('enterprise/7/test/x86_64',   $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/7/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'enterprise/7/modular/x86_64';
@@ -454,6 +460,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/7/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/7/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4']);
 	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*5.0*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis);
diff --git a/wizard/index.php b/wizard/index.php
index d8d644dd..3a817621 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -69,7 +69,7 @@ $types = [
 ];
 $phpvers = [
 	// use false when only SCL
-	'8.0' => false,
+	'8.0' => 'remi-php80',
     '7.4' => 'remi-php74',
     '7.3' => 'remi-php73',
     '7.2' => 'remi-php72',