From 8649c95354ceb0ac80c9b223c23d8aa084b4cc3d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 22 Dec 2021 11:20:56 +0100
Subject: F35 now have 7.4 as module

---
 wizard/index.php | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'wizard')

diff --git a/wizard/index.php b/wizard/index.php
index 3fadbad6..558fa84c 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -37,6 +37,17 @@ $osmin = [
     'Fedora 34' => '5.6',
     'Fedora 33' => '5.6',
 ];
+$osminbase = [
+    'RHEL 9'    => '7.4',
+    'RHEL 8'    => '5.6',
+    'RHEL 7'    => '5.4',
+    'CentOS 9'  => '7.4',
+    'CentOS 8'  => '5.6',
+    'CentOS 7'  => '5.4',
+    'Fedora 35' => '7.4',
+    'Fedora 34' => '7.4',
+    'Fedora 33' => '7.4',
+];
 $osmax = [
     'RHEL 9'    => '8.1',
     'RHEL 8'    => '8.1',
@@ -183,7 +194,7 @@ if ($php && $os) {
 		$os,
 		is_array($osvers[$os]) ? implode(', ', $osvers[$os]) : $osvers[$os]
 	);
-    if (version_compare($php, '5.6', '<')) {
+    if (version_compare($php, '7.4', '<')) {
         printf("<li><b>WARNING</b>, PHP version <b>%s</b> have reached its eod of life, despite packages have security fix, you should consider a maintained version.</li><br />", $php);
     }
 }
@@ -235,11 +246,7 @@ if ($php && $os && $type && !$err) {
     if ($type == 'base') {
         printf("<li>You want a <b>single version </b> which means replacing base packages from the distribution</li><br />");
 
-		if ($dist != 'Fedora' && $ver >= 9) {
-			$min = $osmin[$os];
-		} else {
-			$min = (is_array($osvers[$os]) ? $osvers[$os][0] : $osvers[$os]);
-		}
+		$min = $osminbase[$os];
 
         printf("<li>Packages have the <b>same name</b> than the base repository, ie php-*</li><br />");
 
@@ -265,10 +272,12 @@ if ($php && $os && $type && !$err) {
                 printf("<pre>    dnf config-manager --set-enabled remi</pre></li><br />");
             }
 
-            if ($dist == 'Fedora' || $yum == 'yum') {
+            //if ($dist == 'Fedora' || $yum == 'yum') {
+            if ($yum == 'yum') {
                 printf("<li>PHP version <b>%s</b> packages are available for <b>%s</b> in <b>%s</b> repository</li><br />", $php, $os, $repo);
 	            printf("<li>Command to enable the repository:");
             }
+			/*
             if ($dist == 'Fedora') {
                 printf("<pre>    dnf config-manager --set-enabled %s</pre></li><br />", $repo);
                 if ($mod) {
@@ -276,7 +285,9 @@ if ($php && $os && $type && !$err) {
                     printf("<pre>    dnf config-manager --set-disabled remi-modular</pre></li><br />");
                     printf("<li>Alternatively, you may prefer the modern way, by enabling the module stream for $php:");
                 }
-            } else if ($yum == 'yum') { // EL-6, 7
+            } else
+			*/
+			if ($yum == 'yum') { // EL-6, 7
                 printf("<pre>    yum-config-manager --disable 'remi-php*'");
                 printf(   "\n    yum-config-manager --enable   %s</pre></li><br />", $repo);
 
@@ -333,12 +344,14 @@ if ($php && $os && $type && !$err) {
             if ($dist=='Fedora') {
                 $repo = 'remi'; //($phpvers[$php] ? 'remi' : 'remi-test'); // Dev version
 
+                printf("<li>Some common <b>dependencies</b> are available in <b>remi</b> repository, which need to be enabled");
+                printf("<pre>    dnf config-manager --set-enabled remi</pre></li><br />");
                 printf("<li>The <b>%s</b> collection is available in the <b>$repo</b> repository</li><br />", $scl);
                 printf("<li>Command to install:");
-                printf("<pre>    $yum --enablerepo=$repo install %s</pre>", $scl);
+                printf("<pre>    $yum install %s</pre>", $scl);
                 printf("</li><br />");
                 printf("<li>Command to install additional packages:");
-                printf("<pre>    $yum --enablerepo=$repo install %s-php-xxx</pre>", $scl);
+                printf("<pre>    $yum install %s-php-xxx</pre>", $scl);
             } else {
                 $repo = 'remi-safe'; //($phpvers[$php] ? 'remi-safe' : 'remi-test'); // Dev version
                 $opt  = ""; //($phpvers[$php] ? '' : '--enablerepo=remi-test'); // Dev version
-- 
cgit