diff --git a/php/map.jinja b/php/map.jinja index d7be3ea..45c341b 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -79,7 +79,7 @@ 'phpenmod_command': 'phpenmod -v' + php_version, 'pspell': 'php' + php_version + '-pspell', 'readline': 'php' + php_version + '-readline', - 'redis': 'php-redis', + 'redis': 'php' + php_version + '-redis', 'seclib': ['php-phpseclib', 'php-seclib'], 'snmp': 'php' + php_version + '-snmp', 'soap': 'php' + php_version + '-soap', @@ -772,7 +772,7 @@ 'php': 'php', 'phpenmod_command': 'phpenmod', 'pspell': 'php-pspell', - 'redis': 'php-redis', + 'redis': 'php' + php_version + '-redis', 'seclib': ['php-phpseclib', 'php-seclib'], 'snmp': 'php-snmp', 'soap': 'php-soap', @@ -1165,7 +1165,7 @@ 'php': 'php', 'phpenmod_command': 'phpenmod', 'pspell': 'php-pspell', - 'redis': 'php-redis', + 'redis': 'php' + php_version + '-redis', 'seclib': ['php-phpseclib', 'php-seclib'], 'snmp': 'php-snmp', 'soap': 'php-soap', @@ -1558,7 +1558,7 @@ 'php': 'php', 'phpenmod_command': 'phpenmod', 'pspell': 'php-pspell', - 'redis': 'php-redis', + 'redis': 'php' + php_version + '-redis', 'seclib': ['php-phpseclib', 'php-seclib'], 'snmp': 'php-snmp', 'soap': 'php-soap', @@ -2387,7 +2387,7 @@ 'phpenmod_command': 'phpenmod -v' + php_version, 'pspell': 'php' + php_version + '-pspell', 'readline': 'php' + php_version + '-readline', - 'redis': 'php-redis', + 'redis': 'php' + php_version + '-redis', 'seclib': ['php-phpseclib', 'php-seclib'], 'snmp': 'php' + php_version + '-snmp', 'soap': 'php' + php_version + '-soap', diff --git a/test/integration/default/controls/package_spec.rb b/test/integration/default/controls/package_spec.rb index 054663e..bd95cb8 100644 --- a/test/integration/default/controls/package_spec.rb +++ b/test/integration/default/controls/package_spec.rb @@ -9,17 +9,13 @@ control 'Php package' do it { should be_installed } end - describe package('php-redis') do - it { should be_installed } - end - describe package('php-xdebug') do it { should be_installed } end %w[ bz2 cli curl fpm gd imap intl mbstring - mysql readline xml zip + mysql readline redis xml zip ].each do |pkg| describe package("php5.6-#{pkg}") do it { should be_installed } diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 12cfba6..dd80480 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -344,7 +344,7 @@ values: phpenmod_command: phpenmod -v5.6 pspell: php5.6-pspell readline: php5.6-readline - redis: php-redis + redis: php5.6-redis seclib: - php-phpseclib - php-seclib diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 763acb3..0349ca8 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -344,7 +344,7 @@ values: phpenmod_command: phpenmod -v5.6 pspell: php5.6-pspell readline: php5.6-readline - redis: php-redis + redis: php5.6-redis seclib: - php-phpseclib - php-seclib diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 1fde2f6..58e5b1b 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -344,7 +344,7 @@ values: phpenmod_command: phpenmod -v5.6 pspell: php5.6-pspell readline: php5.6-readline - redis: php-redis + redis: php5.6-redis seclib: - php-phpseclib - php-seclib diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 8fd7e11..93009c2 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -342,7 +342,7 @@ values: phpenmod_command: phpenmod -v5.6 pspell: php5.6-pspell readline: php5.6-readline - redis: php-redis + redis: php5.6-redis seclib: - php-phpseclib - php-seclib diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 84d2339..6511a6c 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -342,7 +342,7 @@ values: phpenmod_command: phpenmod -v5.6 pspell: php5.6-pspell readline: php5.6-readline - redis: php-redis + redis: php5.6-redis seclib: - php-phpseclib - php-seclib diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index d5fc558..1073248 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -342,7 +342,7 @@ values: phpenmod_command: phpenmod -v5.6 pspell: php5.6-pspell readline: php5.6-readline - redis: php-redis + redis: php5.6-redis seclib: - php-phpseclib - php-seclib