Merge pull request #567 from coreyralph/zend-ext-enable

Fix enabling of zend extensions

Author: bastelfreak

manifests/extension/config.pp

@@ -112,19 +112,21 @@
 
     if $facts['os']['family'] == 'Debian' and $ext_tool_enabled {
       $cmd = "${ext_tool_enable} -s ${sapi} ${so_name}"
+      $execname = "ext_tool_enable_${so_name}"
 
       $_sapi = $sapi? {
         'ALL' => 'cli',
         default => $sapi,
       }
-      if has_key($final_settings, 'extension') and $final_settings[extension] {
-        exec { $cmd:
+      if has_key($final_settings, $extension_key) and $final_settings[$extension_key] {
+        exec { $execname:
+          command => $cmd,
           onlyif  => "${ext_tool_query} -s ${_sapi} -m ${so_name} | /bin/grep 'No module matches ${so_name}'",
           require => ::Php::Config[$title],
         }
 
         if $php::fpm {
-          Package[$php::fpm::package] ~> Exec[$cmd]
+          Package[$php::fpm::package] ~> Exec[$execname]
         }
       }
     }

spec/defines/extension_spec.rb

@@ -189,6 +189,21 @@
           it { is_expected.to contain_php__config('xdebug').with_config('zend_extension' => '/usr/lib/php5/20100525/xdebug.so') }
         end
 
+        if facts[:os]['family'] == 'Debian'
+          context 'on Debian family' do
+            context 'zend extensions call ext_tool_enable' do
+              let(:title) { 'xdebug' }
+              let(:params) do
+                {
+                  zend: true
+                }
+              end
+
+              it { is_expected.to contain_exec('ext_tool_enable_xdebug') }
+            end
+          end
+        end
+
         case facts[:os]['name']
         when 'Debian'
           context 'on Debian' do