Merge pull request #57 from sambauers/master

Remove version based PHP and PHP::FPM classes.

Author: mattheath

README.md

@@ -25,11 +25,11 @@ The following boxen modules are required if optional PHP extensions are used:
 
 ```puppet
 # Install php 5.4
-include php::5_4
+php::version { '5.4': }
 
 # Install a couple of specific minor versions
-include php::5_3_17
-include php::5_4_11
+php::version { '5.3.17': }
+php::version { '5.4.11': }
 
 # Install Composer globally on your PATH
 include php::composer
@@ -52,11 +52,11 @@ php::extension::apc { "apc for ${version}":
 }
 
 # Set up PHP-FPM as a service running a specific version of PHP
-include php::fpm::5_3_15
+php::fpm { '5.3.15': }
 
 # Run multiple PHP-FPM services
-include php::fpm::5_4_11
-include php::fpm::5_3_23
+php::fpm { '5.4.11': }
+php::fpm { '5.3.23': }
 
 # Spin up a PHP-FPM pool for a project
 # Ensures:

data/common.yaml

@@ -12,3 +12,7 @@ php::config::composer:
   checksum: '05df355b5277c8c9012470e699fa5494'
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
+php::config::secure_versions:
+  '5.6': '5.6.5'
+  '5.5': '5.5.20'
+  '5.4': '5.4.36'

lib/puppet/parser/functions/php_fpm_require.rb

@@ -0,0 +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] ] )
+  end
+end

lib/puppet/parser/functions/php_require.rb

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