From ef0957ce9b0fca020049960835a9f46f057aee17 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 25 Feb 2023 20:02:41 +0100 Subject: [PATCH] fix(suse): update to php8 Modern openSUSE distributions no longer ship PHP 5 - set defaults to PHP 8 instead. Signed-off-by: Georg Pfuetzenreuter --- docs/README.rst | 2 +- php/map.jinja | 46 ++++++++--------- .../default/controls/package_spec.rb | 2 +- .../default/files/_mapdata/opensuse-15.yaml | 50 +++++++++---------- .../files/_mapdata/opensuse-tumbleweed.yaml | 50 +++++++++---------- test/salt/pillar/suse.sls | 2 +- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/README.rst b/docs/README.rst index d20a266..adb2051 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -140,7 +140,7 @@ Installs the php-cache-lite package. ^^^^^^^^^^^^^^ Installs the php-cgi package. -Disabled on opensuse only php5-fastcgi available. +Disabled on openSUSE, as there is only php-fastcgi available. ``php.cli`` ^^^^^^^^^^^^^^ diff --git a/php/map.jinja b/php/map.jinja index 6915fce..64c1a3a 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -3000,29 +3000,29 @@ }, 'Suse': { 'pkgs': { - 'adodb': 'php5-dba', - 'apache2': 'apache2-mod_php5', - 'cli': 'php5', - 'curl': 'php5-curl', - 'fpm': 'php5-fpm', - 'gd': 'php5-gd', - 'imap': 'php5-imap', - 'intl': 'php5-intl', - 'json': 'php5-json', - 'ldap': 'php5-ldap', - 'mbstring': 'php5-mbstring', - 'mcrypt': 'php5-mcrypt', - 'mysql': 'php5-mysql', - 'oauth': 'php5-oauth', - 'pear': 'php5-pear', - 'pgsql': 'php5-pgsql', - 'php': 'php5', - 'snmp': 'php5-snmp', - 'soap': 'php5-soap', - 'sqlite': 'php5-sqlite', - 'suhosin': 'php5-suhosin', - 'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'], - 'zip': 'php5-zip', + 'adodb': 'php8-dba', + 'apache2': 'apache2-mod_php8', + 'cli': 'php8', + 'curl': 'php8-curl', + 'fpm': 'php8-fpm', + 'gd': 'php8-gd', + 'imap': 'php8-imap', + 'intl': 'php8-intl', + 'json': 'php8-json', + 'ldap': 'php8-ldap', + 'mbstring': 'php8-mbstring', + 'mcrypt': 'php8-mcrypt', + 'mysql': 'php8-mysql', + 'oauth': 'php8-oauth', + 'pear': 'php8-pear', + 'pgsql': 'php8-pgsql', + 'php': 'php8', + 'snmp': 'php8-snmp', + 'soap': 'php8-soap', + 'sqlite': 'php8-sqlite', + 'suhosin': 'php8-suhosin', + 'xml': ['php8-xmlreader','php8-xmlwriter','php8-xmlrpc'], + 'zip': 'php8-zip', }, 'fpm': { 'conf': '/etc/php-fpm.conf', diff --git a/test/integration/default/controls/package_spec.rb b/test/integration/default/controls/package_spec.rb index bd95cb8..e5b0602 100644 --- a/test/integration/default/controls/package_spec.rb +++ b/test/integration/default/controls/package_spec.rb @@ -35,7 +35,7 @@ control 'Php package' do end def test_suse - describe package('php7') do + describe package('php8') do it { should be_installed } end end diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index a7a1f55..64daba9 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -213,32 +213,32 @@ values: service: php-fpm user: root pkgs: - adodb: php5-dba - apache2: apache2-mod_php5 - cli: php5 - curl: php5-curl - fpm: php5-fpm - gd: php5-gd - imap: php5-imap - intl: php5-intl - json: php5-json - ldap: php5-ldap - mbstring: php5-mbstring - mcrypt: php5-mcrypt - mysql: php5-mysql - oauth: php5-oauth - pear: php5-pear - pgsql: php5-pgsql - php: php7 - snmp: php5-snmp - soap: php5-soap - sqlite: php5-sqlite - suhosin: php5-suhosin + adodb: php8-dba + apache2: apache2-mod_php8 + cli: php8 + curl: php8-curl + fpm: php8-fpm + gd: php8-gd + imap: php8-imap + intl: php8-intl + json: php8-json + ldap: php8-ldap + mbstring: php8-mbstring + mcrypt: php8-mcrypt + mysql: php8-mysql + oauth: php8-oauth + pear: php8-pear + pgsql: php8-pgsql + php: php8 + snmp: php8-snmp + soap: php8-soap + sqlite: php8-sqlite + suhosin: php8-suhosin xml: - - php5-xmlreader - - php5-xmlwriter - - php5-xmlrpc - zip: php5-zip + - php8-xmlreader + - php8-xmlwriter + - php8-xmlrpc + zip: php8-zip xcache: ini: defaults: diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 202fe0d..c13511e 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -213,32 +213,32 @@ values: service: php-fpm user: root pkgs: - adodb: php5-dba - apache2: apache2-mod_php5 - cli: php5 - curl: php5-curl - fpm: php5-fpm - gd: php5-gd - imap: php5-imap - intl: php5-intl - json: php5-json - ldap: php5-ldap - mbstring: php5-mbstring - mcrypt: php5-mcrypt - mysql: php5-mysql - oauth: php5-oauth - pear: php5-pear - pgsql: php5-pgsql - php: php7 - snmp: php5-snmp - soap: php5-soap - sqlite: php5-sqlite - suhosin: php5-suhosin + adodb: php8-dba + apache2: apache2-mod_php8 + cli: php8 + curl: php8-curl + fpm: php8-fpm + gd: php8-gd + imap: php8-imap + intl: php8-intl + json: php8-json + ldap: php8-ldap + mbstring: php8-mbstring + mcrypt: php8-mcrypt + mysql: php8-mysql + oauth: php8-oauth + pear: php8-pear + pgsql: php8-pgsql + php: php8 + snmp: php8-snmp + soap: php8-soap + sqlite: php8-sqlite + suhosin: php8-suhosin xml: - - php5-xmlreader - - php5-xmlwriter - - php5-xmlrpc - zip: php5-zip + - php8-xmlreader + - php8-xmlwriter + - php8-xmlrpc + zip: php8-zip xcache: ini: defaults: diff --git a/test/salt/pillar/suse.sls b/test/salt/pillar/suse.sls index 1f41501..7bd6a4c 100644 --- a/test/salt/pillar/suse.sls +++ b/test/salt/pillar/suse.sls @@ -4,4 +4,4 @@ php: lookup: pkgs: - php: php7 + php: php8