From 496ec28dae41dd244bc77f92d0bfda7927f56563 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Wed, 4 Sep 2019 22:46:11 +0200 Subject: [PATCH] fix(xdebug): fix xdebug package name --- php/map.jinja | 4 ++-- test/integration/default/controls/package_spec.rb | 4 ++++ test/salt/pillar/debian.sls | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/php/map.jinja b/php/map.jinja index 14ed704..0b4cb18 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -82,7 +82,7 @@ 'tcpdf': 'php-tcpdf', 'temp_dir': '/tmp', 'tidy': 'php' + php_version + '-tidy', - 'xdebug': 'php' + php_version + '-xdebug', + 'xdebug': 'php-xdebug', 'xml': ['php' + php_version + '-xml', 'php' + php_version + '-xmlrpc'], 'xsl': 'php' + php_version + '-xsl', 'zip': 'php' + php_version + '-zip', @@ -2264,7 +2264,7 @@ 'tcpdf': 'php-tcpdf', 'temp_dir': '/tmp', 'tidy': 'php' + php_version + '-tidy', - 'xdebug': 'php' + php_version + '-xdebug', + 'xdebug': 'php-xdebug', 'xml': ['php' + php_version + '-xml', 'php' + php_version + '-xmlrpc'], 'xsl': 'php' + php_version + '-xsl', 'zip': 'php' + php_version + '-zip', diff --git a/test/integration/default/controls/package_spec.rb b/test/integration/default/controls/package_spec.rb index ce385f7..860c92c 100644 --- a/test/integration/default/controls/package_spec.rb +++ b/test/integration/default/controls/package_spec.rb @@ -10,6 +10,10 @@ control 'Php package' 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 diff --git a/test/salt/pillar/debian.sls b/test/salt/pillar/debian.sls index 64cddd0..16b23a5 100644 --- a/test/salt/pillar/debian.sls +++ b/test/salt/pillar/debian.sls @@ -93,5 +93,6 @@ php: - mysql - readline - redis + - xdebug - xml - zip