Merge pull request #2333 from polatsinan/fix_mod_php_8

Fix RedHat + PHP 8 libphp file

Author: david22swan

manifests/mod/php.pp

@@ -93,7 +93,7 @@
   $_php_version_no_dot = regsubst($php_version, '\.', '')
   if $apache::version::scl_httpd_version {
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
-  } elsif ($facts['os']['family'] == 'RedHat') and ($_php_major == 8) {
+  } elsif ($facts['os']['family'] == 'RedHat') and (versioncmp($php_version, '8') >= 0) {
     # RedHat + PHP 8 drop the major version in apache module name.
     $_lib = "${libphp_prefix}.so"
   } else {

spec/classes/mod/php_spec.rb

@@ -111,6 +111,15 @@
               elsif facts[:os]['release']['major'].to_i == 8
                 it { is_expected.to contain_apache__mod('php7') }
                 it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") }
+
+                context 'with php8.0' do
+                  let :params do
+                    { php_version: '8.0' }
+                  end
+
+                  it { is_expected.to contain_apache__mod('php') }
+                  it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }
+                end
               elsif facts[:os]['release']['major'].to_i >= 9
                 it { is_expected.to contain_apache__mod('php') }
                 it { is_expected.to contain_file('php.load').with(content: "LoadModule php_module modules/libphp.so\n") }