Merge pull request #69 from sambauers/master

Fix php_require function, bump PHP secure versions.

Author: mattheath

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.1 ##
+
+* Composer updated to 1.0.0-alpha10 (@alexmace)
+* Add pspell extension (@alexmace)
+* Fix bug in `php_require` and `php_fpm_require` functions (@sambauers)
+
 ## 2.0.0 ##
 
 * Use Hiera for configs

data/common.yaml

@@ -13,7 +13,7 @@ php::config::composer:
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.8'
-  '5.5': '5.5.24'
-  '5.4': '5.4.40'
+  '5.6': '5.6.9'
+  '5.5': '5.5.25'
+  '5.4': '5.4.41'
 php::config::secure_warning:    true

lib/puppet/parser/functions/php_fpm_require.rb

@@ -1,6 +1,6 @@
 module Puppet::Parser::Functions
   newfunction(:php_fpm_require) do |args|
     Puppet::Parser::Functions.function('ensure_resource')
-    function_ensure_resource( [ 'php::fpm', args[0] ] )
+    function_ensure_resource( [ 'php::fpm', args[0], {'ensure' => 'present'} ] )
   end
 end

lib/puppet/parser/functions/php_require.rb

@@ -1,6 +1,6 @@
 module Puppet::Parser::Functions
   newfunction(:php_require) do |args|
     Puppet::Parser::Functions.function('ensure_resource')
-    function_ensure_resource( [ 'php::version', args[0] ] )
+    function_ensure_resource( [ 'php::version', args[0], {'ensure' => 'present'} ] )
   end
 end

spec/fixtures/hiera/test.yaml

@@ -13,7 +13,7 @@ php::config::composer:
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.7'
-  '5.5': '5.5.23'
-  '5.4': '5.4.39'
+  '5.6': '5.6.9'
+  '5.5': '5.5.25'
+  '5.4': '5.4.41'
 php::config::secure_warning:    true