From cc0940b7b9dc491141eb7870894f4eda115b44d0 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:45:32 +1100
Subject: [PATCH 01/57] Create 5_5_18.pp

---
 manifests/5_5_18.pp | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 manifests/5_5_18.pp

diff --git a/manifests/5_5_18.pp b/manifests/5_5_18.pp
new file mode 100644
index 0000000..2b69919
--- /dev/null
+++ b/manifests/5_5_18.pp
@@ -0,0 +1,8 @@
+# Installs php 5.5.18
+#
+# Usage:
+#
+#     include php::5_5_18
+class php::5_5_18 {
+  php::version { '5.5.18': }
+}

From cdc180ff56b2cecf28b7f2d259cd6ce717c5c04a Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:46:45 +1100
Subject: [PATCH 02/57] Create 5_5_18.pp

---
 manifests/fpm/5_5_18.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 manifests/fpm/5_5_18.pp

diff --git a/manifests/fpm/5_5_18.pp b/manifests/fpm/5_5_18.pp
new file mode 100644
index 0000000..20a3dd2
--- /dev/null
+++ b/manifests/fpm/5_5_18.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.18
+# Installs PHP 5.5.18 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_18
+#
+class php::fpm::5_5_18 {
+  php::fpm { '5.5.18': }
+}

From f37fd571405b8d4353019d3bdf87b65750d5b10c Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:51:02 +1100
Subject: [PATCH 03/57] Create php_5_5_18_spec.rb

---
 spec/classes/php_5_5_18_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 spec/classes/php_5_5_18_spec.rb

diff --git a/spec/classes/php_5_5_18_spec.rb b/spec/classes/php_5_5_18_spec.rb
new file mode 100644
index 0000000..f2f48ac
--- /dev/null
+++ b/spec/classes/php_5_5_18_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_5_18" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.5.18")
+  end
+end

From e0eb7b480d430f77e1327d075cf6e3c22c8b4991 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:51:42 +1100
Subject: [PATCH 04/57] Create php_fpm_5_5_18_spec.rb

---
 spec/classes/fpm/php_fpm_5_5_18_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 spec/classes/fpm/php_fpm_5_5_18_spec.rb

diff --git a/spec/classes/fpm/php_fpm_5_5_18_spec.rb b/spec/classes/fpm/php_fpm_5_5_18_spec.rb
new file mode 100644
index 0000000..bfbc605
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_5_18_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_18" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.18")
+  end
+end

From df11db85a9a4f3fd4eda1b588ff4728637918abe Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 23:04:11 +1100
Subject: [PATCH 05/57] Allow configure params on PHP builds.

---
 lib/puppet/provider/php_version/php_source.rb |  2 ++
 lib/puppet/type/php_version.rb                |  4 ++++
 manifests/version.pp                          | 20 ++++++++++---------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 96bf543..26aab75 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -269,6 +269,8 @@ def get_configure_args(version, install_path, config_path)
     # PHP-FPM isn't available until 5.3.3
     args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
 
+    args << @resource[:configure_params]
+
     args
   end
 
diff --git a/lib/puppet/type/php_version.rb b/lib/puppet/type/php_version.rb
index 24f65d3..9678779 100644
--- a/lib/puppet/type/php_version.rb
+++ b/lib/puppet/type/php_version.rb
@@ -34,4 +34,8 @@
 
   newparam(:user_home) do
   end
+
+  newparam(:configure_params) do
+    defaultto ''
+  end
 end
diff --git a/manifests/version.pp b/manifests/version.pp
index 68af67f..974d135 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -11,8 +11,9 @@
 #     include php::5_3_20
 #
 define php::version(
-  $ensure    = 'installed',
-  $version   = $name
+  $ensure           = 'installed',
+  $version          = $name,
+  $configure_params = ''
 ) {
   require php
   include boxen::config
@@ -98,12 +99,12 @@
     # Install PHP!
 
     php_version { $version:
-      user          => $::boxen_user,
-      user_home     => "/Users/${::boxen_user}",
-      phpenv_root   => $php::config::root,
-      version       => $version,
-      homebrew_path => $boxen::config::homebrewdir,
-      require       => [
+      user              => $::boxen_user,
+      user_home         => "/Users/${::boxen_user}",
+      phpenv_root       => $php::config::root,
+      version           => $version,
+      homebrew_path     => $boxen::config::homebrewdir,
+      require           => [
         Repository["${php::config::root}/php-src"],
         Package['gettext'],
         Package['boxen/brews/freetypephp'],
@@ -116,7 +117,8 @@
         Package['autoconf'],
         Package['boxen/brews/autoconf213'],
       ],
-      notify        => Exec["phpenv-rehash-post-install-${version}"],
+      notify            => Exec["phpenv-rehash-post-install-${version}"],
+      configure_params  => $configure_params,
     }
 
     # Fix permissions for php versions installed prior to 0.3.5 of this module

From fca0cfbf03de9265c28e070dd7641286d438c32e Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Sat, 8 Nov 2014 11:37:23 +1100
Subject: [PATCH 06/57] Move config to Hiera, allow additional configure flags
 per PHP version via Hiera, add pthreads extension.

---
 data/common.yaml                              |  9 +++
 data/hiera.yaml                               |  3 +
 lib/puppet/provider/php_version/php_source.rb |  1 +
 manifests/config.pp                           | 21 ++---
 manifests/extension/pthreads.pp               | 52 +++++++++++++
 manifests/init.pp                             | 78 ++++++++++++++-----
 manifests/version.pp                          | 13 ++--
 7 files changed, 141 insertions(+), 36 deletions(-)
 create mode 100644 data/common.yaml
 create mode 100644 data/hiera.yaml
 create mode 100644 manifests/extension/pthreads.pp

diff --git a/data/common.yaml b/data/common.yaml
new file mode 100644
index 0000000..74e07dd
--- /dev/null
+++ b/data/common.yaml
@@ -0,0 +1,9 @@
+---
+php::root:              "%{::boxen::config::home}/phpenv"
+php::logdir:            "%{::boxen::config::logdir}/php"
+php::configdir:         "%{::boxen::config::configdir}/php"
+php::datadir:           "%{::boxen::config::datadir}/php"
+php::pluginsdir:        "%{php::root}/plugins"
+php::cachedir:          "%{php::datadir}/cache"
+php::extensioncachedir: "%{php::datadir}/cache/extensions"
+php::configure_params:  {}
diff --git a/data/hiera.yaml b/data/hiera.yaml
new file mode 100644
index 0000000..7e5202d
--- /dev/null
+++ b/data/hiera.yaml
@@ -0,0 +1,3 @@
+---
+:hierarchy:
+  - common
diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 26aab75..53e9b5d 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -269,6 +269,7 @@ def get_configure_args(version, install_path, config_path)
     # PHP-FPM isn't available until 5.3.3
     args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
 
+    # User specified configure params
     args << @resource[:configure_params]
 
     args
diff --git a/manifests/config.pp b/manifests/config.pp
index 3bb8d1c..2b4f67b 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -4,14 +4,15 @@
 #
 #     include php::config
 #
-class php::config {
-  require boxen::config
-
-  $root              = "${boxen::config::home}/phpenv"
-  $logdir            = "${boxen::config::logdir}/php"
-  $configdir         = "${boxen::config::configdir}/php"
-  $datadir           = "${boxen::config::datadir}/php"
-  $pluginsdir        = "${root}/plugins"
-  $cachedir          = "${php::config::datadir}/cache"
-  $extensioncachedir = "${php::config::datadir}/cache/extensions"
+class php::config(
+  $root               = undef,
+  $logdir             = undef,
+  $configdir          = undef,
+  $datadir            = undef,
+  $pluginsdir         = undef,
+  $cachedir           = undef,
+  $extensioncachedir  = undef,
+  $configure_params   = undef,
+) {
+  include boxen::config
 }
diff --git a/manifests/extension/pthreads.pp b/manifests/extension/pthreads.pp
new file mode 100644
index 0000000..36aa478
--- /dev/null
+++ b/manifests/extension/pthreads.pp
@@ -0,0 +1,52 @@
+# Installs the pthreads extension for a specific version of php.
+#
+# Requires PHP to be built with thread safety, add:
+#
+#     php::configure_params:
+#       5.5.18: '--enable-maintainer-zts'
+#
+# or similar to Hiera configs in your Boxen repo (adjust for your version).
+#
+# Usage:
+#
+#     php::extension::pthreads { 'pthreads for 5.5.18':
+#       php     => '5.5.18',
+#       version => '2.0.10'
+#     }
+#
+define php::extension::pthreads(
+  $php,
+  $version = '2.0.10',
+) {
+  require php::config
+
+  # Require php version eg. php::5_4_10
+  # This will compile, install and set up config dirs if not present
+  require join(['php', join(split($php, '[.]'), '_')], '::')
+
+  $extension = 'pthreads'
+  $package_name = "pthreads-${version}"
+  $url = "http://pecl.php.net/get/pthreads-${version}.tgz"
+
+  # Final module install path
+  $module_path = "${php::config::root}/versions/${php}/modules/${extension}.so"
+
+  php_extension { $name:
+    extension        => $extension,
+    version          => $version,
+    package_name     => $package_name,
+    package_url      => $url,
+    homebrew_path    => $boxen::config::homebrewdir,
+    phpenv_root      => $php::config::root,
+    php_version      => $php,
+    provider         => pecl,
+  }
+
+  # Add config file once extension is installed
+
+  file { "${php::config::configdir}/${php}/conf.d/${extension}.ini":
+    content => template('php/extensions/generic.ini.erb'),
+    require => Php_extension[$name],
+  }
+
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 828d74e..c7114dd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,8 +6,44 @@
 #
 #     include php
 #
-class php {
-  require php::config
+
+class php(
+  $root               = undef,
+  $logdir             = undef,
+  $configdir          = undef,
+  $datadir            = undef,
+  $pluginsdir         = undef,
+  $cachedir           = undef,
+  $extensioncachedir  = undef,
+  $configure_params   = undef,
+) {
+  include boxen::config
+
+  validate_string(
+    $root,
+    $logdir,
+    $configdir,
+    $datadir,
+    $pluginsdir,
+    $cachedir,
+    $extensioncachedir,
+  )
+
+  validate_hash(
+    $configure_params
+  )
+
+  class { 'php::config':
+    root              => $root,
+    logdir            => $logdir,
+    configdir         => $configdir,
+    datadir           => $datadir,
+    pluginsdir        => $pluginsdir,
+    cachedir          => $cachedir,
+    extensioncachedir => $extensioncachedir,
+    configure_params  => $configure_params,
+  }
+
   require homebrew
   include wget
   include stdlib
@@ -24,12 +60,12 @@
 
   file {
     [
-      $php::config::root,
-      $php::config::logdir,
-      $php::config::datadir,
-      $php::config::pluginsdir,
-      $php::config::cachedir,
-      $php::config::extensioncachedir,
+      $root,
+      $logdir,
+      $datadir,
+      $pluginsdir,
+      $cachedir,
+      $extensioncachedir,
     ]:
     ensure => directory
   }
@@ -37,7 +73,7 @@
   # Ensure we only have config files managed by Boxen
   # to prevent any conflicts by shipping a (nearly) empty
   # dir, and recursively purging
-  file { $php::config::configdir:
+  file { $configdir:
     ensure  => directory,
     recurse => true,
     purge   => true,
@@ -47,11 +83,11 @@
 
   file {
     [
-      "${php::config::root}/phpenv.d",
-      "${php::config::root}/phpenv.d/install",
-      "${php::config::root}/shims",
-      "${php::config::root}/versions",
-      "${php::config::root}/libexec",
+      "${root}/phpenv.d",
+      "${root}/phpenv.d/install",
+      "${root}/shims",
+      "${root}/versions",
+      "${root}/libexec",
     ]:
       ensure  => directory,
       require => Exec['phpenv-setup-root-repo'];
@@ -125,10 +161,10 @@
 
   exec { 'phpenv-setup-root-repo':
     command => "${git_init} && ${git_remote} && ${git_fetch} && ${git_reset}",
-    cwd     => $php::config::root,
-    creates => "${php::config::root}/bin/phpenv",
+    cwd     => $root,
+    creates => "${root}/bin/phpenv",
     require => [
-      File[$php::config::root],
+      File[$root],
       Class['git'],
     ]
   }
@@ -136,22 +172,22 @@
   exec { "ensure-phpenv-version-${phpenv_version}":
     command => "${git_fetch} && git reset --hard ${phpenv_version}",
     unless  => "git rev-parse HEAD | grep ${phpenv_version}",
-    cwd     => $php::config::root,
+    cwd     => $root,
     require => Exec['phpenv-setup-root-repo']
   }
 
   # Cache the PHP src repository we'll need this for extensions
   # and at some point building versions #todo
-  repository { "${php::config::root}/php-src":
+  repository { "${root}/php-src":
     source => 'php/php-src',
   }
 
   # Shared PEAR data directory - used for downloads & cache
-  file { "${php::config::datadir}/pear":
+  file { "${datadir}/pear":
     ensure  => directory,
     owner   => $::boxen_user,
     group   => 'staff',
-    require => File[$php::config::datadir],
+    require => File[$datadir],
   }
 
   # Kill off the legacy PHP-FPM daemon as we're moving to per version instances
diff --git a/manifests/version.pp b/manifests/version.pp
index 974d135..2af084e 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -11,13 +11,10 @@
 #     include php::5_3_20
 #
 define php::version(
-  $ensure           = 'installed',
-  $version          = $name,
-  $configure_params = ''
+  $ensure   = 'installed',
+  $version  = $name
 ) {
   require php
-  include boxen::config
-  include mysql::config
 
   # Install location
   $dest = "${php::config::root}/versions/${version}"
@@ -98,6 +95,12 @@
 
     # Install PHP!
 
+    # Get any additional configure params
+    $test_params = $php::config::configure_params
+    if is_hash($test_params) and has_key($test_params, $version) {
+      $configure_params = $test_params[$version]
+    }
+
     php_version { $version:
       user              => $::boxen_user,
       user_home         => "/Users/${::boxen_user}",

From c31753018e1f5800b9471acc19c35aaa2e44d21f Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:15:12 +1100
Subject: [PATCH 07/57] Make config the reciever of config vars from Hiera.

---
 data/common.yaml    | 16 +++++-----
 manifests/config.pp | 14 +++++++++
 manifests/init.pp   | 73 +++++++++++++--------------------------------
 3 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 74e07dd..2b8d54c 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,9 +1,9 @@
 ---
-php::root:              "%{::boxen::config::home}/phpenv"
-php::logdir:            "%{::boxen::config::logdir}/php"
-php::configdir:         "%{::boxen::config::configdir}/php"
-php::datadir:           "%{::boxen::config::datadir}/php"
-php::pluginsdir:        "%{php::root}/plugins"
-php::cachedir:          "%{php::datadir}/cache"
-php::extensioncachedir: "%{php::datadir}/cache/extensions"
-php::configure_params:  {}
+php::config::root:              "%{::boxen::config::home}/phpenv"
+php::config::logdir:            "%{::boxen::config::logdir}/php"
+php::config::configdir:         "%{::boxen::config::configdir}/php"
+php::config::datadir:           "%{::boxen::config::datadir}/php"
+php::config::pluginsdir:        "%{php::config::root}/plugins"
+php::config::cachedir:          "%{php::config::datadir}/cache"
+php::config::extensioncachedir: "%{php::config::datadir}/cache/extensions"
+php::config::configure_params:  {}
diff --git a/manifests/config.pp b/manifests/config.pp
index 2b4f67b..35b4a66 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -15,4 +15,18 @@
   $configure_params   = undef,
 ) {
   include boxen::config
+
+  validate_string(
+    $root,
+    $logdir,
+    $configdir,
+    $datadir,
+    $pluginsdir,
+    $cachedir,
+    $extensioncachedir,
+  )
+
+  # validate_hash(
+  #   $configure_params
+  # )
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index c7114dd..201c9d2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,41 +8,8 @@
 #
 
 class php(
-  $root               = undef,
-  $logdir             = undef,
-  $configdir          = undef,
-  $datadir            = undef,
-  $pluginsdir         = undef,
-  $cachedir           = undef,
-  $extensioncachedir  = undef,
-  $configure_params   = undef,
 ) {
-  include boxen::config
-
-  validate_string(
-    $root,
-    $logdir,
-    $configdir,
-    $datadir,
-    $pluginsdir,
-    $cachedir,
-    $extensioncachedir,
-  )
-
-  validate_hash(
-    $configure_params
-  )
-
-  class { 'php::config':
-    root              => $root,
-    logdir            => $logdir,
-    configdir         => $configdir,
-    datadir           => $datadir,
-    pluginsdir        => $pluginsdir,
-    cachedir          => $cachedir,
-    extensioncachedir => $extensioncachedir,
-    configure_params  => $configure_params,
-  }
+  include php::config
 
   require homebrew
   include wget
@@ -60,12 +27,12 @@
 
   file {
     [
-      $root,
-      $logdir,
-      $datadir,
-      $pluginsdir,
-      $cachedir,
-      $extensioncachedir,
+      $php::config::root,
+      $php::config::logdir,
+      $php::config::datadir,
+      $php::config::pluginsdir,
+      $php::config::cachedir,
+      $php::config::extensioncachedir,
     ]:
     ensure => directory
   }
@@ -73,7 +40,7 @@
   # Ensure we only have config files managed by Boxen
   # to prevent any conflicts by shipping a (nearly) empty
   # dir, and recursively purging
-  file { $configdir:
+  file { $php::config::configdir:
     ensure  => directory,
     recurse => true,
     purge   => true,
@@ -83,11 +50,11 @@
 
   file {
     [
-      "${root}/phpenv.d",
-      "${root}/phpenv.d/install",
-      "${root}/shims",
-      "${root}/versions",
-      "${root}/libexec",
+      "${php::config::root}/phpenv.d",
+      "${php::config::root}/phpenv.d/install",
+      "${php::config::root}/shims",
+      "${php::config::root}/versions",
+      "${php::config::root}/libexec",
     ]:
       ensure  => directory,
       require => Exec['phpenv-setup-root-repo'];
@@ -161,10 +128,10 @@
 
   exec { 'phpenv-setup-root-repo':
     command => "${git_init} && ${git_remote} && ${git_fetch} && ${git_reset}",
-    cwd     => $root,
-    creates => "${root}/bin/phpenv",
+    cwd     => $php::config::root,
+    creates => "${php::config::root}/bin/phpenv",
     require => [
-      File[$root],
+      File[$php::config::root],
       Class['git'],
     ]
   }
@@ -172,22 +139,22 @@
   exec { "ensure-phpenv-version-${phpenv_version}":
     command => "${git_fetch} && git reset --hard ${phpenv_version}",
     unless  => "git rev-parse HEAD | grep ${phpenv_version}",
-    cwd     => $root,
+    cwd     => $php::config::root,
     require => Exec['phpenv-setup-root-repo']
   }
 
   # Cache the PHP src repository we'll need this for extensions
   # and at some point building versions #todo
-  repository { "${root}/php-src":
+  repository { "${php::config::root}/php-src":
     source => 'php/php-src',
   }
 
   # Shared PEAR data directory - used for downloads & cache
-  file { "${datadir}/pear":
+  file { "${php::config::datadir}/pear":
     ensure  => directory,
     owner   => $::boxen_user,
     group   => 'staff',
-    require => File[$datadir],
+    require => File[$php::config::datadir],
   }
 
   # Kill off the legacy PHP-FPM daemon as we're moving to per version instances

From cbd9e6bae541e19f9eb7b817455230461c33c345 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:22:58 +1100
Subject: [PATCH 08/57] Add validate_hash back into config class.

---
 manifests/config.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 35b4a66..62b9e7e 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -26,7 +26,7 @@
     $extensioncachedir,
   )
 
-  # validate_hash(
-  #   $configure_params
-  # )
+  validate_hash(
+    $configure_params
+  )
 }

From fdf813e9a71fca4e1665fa450f823e500bca0a92 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:29:19 +1100
Subject: [PATCH 09/57] Fully revert init PHP class.

---
 manifests/init.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 201c9d2..9222afa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,9 +7,8 @@
 #     include php
 #
 
-class php(
-) {
-  include php::config
+class php {
+  require php::config
 
   require homebrew
   include wget

From f236664419abc872b71c8041d8487a6099739406 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:30:47 +1100
Subject: [PATCH 10/57] Tidy up instructions in PThreads extension.

---
 manifests/extension/pthreads.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/extension/pthreads.pp b/manifests/extension/pthreads.pp
index 36aa478..fa606b2 100644
--- a/manifests/extension/pthreads.pp
+++ b/manifests/extension/pthreads.pp
@@ -2,7 +2,7 @@
 #
 # Requires PHP to be built with thread safety, add:
 #
-#     php::configure_params:
+#     php::config::configure_params:
 #       5.5.18: '--enable-maintainer-zts'
 #
 # or similar to Hiera configs in your Boxen repo (adjust for your version).

From d459d4d1b33024b033bbfccb35b4e3fbcd3bb646 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 15:38:27 +1100
Subject: [PATCH 11/57] Update cardboard to 2.1.0, switch out deprecated specs
 causing errors, move spec config to Hiera.

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  | 111 +++++++++---------
 manifests/version.pp                          |   1 +
 spec/classes/fpm/php_fpm_fastcgi_spec.rb      |   2 +-
 spec/classes/php_5_3_spec.rb                  |   4 +-
 spec/classes/php_5_4_spec.rb                  |   4 +-
 spec/classes/php_composer_spec.rb             |   2 +-
 spec/classes/php_config_spec.rb               |   2 +-
 spec/classes/php_global_spec.rb               |   4 +-
 spec/classes/php_spec.rb                      |  18 +--
 .../extensions/php_extension_apc_spec.rb      |   4 +-
 .../php_extension_couchbase_spec.rb           |   6 +-
 .../extensions/php_extension_imagick_spec.rb  |   6 +-
 .../extensions/php_extension_intl_spec.rb     |   4 +-
 .../extensions/php_extension_mcrypt_spec.rb   |   4 +-
 .../php_extension_memcached_spec.rb           |   8 +-
 .../extensions/php_extension_mssql_spec.rb    |   6 +-
 .../php_extension_pdo_dblib_spec.rb           |   6 +-
 .../php_extension_pecl_http_spec.rb           |   6 +-
 .../extensions/php_extension_pgsql_spec.rb    |   4 +-
 .../extensions/php_extension_redis_spec.rb    |   6 +-
 .../extensions/php_extension_xdebug_spec.rb   |   4 +-
 .../extensions/php_extension_xhprof_spec.rb   |   4 +-
 .../extensions/php_extension_zmq_spec.rb      |   6 +-
 .../php_extension_zookeeper_spec.rb           |   8 +-
 spec/defines/fpm/php_fpm_pool_spec.rb         |   4 +-
 spec/defines/fpm/php_fpm_service_spec.rb      |   6 +-
 spec/defines/php_fpm_spec.rb                  |   2 +-
 spec/defines/php_local_spec.rb                |   6 +-
 spec/defines/php_project_spec.rb              |  46 ++++----
 spec/defines/php_version_spec.rb              |   4 +-
 spec/fixtures/Puppetfile                      |   1 +
 spec/fixtures/Puppetfile.lock                 |   6 +
 spec/fixtures/hiera/hiera.yaml                |   6 +
 spec/fixtures/hiera/test.yaml                 |   9 ++
 spec/spec_helper.rb                           |   3 +
 36 files changed, 178 insertions(+), 147 deletions(-)
 create mode 100644 spec/fixtures/hiera/hiera.yaml
 create mode 100644 spec/fixtures/hiera/test.yaml

diff --git a/Gemfile b/Gemfile
index b35fba7..acf5f45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard", "~> 2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index f63f5ca..71e2460 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,75 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    CFPropertyList (2.2.8)
+    addressable (2.3.6)
     ansi (1.4.3)
-    boxen (1.5.2)
+    boxen (2.7.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+      librarian-puppet (~> 1.0.0)
+      octokit (~> 2.7, >= 2.7.1)
+      puppet (~> 3.7)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
-    diff-lcs (1.2.4)
-    facter (1.7.2)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    hiera (1.2.1)
+      rspec-puppet (~> 1.0)
+    diff-lcs (1.2.5)
+    facter (2.3.0)
+      CFPropertyList (~> 2.2.6)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.19)
-    json (1.8.0)
-    json_pure (1.8.0)
-    librarian-puppet (0.9.10)
-      json
+    highline (1.6.21)
+    json (1.8.1)
+    json_pure (1.8.1)
+    librarian (0.1.2)
+      highline
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    librarian-puppet (1.0.9)
+      json
+      librarian (>= 0.1.2)
+    metaclass (0.0.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.25.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.2.4)
-      facter (~> 1.6)
+    multipart-post (2.0.0)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    puppet (3.7.3)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6.5)
+      json_pure
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-syntax (1.3.0)
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.0)
-    rgen (0.6.5)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-puppet (0.1.6)
+    puppetlabs_spec_helper (0.8.2)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec
+      rspec-puppet
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-puppet (1.0.1)
       rspec
-    thor (0.18.1)
+    rspec-support (3.1.2)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)
diff --git a/manifests/version.pp b/manifests/version.pp
index 2af084e..ef20256 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -15,6 +15,7 @@
   $version  = $name
 ) {
   require php
+  include mysql::config
 
   # Install location
   $dest = "${php::config::root}/versions/${version}"
diff --git a/spec/classes/fpm/php_fpm_fastcgi_spec.rb b/spec/classes/fpm/php_fpm_fastcgi_spec.rb
index 3c8fbfe..7580217 100644
--- a/spec/classes/fpm/php_fpm_fastcgi_spec.rb
+++ b/spec/classes/fpm/php_fpm_fastcgi_spec.rb
@@ -4,7 +4,7 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("nginx::config")
+    should contain_class("nginx::config")
 
     should contain_file("/test/boxen/config/nginx/fastcgi_params").with({
       :source  => 'puppet:///modules/php/nginx_fastcgi_params',
diff --git a/spec/classes/php_5_3_spec.rb b/spec/classes/php_5_3_spec.rb
index e58e976..329ff93 100644
--- a/spec/classes/php_5_3_spec.rb
+++ b/spec/classes/php_5_3_spec.rb
@@ -4,8 +4,8 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("php")
-    should include_class("php::5_3_27")
+    should contain_class("php")
+    should contain_class("php::5_3_27")
 
     should contain_file("/test/boxen/phpenv/versions/5.3").with({
       :ensure => "symlink",
diff --git a/spec/classes/php_5_4_spec.rb b/spec/classes/php_5_4_spec.rb
index 0e1eec3..ad52feb 100644
--- a/spec/classes/php_5_4_spec.rb
+++ b/spec/classes/php_5_4_spec.rb
@@ -4,8 +4,8 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("php")
-    should include_class("php::5_4_17")
+    should contain_class("php")
+    should contain_class("php::5_4_17")
 
     should contain_file("/test/boxen/phpenv/versions/5.4").with({
       :ensure => "symlink",
diff --git a/spec/classes/php_composer_spec.rb b/spec/classes/php_composer_spec.rb
index 9100930..51c0337 100644
--- a/spec/classes/php_composer_spec.rb
+++ b/spec/classes/php_composer_spec.rb
@@ -4,7 +4,7 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("php")
+    should contain_class("php")
 
     should contain_exec("download-php-composer").with({
       :command => "curl -sS -o /test/boxen/phpenv/bin/composer https://getcomposer.org/download/1.0.0-alpha8/composer.phar",
diff --git a/spec/classes/php_config_spec.rb b/spec/classes/php_config_spec.rb
index 9fbad3a..c253c9b 100644
--- a/spec/classes/php_config_spec.rb
+++ b/spec/classes/php_config_spec.rb
@@ -4,6 +4,6 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("boxen::config")
+    should contain_class("boxen::config")
   end
 end
diff --git a/spec/classes/php_global_spec.rb b/spec/classes/php_global_spec.rb
index 08474d0..5d8a271 100644
--- a/spec/classes/php_global_spec.rb
+++ b/spec/classes/php_global_spec.rb
@@ -9,8 +9,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_file("/test/boxen/phpenv/version").with({
       :ensure  => "present",
diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb
index 369dfb2..a48f976 100644
--- a/spec/classes/php_spec.rb
+++ b/spec/classes/php_spec.rb
@@ -5,15 +5,15 @@
   let(:phpenv_version) { "6499bb6c7b645af3f4e67f7e17708d5ee208453f" }
 
   it do
-    should include_class("php::config")
-    should include_class("homebrew")
-    should include_class("stdlib")
-    should include_class("wget")
-    should include_class("autoconf")
-    should include_class("libtool")
-    should include_class("pkgconfig")
-    should include_class("pcre")
-    should include_class("libpng")
+    should contain_class("boxen::config")
+    should contain_class("homebrew")
+    should contain_class("stdlib")
+    should contain_class("wget")
+    should contain_class("autoconf")
+    should contain_class("libtool")
+    should contain_class("pkgconfig")
+    should contain_class("pcre")
+    should contain_class("libpng")
 
     should contain_package("phpenv").with({
       :ensure => "absent"
diff --git a/spec/defines/extensions/php_extension_apc_spec.rb b/spec/defines/extensions/php_extension_apc_spec.rb
index 7eab8c6..a493987 100644
--- a/spec/defines/extensions/php_extension_apc_spec.rb
+++ b/spec/defines/extensions/php_extension_apc_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("apc for 5.4.17").with({
       :extension      => "apc",
diff --git a/spec/defines/extensions/php_extension_couchbase_spec.rb b/spec/defines/extensions/php_extension_couchbase_spec.rb
index b00378a..b92d081 100644
--- a/spec/defines/extensions/php_extension_couchbase_spec.rb
+++ b/spec/defines/extensions/php_extension_couchbase_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("couchbase::lib")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("couchbase::lib")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/couchbase").with({
       :source => "couchbase/php-ext-couchbase"
diff --git a/spec/defines/extensions/php_extension_imagick_spec.rb b/spec/defines/extensions/php_extension_imagick_spec.rb
index 11533de..a5f1f35 100644
--- a/spec/defines/extensions/php_extension_imagick_spec.rb
+++ b/spec/defines/extensions/php_extension_imagick_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("imagemagick")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("imagemagick")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("imagick for 5.4.17").with({
       :extension        => "imagick",
diff --git a/spec/defines/extensions/php_extension_intl_spec.rb b/spec/defines/extensions/php_extension_intl_spec.rb
index ff9a183..cdf1123 100644
--- a/spec/defines/extensions/php_extension_intl_spec.rb
+++ b/spec/defines/extensions/php_extension_intl_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("intl for 5.4.17").with({
       :extension        => "intl",
diff --git a/spec/defines/extensions/php_extension_mcrypt_spec.rb b/spec/defines/extensions/php_extension_mcrypt_spec.rb
index 1b455df..ea22662 100644
--- a/spec/defines/extensions/php_extension_mcrypt_spec.rb
+++ b/spec/defines/extensions/php_extension_mcrypt_spec.rb
@@ -10,8 +10,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("mcrypt for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_memcached_spec.rb b/spec/defines/extensions/php_extension_memcached_spec.rb
index 9df9bda..3da4469 100644
--- a/spec/defines/extensions/php_extension_memcached_spec.rb
+++ b/spec/defines/extensions/php_extension_memcached_spec.rb
@@ -12,10 +12,10 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("memcached::lib")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("memcached::lib")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("memcached for 5.4.17").with({
       :extension        => "memcached",
diff --git a/spec/defines/extensions/php_extension_mssql_spec.rb b/spec/defines/extensions/php_extension_mssql_spec.rb
index 866058e..9b9a1cd 100644
--- a/spec/defines/extensions/php_extension_mssql_spec.rb
+++ b/spec/defines/extensions/php_extension_mssql_spec.rb
@@ -10,9 +10,9 @@
   end
 
   it do
-    should include_class("php::dependencies::freetds")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::dependencies::freetds")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("mssql for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
index 2a3d896..e5192b2 100644
--- a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
+++ b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
@@ -10,9 +10,9 @@
   end
 
   it do
-    should include_class("php::dependencies::freetds")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::dependencies::freetds")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("pdo_dblib for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pecl_http_spec.rb b/spec/defines/extensions/php_extension_pecl_http_spec.rb
index 2adf3bd..b411fbc 100644
--- a/spec/defines/extensions/php_extension_pecl_http_spec.rb
+++ b/spec/defines/extensions/php_extension_pecl_http_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("pecl_http for 5.4.17").with({
       :extension     => "pecl_http",
diff --git a/spec/defines/extensions/php_extension_pgsql_spec.rb b/spec/defines/extensions/php_extension_pgsql_spec.rb
index 554e3d4..0e7bbb4 100644
--- a/spec/defines/extensions/php_extension_pgsql_spec.rb
+++ b/spec/defines/extensions/php_extension_pgsql_spec.rb
@@ -10,8 +10,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("pgsql for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_redis_spec.rb b/spec/defines/extensions/php_extension_redis_spec.rb
index 90bf0b3..4a00252 100644
--- a/spec/defines/extensions/php_extension_redis_spec.rb
+++ b/spec/defines/extensions/php_extension_redis_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("redis")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("redis")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/redis").with({
       :source => "nicolasff/phpredis"
diff --git a/spec/defines/extensions/php_extension_xdebug_spec.rb b/spec/defines/extensions/php_extension_xdebug_spec.rb
index fd5e0fe..b15cda4 100644
--- a/spec/defines/extensions/php_extension_xdebug_spec.rb
+++ b/spec/defines/extensions/php_extension_xdebug_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("xdebug for 5.4.17").with({
       :extension     => "xdebug",
diff --git a/spec/defines/extensions/php_extension_xhprof_spec.rb b/spec/defines/extensions/php_extension_xhprof_spec.rb
index a5c2638..1d95fd0 100644
--- a/spec/defines/extensions/php_extension_xhprof_spec.rb
+++ b/spec/defines/extensions/php_extension_xhprof_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("xhprof for 5.4.17").with({
       :extension     => "xhprof",
diff --git a/spec/defines/extensions/php_extension_zmq_spec.rb b/spec/defines/extensions/php_extension_zmq_spec.rb
index 1d3488f..19cbf39 100644
--- a/spec/defines/extensions/php_extension_zmq_spec.rb
+++ b/spec/defines/extensions/php_extension_zmq_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("zeromq")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("zeromq")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/zmq").with({
       :source => "mkoppanen/php-zmq"
diff --git a/spec/defines/extensions/php_extension_zookeeper_spec.rb b/spec/defines/extensions/php_extension_zookeeper_spec.rb
index 52a422f..59d3d23 100644
--- a/spec/defines/extensions/php_extension_zookeeper_spec.rb
+++ b/spec/defines/extensions/php_extension_zookeeper_spec.rb
@@ -12,10 +12,10 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("zookeeper")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("zookeeper")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("zookeeper for 5.4.17").with({
       :extension     => "zookeeper",
diff --git a/spec/defines/fpm/php_fpm_pool_spec.rb b/spec/defines/fpm/php_fpm_pool_spec.rb
index cf643c6..d4c2289 100644
--- a/spec/defines/fpm/php_fpm_pool_spec.rb
+++ b/spec/defines/fpm/php_fpm_pool_spec.rb
@@ -14,8 +14,8 @@
     end
 
     it do
-      should include_class("php::config")
-      should include_class("php::fpm::5_4_17")
+      should contain_class("php::config")
+      should contain_class("php::fpm::5_4_17")
 
       should contain_file("/test/boxen/config/php/5.4.17/pool.d/5_4_17_for_test.conf").with({
         :content => File.read("spec/fixtures/php-fpm-pool-custom.conf"),
diff --git a/spec/defines/fpm/php_fpm_service_spec.rb b/spec/defines/fpm/php_fpm_service_spec.rb
index 1e392b0..c032ab8 100644
--- a/spec/defines/fpm/php_fpm_service_spec.rb
+++ b/spec/defines/fpm/php_fpm_service_spec.rb
@@ -11,9 +11,9 @@
       }
     end
     it do
-      should include_class("php::config")
-      should include_class("nginx::config")
-      should include_class("php::fpm::fastcgi")
+      should contain_class("php::config")
+      should contain_class("nginx::config")
+      should contain_class("php::fpm::fastcgi")
 
       should contain_file("/Library/LaunchDaemons/dev.php-fpm.5.4.17.plist").with({
         :content => File.read("spec/fixtures/dev.php-fpm.plist"),
diff --git a/spec/defines/php_fpm_spec.rb b/spec/defines/php_fpm_spec.rb
index 8f91b63..9ffb911 100644
--- a/spec/defines/php_fpm_spec.rb
+++ b/spec/defines/php_fpm_spec.rb
@@ -13,7 +13,7 @@
     end
 
     it do
-      should include_class("php::5_4_17")
+      should contain_class("php::5_4_17")
 
       should contain_file("/test/boxen/config/php/5.4.17/php-fpm.conf").with({
         :content => File.read("spec/fixtures/php-fpm.conf"),
diff --git a/spec/defines/php_local_spec.rb b/spec/defines/php_local_spec.rb
index 4c348d1..5e6b4e2 100644
--- a/spec/defines/php_local_spec.rb
+++ b/spec/defines/php_local_spec.rb
@@ -12,8 +12,8 @@
     end
 
     it do
-      should include_class("php::config")
-      should include_class('php::5_4_17')
+      should contain_class("php::config")
+      should contain_class('php::5_4_17')
 
       should contain_file('/tmp/.php-version').with({
         :ensure  => "present",
@@ -31,7 +31,7 @@
     end
 
     it do
-      should include_class("php::config")
+      should contain_class("php::config")
       should contain_file('/tmp/.php-version').with_ensure('absent')
     end
   end
diff --git a/spec/defines/php_project_spec.rb b/spec/defines/php_project_spec.rb
index 6f07212..7e7f252 100644
--- a/spec/defines/php_project_spec.rb
+++ b/spec/defines/php_project_spec.rb
@@ -11,31 +11,31 @@
   let(:params) { default_test_params }
 
   it do
-    should include_class("boxen::config")
+    should contain_class("boxen::config")
     should contain_repository("/Users/testuser/src/testproject").with({
       :source => "testuser/testproject-repo"
     })
 
-    should_not include_class("elasticsearch")
-    should_not include_class("memcached")
-    should_not include_class("mongodb")
-    should_not include_class("cassandra")
-    should_not include_class("beanstalk")
-    should_not include_class("zookeeper")
-    should_not include_class("zeromq")
-    should_not include_class("nsq")
+    should_not contain_class("elasticsearch")
+    should_not contain_class("memcached")
+    should_not contain_class("mongodb")
+    should_not contain_class("cassandra")
+    should_not contain_class("beanstalk")
+    should_not contain_class("zookeeper")
+    should_not contain_class("zeromq")
+    should_not contain_class("nsq")
 
     should_not contain_mysql__db
 
-    should_not include_class("nginx::config")
-    should_not include_class("nginx")
+    should_not contain_class("nginx::config")
+    should_not contain_class("nginx")
     should_not contain_file("/test/boxen/config/nginx/sites/testproject.conf")
 
     should_not contain_nodejs__local("/Users/testuser/src/testproject")
 
     should_not contain_postgresql__db
 
-    should_not include_class("redis")
+    should_not contain_class("redis")
 
     should_not contain_ruby__local("/Users/testuser/src/testproject")
 
@@ -66,7 +66,7 @@
       })
     end
 
-    it { should include_class("elasticsearch") }
+    it { should contain_class("elasticsearch") }
   end
 
   context "memcached => true" do
@@ -77,7 +77,7 @@
       })
     end
 
-    it { should include_class("memcached") }
+    it { should contain_class("memcached") }
   end
 
   context "mongodb => true" do
@@ -88,7 +88,7 @@
       })
     end
 
-    it { should include_class("mongodb") }
+    it { should contain_class("mongodb") }
   end
 
   context "cassandra => true" do
@@ -99,7 +99,7 @@
       })
     end
 
-    it { should include_class("cassandra") }
+    it { should contain_class("cassandra") }
   end
 
   context "beanstalk => true" do
@@ -110,7 +110,7 @@
       })
     end
 
-    it { should include_class("beanstalk") }
+    it { should contain_class("beanstalk") }
   end
 
   context "zookeeper => true" do
@@ -121,7 +121,7 @@
       })
     end
 
-    it { should include_class("zookeeper") }
+    it { should contain_class("zookeeper") }
   end
 
   context "zeromq => true" do
@@ -132,7 +132,7 @@
       })
     end
 
-    it { should include_class("zeromq") }
+    it { should contain_class("zeromq") }
   end
 
   context "nsq => true" do
@@ -143,7 +143,7 @@
       })
     end
 
-    it { should include_class("nsq") }
+    it { should contain_class("nsq") }
   end
 
   context "mysql => a_database_name" do
@@ -164,8 +164,8 @@
     end
 
     it do
-      should include_class("nginx::config")
-      should include_class("nginx")
+      should contain_class("nginx::config")
+      should contain_class("nginx")
 
       should contain_file("/test/boxen/config/nginx/sites/testproject.conf").with({
         :content => File.read("spec/fixtures/nginx.conf"),
@@ -215,7 +215,7 @@ class sysctl {}
       })
     end
 
-    it { should include_class("redis") }
+    it { should contain_class("redis") }
   end
 
   context "ruby => 2.0.0" do
diff --git a/spec/defines/php_version_spec.rb b/spec/defines/php_version_spec.rb
index b1a8cf4..1b0db9c 100644
--- a/spec/defines/php_version_spec.rb
+++ b/spec/defines/php_version_spec.rb
@@ -5,8 +5,8 @@
   let(:title) { "5.4.17" }
 
   it do
-    should include_class("php")
-    should include_class("boxen::config")
+    should contain_class("php")
+    should contain_class("boxen::config")
   end
 
   context 'ensure => installed' do
diff --git a/spec/fixtures/Puppetfile b/spec/fixtures/Puppetfile
index d8ba1f0..ede7f1a 100644
--- a/spec/fixtures/Puppetfile
+++ b/spec/fixtures/Puppetfile
@@ -11,3 +11,4 @@ mod "libpng",      "1.0.0", :github_tarball => "boxen/puppet-libpng"
 mod "mysql",       "1.1.3", :github_tarball => "boxen/puppet-mysql"
 mod "postgresql",  "2.0.1", :github_tarball => "boxen/puppet-postgresql"
 mod "nginx",       "1.4.2", :github_tarball => "boxen/puppet-nginx"
+mod "module_data", "0.0.3", :github_tarball => "ripienaar/puppet-module-data"
diff --git a/spec/fixtures/Puppetfile.lock b/spec/fixtures/Puppetfile.lock
index ef51276..7225d84 100644
--- a/spec/fixtures/Puppetfile.lock
+++ b/spec/fixtures/Puppetfile.lock
@@ -63,12 +63,18 @@ GITHUBTARBALL
   specs:
     stdlib (4.1.0)
 
+GITHUBTARBALL
+  remote: ripienaar/puppet-module-data
+  specs:
+    module_data (0.0.3)
+
 DEPENDENCIES
   autoconf (= 1.0.0)
   boxen (= 3.0.2)
   homebrew (= 1.4.1)
   libpng (= 1.0.0)
   libtool (= 1.0.0)
+  module_data (= 0.0.3)
   mysql (= 1.1.3)
   nginx (= 1.4.2)
   pcre (= 1.0.0)
diff --git a/spec/fixtures/hiera/hiera.yaml b/spec/fixtures/hiera/hiera.yaml
new file mode 100644
index 0000000..0350eed
--- /dev/null
+++ b/spec/fixtures/hiera/hiera.yaml
@@ -0,0 +1,6 @@
+---
+:hierarchy:
+  - test
+
+:yaml:
+  :datadir: 'spec/fixtures/hiera'
diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
new file mode 100644
index 0000000..f6d1d75
--- /dev/null
+++ b/spec/fixtures/hiera/test.yaml
@@ -0,0 +1,9 @@
+---
+php::config::root: "/test/boxen/phpenv"
+php::config::logdir: "/test/boxen/log/php"
+php::config::configdir: "/test/boxen/config/php"
+php::config::datadir: "/test/boxen/data/php"
+php::config::pluginsdir: "/test/boxen/phpenv/plugins"
+php::config::cachedir: "/test/boxen/data/php/cache"
+php::config::extensioncachedir: "/test/boxen/data/php/cache/extensions"
+php::config::configure_params: {}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index feedaf8..3f6240c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,9 +2,12 @@
 
 fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
 
+$: << File.join(fixture_path, 'modules/module_data/lib')
+
 RSpec.configure do |c|
   c.module_path = File.join(fixture_path, 'modules')
   c.manifest_dir = File.join(fixture_path, 'manifests')
+  c.hiera_config = File.join(fixture_path, 'hiera/hiera.yaml')
 end
 
 def default_test_facts

From d4382ffeee329d673792645114d21ee41fb5f834 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 16:50:49 +1100
Subject: [PATCH 12/57] Fix error in php 5.5 manifst

---
 manifests/5_5.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/5_5.pp b/manifests/5_5.pp
index db4440e..105e6cd 100644
--- a/manifests/5_5.pp
+++ b/manifests/5_5.pp
@@ -2,7 +2,8 @@
 #
 # Usage:
 #
-#     include php::5-5
+#     include php::5_5
+#
 class php::5_5 {
   require php
   require php::5_5_0
@@ -10,6 +11,6 @@
   file { "${php::config::root}/versions/5.5":
     ensure  => symlink,
     force   => true,
-    target  => "${php::root}/versions/5.5.0"
+    target  => "${php::config::root}/versions/5.5.0"
   }
 }

From 78b14376899017e346bf93616e39abe7b3c25446 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 16:51:54 +1100
Subject: [PATCH 13/57] Add better version checking to php source compilation.
 Remove libevent for newer PHP versions.

---
 lib/puppet/provider/php_version/php_source.rb | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 53e9b5d..356abba 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -1,5 +1,20 @@
 require 'puppet/util/execution'
 
+class Version < Array
+  def initialize s
+    super(s.split('.').map { |e| e.to_i })
+  end
+  def < x
+    (self <=> x) < 0
+  end
+  def > x
+    (self <=> x) > 0
+  end
+  def == x
+    (self <=> x) == 0
+  end
+end
+
 Puppet::Type.type(:php_version).provide(:php_source) do
   include Puppet::Util::Execution
   desc "Provides PHP versions compiled from the official source code repository"
@@ -253,7 +268,6 @@ def get_configure_args(version, install_path, config_path)
       "--with-zlib=#{@resource[:homebrew_path]}/opt/zlibphp",
       "--with-snmp=/usr",
       "--with-libedit",
-      "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent",
       "--with-mhash",
       "--with-curl",
       "--with-openssl=/usr",
@@ -267,7 +281,14 @@ def get_configure_args(version, install_path, config_path)
     ]
 
     # PHP-FPM isn't available until 5.3.3
-    args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
+    if Version.new(@resource[:version]) > Version.new('5.3.2')
+      args << "--enable-fpm"
+    end
+
+    # libevent was removed in 5.3.8
+    if Version.new(@resource[:version]) < Version.new('5.3.8')
+      args << "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent"
+    end
 
     # User specified configure params
     args << @resource[:configure_params]

From e4458b87217f4cee9aade48ca100038b736eb4e1 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 16:52:46 +1100
Subject: [PATCH 14/57] Add PHP 5.6.X and specs, also add spec for pthreads
 extension.

---
 manifests/5_6.pp                              | 15 +++++++++
 manifests/5_6_0.pp                            |  8 +++++
 manifests/5_6_1.pp                            |  8 +++++
 manifests/fpm/5_6_0.pp                        | 10 ++++++
 manifests/fpm/5_6_1.pp                        | 10 ++++++
 spec/classes/fpm/php_fpm_5_6_0_spec.rb        |  9 ++++++
 spec/classes/fpm/php_fpm_5_6_1_spec.rb        |  9 ++++++
 spec/classes/php_5_5_spec.rb                  | 16 ++++++++++
 spec/classes/php_5_6_0_spec.rb                |  9 ++++++
 spec/classes/php_5_6_1_spec.rb                |  9 ++++++
 spec/classes/php_5_6_spec.rb                  | 16 ++++++++++
 .../extensions/php_extension_pthreads_spec.rb | 32 +++++++++++++++++++
 spec/fixtures/pthreads.ini                    |  1 +
 13 files changed, 152 insertions(+)
 create mode 100644 manifests/5_6.pp
 create mode 100644 manifests/5_6_0.pp
 create mode 100644 manifests/5_6_1.pp
 create mode 100644 manifests/fpm/5_6_0.pp
 create mode 100644 manifests/fpm/5_6_1.pp
 create mode 100644 spec/classes/fpm/php_fpm_5_6_0_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_1_spec.rb
 create mode 100644 spec/classes/php_5_5_spec.rb
 create mode 100644 spec/classes/php_5_6_0_spec.rb
 create mode 100644 spec/classes/php_5_6_1_spec.rb
 create mode 100644 spec/classes/php_5_6_spec.rb
 create mode 100644 spec/defines/extensions/php_extension_pthreads_spec.rb
 create mode 100644 spec/fixtures/pthreads.ini

diff --git a/manifests/5_6.pp b/manifests/5_6.pp
new file mode 100644
index 0000000..7a9a774
--- /dev/null
+++ b/manifests/5_6.pp
@@ -0,0 +1,15 @@
+# Installs php 5.6.0 and symlinks it as 5.6
+#
+# Usage:
+#
+#     include php::5_6
+class php::5_6 {
+  require php
+  require php::5_6_0
+
+  file { "${php::config::root}/versions/5.6":
+    ensure  => symlink,
+    force   => true,
+    target  => "${php::config::root}/versions/5.6.0"
+  }
+}
diff --git a/manifests/5_6_0.pp b/manifests/5_6_0.pp
new file mode 100644
index 0000000..f7a9287
--- /dev/null
+++ b/manifests/5_6_0.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.0
+#
+# Usage:
+#
+#     include php::5_6_0
+class php::5_6_0 {
+  php::version { '5.6.0': }
+}
diff --git a/manifests/5_6_1.pp b/manifests/5_6_1.pp
new file mode 100644
index 0000000..4a8e3f9
--- /dev/null
+++ b/manifests/5_6_1.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.1
+#
+# Usage:
+#
+#     include php::5_6_1
+class php::5_6_1 {
+  php::version { '5.6.1': }
+}
diff --git a/manifests/fpm/5_6_0.pp b/manifests/fpm/5_6_0.pp
new file mode 100644
index 0000000..70a1a0b
--- /dev/null
+++ b/manifests/fpm/5_6_0.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.0
+# Installs PHP 5.6.0 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_0
+#
+class php::fpm::5_6_0 {
+  php::fpm { '5.6.0': }
+}
diff --git a/manifests/fpm/5_6_1.pp b/manifests/fpm/5_6_1.pp
new file mode 100644
index 0000000..40e0aab
--- /dev/null
+++ b/manifests/fpm/5_6_1.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.1
+# Installs PHP 5.6.1 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_1
+#
+class php::fpm::5_6_1 {
+  php::fpm { '5.6.1': }
+}
diff --git a/spec/classes/fpm/php_fpm_5_6_0_spec.rb b/spec/classes/fpm/php_fpm_5_6_0_spec.rb
new file mode 100644
index 0000000..99152ec
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_0_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_0" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.0")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_1_spec.rb b/spec/classes/fpm/php_fpm_5_6_1_spec.rb
new file mode 100644
index 0000000..98ce4d0
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_1_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_1" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.1")
+  end
+end
diff --git a/spec/classes/php_5_5_spec.rb b/spec/classes/php_5_5_spec.rb
new file mode 100644
index 0000000..bef96f3
--- /dev/null
+++ b/spec/classes/php_5_5_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "php::5_5" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_class("php")
+    should contain_class("php::5_5_0")
+
+    should contain_file("/test/boxen/phpenv/versions/5.5").with({
+      :ensure => "symlink",
+      :force  => true,
+      :target => "/test/boxen/phpenv/versions/5.5.0"
+    })
+  end
+end
diff --git a/spec/classes/php_5_6_0_spec.rb b/spec/classes/php_5_6_0_spec.rb
new file mode 100644
index 0000000..55ff16c
--- /dev/null
+++ b/spec/classes/php_5_6_0_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_0" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.0")
+  end
+end
diff --git a/spec/classes/php_5_6_1_spec.rb b/spec/classes/php_5_6_1_spec.rb
new file mode 100644
index 0000000..590c432
--- /dev/null
+++ b/spec/classes/php_5_6_1_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_1" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.1")
+  end
+end
diff --git a/spec/classes/php_5_6_spec.rb b/spec/classes/php_5_6_spec.rb
new file mode 100644
index 0000000..aded60e
--- /dev/null
+++ b/spec/classes/php_5_6_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "php::5_6" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_class("php")
+    should contain_class("php::5_6_0")
+
+    should contain_file("/test/boxen/phpenv/versions/5.6").with({
+      :ensure => "symlink",
+      :force  => true,
+      :target => "/test/boxen/phpenv/versions/5.6.0"
+    })
+  end
+end
diff --git a/spec/defines/extensions/php_extension_pthreads_spec.rb b/spec/defines/extensions/php_extension_pthreads_spec.rb
new file mode 100644
index 0000000..02c191d
--- /dev/null
+++ b/spec/defines/extensions/php_extension_pthreads_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "php::extension::pthreads" do
+  let(:facts) { default_test_facts }
+  let(:title) { "pthreads for 5.4.17" }
+  let(:params) do
+    {
+      :php     => "5.4.17",
+      :version => "2.0.10"
+    }
+  end
+
+  it do
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
+
+    should contain_php_extension("pthreads for 5.4.17").with({
+      :extension      => "pthreads",
+      :version        => "2.0.10",
+      :package_name   => "pthreads-2.0.10",
+      :package_url    => "http://pecl.php.net/get/pthreads-2.0.10.tgz",
+      :homebrew_path  => "/test/boxen/homebrew",
+      :phpenv_root    => "/test/boxen/phpenv",
+      :php_version    => "5.4.17",
+    })
+
+    should contain_file("/test/boxen/config/php/5.4.17/conf.d/pthreads.ini").with({
+      :content => File.read("spec/fixtures/pthreads.ini"),
+      :require => "Php_extension[pthreads for 5.4.17]"
+    })
+  end
+end
diff --git a/spec/fixtures/pthreads.ini b/spec/fixtures/pthreads.ini
new file mode 100644
index 0000000..d7b01c2
--- /dev/null
+++ b/spec/fixtures/pthreads.ini
@@ -0,0 +1 @@
+extension=/test/boxen/phpenv/versions/5.4.17/modules/pthreads.so

From 5fd255737faadaa94f12407203225d54ad26ac95 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 17:24:43 +1100
Subject: [PATCH 15/57] Put Version class into it's own file.

---
 lib/puppet/provider/php_version/php_source.rb | 16 +---------------
 lib/util/version.rb                           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 lib/util/version.rb

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 356abba..a4df267 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -1,19 +1,5 @@
 require 'puppet/util/execution'
-
-class Version < Array
-  def initialize s
-    super(s.split('.').map { |e| e.to_i })
-  end
-  def < x
-    (self <=> x) < 0
-  end
-  def > x
-    (self <=> x) > 0
-  end
-  def == x
-    (self <=> x) == 0
-  end
-end
+require 'lib/util/version'
 
 Puppet::Type.type(:php_version).provide(:php_source) do
   include Puppet::Util::Execution
diff --git a/lib/util/version.rb b/lib/util/version.rb
new file mode 100644
index 0000000..313c4e5
--- /dev/null
+++ b/lib/util/version.rb
@@ -0,0 +1,14 @@
+class Version < Array
+  def initialize s
+    super(s.split('.').map { |e| e.to_i })
+  end
+  def < x
+    (self <=> x) < 0
+  end
+  def > x
+    (self <=> x) > 0
+  end
+  def == x
+    (self <=> x) == 0
+  end
+end

From 3ff4ebd325ef6d2a448541017fa85d48344e1edf Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 17:55:33 +1100
Subject: [PATCH 16/57] Use Gem::Version

---
 lib/puppet/provider/php_version/php_source.rb |  5 ++---
 lib/util/version.rb                           | 14 --------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 lib/util/version.rb

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index a4df267..563164a 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -1,5 +1,4 @@
 require 'puppet/util/execution'
-require 'lib/util/version'
 
 Puppet::Type.type(:php_version).provide(:php_source) do
   include Puppet::Util::Execution
@@ -267,12 +266,12 @@ def get_configure_args(version, install_path, config_path)
     ]
 
     # PHP-FPM isn't available until 5.3.3
-    if Version.new(@resource[:version]) > Version.new('5.3.2')
+    if Gem::Version.new(@resource[:version]) > Gem::Version.new('5.3.2')
       args << "--enable-fpm"
     end
 
     # libevent was removed in 5.3.8
-    if Version.new(@resource[:version]) < Version.new('5.3.8')
+    if Gem::Version.new(@resource[:version]) < Gem::Version.new('5.3.8')
       args << "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent"
     end
 
diff --git a/lib/util/version.rb b/lib/util/version.rb
deleted file mode 100644
index 313c4e5..0000000
--- a/lib/util/version.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Version < Array
-  def initialize s
-    super(s.split('.').map { |e| e.to_i })
-  end
-  def < x
-    (self <=> x) < 0
-  end
-  def > x
-    (self <=> x) > 0
-  end
-  def == x
-    (self <=> x) == 0
-  end
-end

From 345c5490e0539d46d0b18cf7bb8f2e9d3a1c87bc Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 27 Nov 2014 11:53:15 +1100
Subject: [PATCH 17/57] boxen::config is included in php::config

---
 manifests/extension/ssh2.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/extension/ssh2.pp b/manifests/extension/ssh2.pp
index 6174f5b..982135e 100644
--- a/manifests/extension/ssh2.pp
+++ b/manifests/extension/ssh2.pp
@@ -11,7 +11,6 @@
   $php,
   $version = '0.12'
 ) {
-  include boxen::config
   require ssh2::lib
 
   require php::config

From 3d04ed0591635031173cadd3c8c5bef2042f97cc Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 27 Nov 2014 11:54:10 +1100
Subject: [PATCH 18/57] Update to newer spec methods.

---
 spec/defines/extensions/php_extension_ssh2_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/defines/extensions/php_extension_ssh2_spec.rb b/spec/defines/extensions/php_extension_ssh2_spec.rb
index 4109033..a834f05 100644
--- a/spec/defines/extensions/php_extension_ssh2_spec.rb
+++ b/spec/defines/extensions/php_extension_ssh2_spec.rb
@@ -12,10 +12,10 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("ssh2::lib")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("ssh2::lib")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("ssh2 for 5.4.17").with({
       :extension        => "ssh2",

From 4a914e2ec6bc9df2ef8cc585e9a52589be91b395 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 27 Nov 2014 14:24:19 +1100
Subject: [PATCH 19/57] Add newer versions of PHP and notify when user installs
 insecure version of PHP.

---
 manifests/5_4_35.pp                     |  9 +++++++++
 manifests/5_5_19.pp                     |  8 ++++++++
 manifests/5_6_2.pp                      |  8 ++++++++
 manifests/5_6_3.pp                      |  8 ++++++++
 manifests/fpm/5_4_35.pp                 | 10 ++++++++++
 manifests/fpm/5_5_19.pp                 | 10 ++++++++++
 manifests/fpm/5_6_2.pp                  | 10 ++++++++++
 manifests/fpm/5_6_3.pp                  | 10 ++++++++++
 manifests/version.pp                    | 20 ++++++++++++++++++++
 spec/classes/fpm/php_fpm_5_4_35_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_5_19_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_6_2_spec.rb  |  9 +++++++++
 spec/classes/fpm/php_fpm_5_6_3_spec.rb  |  9 +++++++++
 spec/classes/php_5_4_35_spec.rb         |  9 +++++++++
 spec/classes/php_5_5_19_spec.rb         |  9 +++++++++
 spec/classes/php_5_6_2_spec.rb          |  9 +++++++++
 spec/classes/php_5_6_3_spec.rb          |  9 +++++++++
 17 files changed, 165 insertions(+)
 create mode 100644 manifests/5_4_35.pp
 create mode 100644 manifests/5_5_19.pp
 create mode 100644 manifests/5_6_2.pp
 create mode 100644 manifests/5_6_3.pp
 create mode 100644 manifests/fpm/5_4_35.pp
 create mode 100644 manifests/fpm/5_5_19.pp
 create mode 100644 manifests/fpm/5_6_2.pp
 create mode 100644 manifests/fpm/5_6_3.pp
 create mode 100644 spec/classes/fpm/php_fpm_5_4_35_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_5_19_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_2_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_3_spec.rb
 create mode 100644 spec/classes/php_5_4_35_spec.rb
 create mode 100644 spec/classes/php_5_5_19_spec.rb
 create mode 100644 spec/classes/php_5_6_2_spec.rb
 create mode 100644 spec/classes/php_5_6_3_spec.rb

diff --git a/manifests/5_4_35.pp b/manifests/5_4_35.pp
new file mode 100644
index 0000000..2bdb94e
--- /dev/null
+++ b/manifests/5_4_35.pp
@@ -0,0 +1,9 @@
+# Installs php 5.4.35
+#
+# Usage:
+#
+#     include php::5_4_35
+#
+class php::5_4_35 {
+  php::version { '5.4.35': }
+}
diff --git a/manifests/5_5_19.pp b/manifests/5_5_19.pp
new file mode 100644
index 0000000..d453aa4
--- /dev/null
+++ b/manifests/5_5_19.pp
@@ -0,0 +1,8 @@
+# Installs php 5.5.19
+#
+# Usage:
+#
+#     include php::5_5_19
+class php::5_5_19 {
+  php::version { '5.5.19': }
+}
diff --git a/manifests/5_6_2.pp b/manifests/5_6_2.pp
new file mode 100644
index 0000000..0b7931e
--- /dev/null
+++ b/manifests/5_6_2.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.2
+#
+# Usage:
+#
+#     include php::5_6_2
+class php::5_6_2 {
+  php::version { '5.6.2': }
+}
diff --git a/manifests/5_6_3.pp b/manifests/5_6_3.pp
new file mode 100644
index 0000000..5500853
--- /dev/null
+++ b/manifests/5_6_3.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.3
+#
+# Usage:
+#
+#     include php::5_6_3
+class php::5_6_3 {
+  php::version { '5.6.3': }
+}
diff --git a/manifests/fpm/5_4_35.pp b/manifests/fpm/5_4_35.pp
new file mode 100644
index 0000000..b6b7b42
--- /dev/null
+++ b/manifests/fpm/5_4_35.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.4.35
+# Installs PHP 5.4.35 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_4_35
+#
+class php::fpm::5_4_35 {
+  php::fpm { '5.4.35': }
+}
diff --git a/manifests/fpm/5_5_19.pp b/manifests/fpm/5_5_19.pp
new file mode 100644
index 0000000..fc1d482
--- /dev/null
+++ b/manifests/fpm/5_5_19.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.19
+# Installs PHP 5.5.19 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_19
+#
+class php::fpm::5_5_19 {
+  php::fpm { '5.5.19': }
+}
diff --git a/manifests/fpm/5_6_2.pp b/manifests/fpm/5_6_2.pp
new file mode 100644
index 0000000..358203a
--- /dev/null
+++ b/manifests/fpm/5_6_2.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.2
+# Installs PHP 5.6.2 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_2
+#
+class php::fpm::5_6_2 {
+  php::fpm { '5.6.2': }
+}
diff --git a/manifests/fpm/5_6_3.pp b/manifests/fpm/5_6_3.pp
new file mode 100644
index 0000000..55d91ce
--- /dev/null
+++ b/manifests/fpm/5_6_3.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.3
+# Installs PHP 5.6.3 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_3
+#
+class php::fpm::5_6_3 {
+  php::fpm { '5.6.3': }
+}
diff --git a/manifests/version.pp b/manifests/version.pp
index ef20256..7b9002b 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -17,6 +17,26 @@
   require php
   include mysql::config
 
+  # Current supported and secure versions
+  $secure_5_6 = '5.6.3'
+  $secure_5_5 = '5.5.19'
+  $secure_5_4 = '5.4.35'
+
+  # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
+  if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
+    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
+  }
+
+  # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
+  if versioncmp($version, '5.5') >= 0 and versioncmp($version, $secure_5_5) < 0 {
+    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
+  }
+
+  # Version is less than the minimum secure version
+  if versioncmp($version, $secure_5_4) < 0 {
+    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
+  }
+
   # Install location
   $dest = "${php::config::root}/versions/${version}"
 
diff --git a/spec/classes/fpm/php_fpm_5_4_35_spec.rb b/spec/classes/fpm/php_fpm_5_4_35_spec.rb
new file mode 100644
index 0000000..f2086d8
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_4_35_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_4_35" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.4.35")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_5_19_spec.rb b/spec/classes/fpm/php_fpm_5_5_19_spec.rb
new file mode 100644
index 0000000..9887b1f
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_5_19_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_19" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.19")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_2_spec.rb b/spec/classes/fpm/php_fpm_5_6_2_spec.rb
new file mode 100644
index 0000000..51a22e8
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_2_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_2" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.2")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_3_spec.rb b/spec/classes/fpm/php_fpm_5_6_3_spec.rb
new file mode 100644
index 0000000..1908566
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_3_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_3" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.3")
+  end
+end
diff --git a/spec/classes/php_5_4_35_spec.rb b/spec/classes/php_5_4_35_spec.rb
new file mode 100644
index 0000000..38c39fd
--- /dev/null
+++ b/spec/classes/php_5_4_35_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_4_35" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.4.35")
+  end
+end
diff --git a/spec/classes/php_5_5_19_spec.rb b/spec/classes/php_5_5_19_spec.rb
new file mode 100644
index 0000000..75d76af
--- /dev/null
+++ b/spec/classes/php_5_5_19_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_5_19" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.5.19")
+  end
+end
diff --git a/spec/classes/php_5_6_2_spec.rb b/spec/classes/php_5_6_2_spec.rb
new file mode 100644
index 0000000..9a4cbe2
--- /dev/null
+++ b/spec/classes/php_5_6_2_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_2" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.2")
+  end
+end
diff --git a/spec/classes/php_5_6_3_spec.rb b/spec/classes/php_5_6_3_spec.rb
new file mode 100644
index 0000000..0e47af2
--- /dev/null
+++ b/spec/classes/php_5_6_3_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_3" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.3")
+  end
+end

From aff395c5c0db8a48961054800bfd3f985c1181a8 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 8 Dec 2014 13:10:52 +1100
Subject: [PATCH 20/57] Warn when PHP version is insecure

Don't just notice
---
 manifests/version.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 7b9002b..74d74e4 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -24,17 +24,17 @@
 
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
   if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
-    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
+    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
   }
 
   # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
   if versioncmp($version, '5.5') >= 0 and versioncmp($version, $secure_5_5) < 0 {
-    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
+    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
   }
 
   # Version is less than the minimum secure version
   if versioncmp($version, $secure_5_4) < 0 {
-    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
+    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
   }
 
   # Install location

From 3d383e0061f361cd6792b8a28730fe9aca8748e0 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 23 Dec 2014 19:06:10 +1100
Subject: [PATCH 21/57] Add PHP 5.4.36, 5.5.20, 5.6.4

---
 manifests/5_4_36.pp                     |  9 +++++++++
 manifests/5_5_20.pp                     |  8 ++++++++
 manifests/5_6_4.pp                      |  8 ++++++++
 manifests/fpm/5_4_36.pp                 | 10 ++++++++++
 manifests/fpm/5_5_20.pp                 | 10 ++++++++++
 manifests/fpm/5_6_4.pp                  | 10 ++++++++++
 manifests/version.pp                    |  6 +++---
 spec/classes/fpm/php_fpm_5_4_36_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_5_20_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_6_4_spec.rb  |  9 +++++++++
 spec/classes/php_5_4_36_spec.rb         |  9 +++++++++
 spec/classes/php_5_5_20_spec.rb         |  9 +++++++++
 spec/classes/php_5_6_4_spec.rb          |  9 +++++++++
 13 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 manifests/5_4_36.pp
 create mode 100644 manifests/5_5_20.pp
 create mode 100644 manifests/5_6_4.pp
 create mode 100644 manifests/fpm/5_4_36.pp
 create mode 100644 manifests/fpm/5_5_20.pp
 create mode 100644 manifests/fpm/5_6_4.pp
 create mode 100644 spec/classes/fpm/php_fpm_5_4_36_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_5_20_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_4_spec.rb
 create mode 100644 spec/classes/php_5_4_36_spec.rb
 create mode 100644 spec/classes/php_5_5_20_spec.rb
 create mode 100644 spec/classes/php_5_6_4_spec.rb

diff --git a/manifests/5_4_36.pp b/manifests/5_4_36.pp
new file mode 100644
index 0000000..9f294d3
--- /dev/null
+++ b/manifests/5_4_36.pp
@@ -0,0 +1,9 @@
+# Installs php 5.4.36
+#
+# Usage:
+#
+#     include php::5_4_36
+#
+class php::5_4_36 {
+  php::version { '5.4.36': }
+}
diff --git a/manifests/5_5_20.pp b/manifests/5_5_20.pp
new file mode 100644
index 0000000..7ff2232
--- /dev/null
+++ b/manifests/5_5_20.pp
@@ -0,0 +1,8 @@
+# Installs php 5.5.20
+#
+# Usage:
+#
+#     include php::5_5_20
+class php::5_5_20 {
+  php::version { '5.5.20': }
+}
diff --git a/manifests/5_6_4.pp b/manifests/5_6_4.pp
new file mode 100644
index 0000000..9bfa082
--- /dev/null
+++ b/manifests/5_6_4.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.4
+#
+# Usage:
+#
+#     include php::5_6_4
+class php::5_6_4 {
+  php::version { '5.6.4': }
+}
diff --git a/manifests/fpm/5_4_36.pp b/manifests/fpm/5_4_36.pp
new file mode 100644
index 0000000..8be1c34
--- /dev/null
+++ b/manifests/fpm/5_4_36.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.4.36
+# Installs PHP 5.4.36 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_4_36
+#
+class php::fpm::5_4_36 {
+  php::fpm { '5.4.36': }
+}
diff --git a/manifests/fpm/5_5_20.pp b/manifests/fpm/5_5_20.pp
new file mode 100644
index 0000000..07fcca8
--- /dev/null
+++ b/manifests/fpm/5_5_20.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.20
+# Installs PHP 5.5.20 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_20
+#
+class php::fpm::5_5_20 {
+  php::fpm { '5.5.20': }
+}
diff --git a/manifests/fpm/5_6_4.pp b/manifests/fpm/5_6_4.pp
new file mode 100644
index 0000000..8d51efc
--- /dev/null
+++ b/manifests/fpm/5_6_4.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.4
+# Installs PHP 5.6.4 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_4
+#
+class php::fpm::5_6_4 {
+  php::fpm { '5.6.4': }
+}
diff --git a/manifests/version.pp b/manifests/version.pp
index 7b9002b..c2c01f9 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -18,9 +18,9 @@
   include mysql::config
 
   # Current supported and secure versions
-  $secure_5_6 = '5.6.3'
-  $secure_5_5 = '5.5.19'
-  $secure_5_4 = '5.4.35'
+  $secure_5_6 = '5.6.4'
+  $secure_5_5 = '5.5.20'
+  $secure_5_4 = '5.4.36'
 
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
   if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
diff --git a/spec/classes/fpm/php_fpm_5_4_36_spec.rb b/spec/classes/fpm/php_fpm_5_4_36_spec.rb
new file mode 100644
index 0000000..c9e83fa
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_4_36_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_4_36" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.4.36")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_5_20_spec.rb b/spec/classes/fpm/php_fpm_5_5_20_spec.rb
new file mode 100644
index 0000000..328d696
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_5_20_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_20" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.20")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_4_spec.rb b/spec/classes/fpm/php_fpm_5_6_4_spec.rb
new file mode 100644
index 0000000..9e6042f
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_4_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_4" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.4")
+  end
+end
diff --git a/spec/classes/php_5_4_36_spec.rb b/spec/classes/php_5_4_36_spec.rb
new file mode 100644
index 0000000..df8aff9
--- /dev/null
+++ b/spec/classes/php_5_4_36_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_4_36" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.4.36")
+  end
+end
diff --git a/spec/classes/php_5_5_20_spec.rb b/spec/classes/php_5_5_20_spec.rb
new file mode 100644
index 0000000..26baf4e
--- /dev/null
+++ b/spec/classes/php_5_5_20_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_5_20" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.5.20")
+  end
+end
diff --git a/spec/classes/php_5_6_4_spec.rb b/spec/classes/php_5_6_4_spec.rb
new file mode 100644
index 0000000..44a41ac
--- /dev/null
+++ b/spec/classes/php_5_6_4_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_4" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.4")
+  end
+end

From 19744e1f5bcdf3d135d25a12b6ba3d4afa8ce177 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:45:32 +1100
Subject: [PATCH 22/57] Create 5_5_18.pp

---
 manifests/5_5_18.pp | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 manifests/5_5_18.pp

diff --git a/manifests/5_5_18.pp b/manifests/5_5_18.pp
new file mode 100644
index 0000000..2b69919
--- /dev/null
+++ b/manifests/5_5_18.pp
@@ -0,0 +1,8 @@
+# Installs php 5.5.18
+#
+# Usage:
+#
+#     include php::5_5_18
+class php::5_5_18 {
+  php::version { '5.5.18': }
+}

From e551f921ab037f32912399a1af273277328d7d53 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:46:45 +1100
Subject: [PATCH 23/57] Create 5_5_18.pp

---
 manifests/fpm/5_5_18.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 manifests/fpm/5_5_18.pp

diff --git a/manifests/fpm/5_5_18.pp b/manifests/fpm/5_5_18.pp
new file mode 100644
index 0000000..20a3dd2
--- /dev/null
+++ b/manifests/fpm/5_5_18.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.18
+# Installs PHP 5.5.18 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_18
+#
+class php::fpm::5_5_18 {
+  php::fpm { '5.5.18': }
+}

From f3b56f36e5640630a5b19ce9bb80ddbc9037eeb2 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:51:02 +1100
Subject: [PATCH 24/57] Create php_5_5_18_spec.rb

---
 spec/classes/php_5_5_18_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 spec/classes/php_5_5_18_spec.rb

diff --git a/spec/classes/php_5_5_18_spec.rb b/spec/classes/php_5_5_18_spec.rb
new file mode 100644
index 0000000..f2f48ac
--- /dev/null
+++ b/spec/classes/php_5_5_18_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_5_18" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.5.18")
+  end
+end

From 0870c22ba40252862e11fe2931cc348c8eb14147 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 17:51:42 +1100
Subject: [PATCH 25/57] Create php_fpm_5_5_18_spec.rb

---
 spec/classes/fpm/php_fpm_5_5_18_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 spec/classes/fpm/php_fpm_5_5_18_spec.rb

diff --git a/spec/classes/fpm/php_fpm_5_5_18_spec.rb b/spec/classes/fpm/php_fpm_5_5_18_spec.rb
new file mode 100644
index 0000000..bfbc605
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_5_18_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_18" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.18")
+  end
+end

From b737a4fb768831022fe9fc4be7c05c44182facd4 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 7 Nov 2014 23:04:11 +1100
Subject: [PATCH 26/57] Allow configure params on PHP builds.

---
 lib/puppet/provider/php_version/php_source.rb |  2 ++
 lib/puppet/type/php_version.rb                |  4 ++++
 manifests/version.pp                          | 20 ++++++++++---------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 96bf543..26aab75 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -269,6 +269,8 @@ def get_configure_args(version, install_path, config_path)
     # PHP-FPM isn't available until 5.3.3
     args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
 
+    args << @resource[:configure_params]
+
     args
   end
 
diff --git a/lib/puppet/type/php_version.rb b/lib/puppet/type/php_version.rb
index 24f65d3..9678779 100644
--- a/lib/puppet/type/php_version.rb
+++ b/lib/puppet/type/php_version.rb
@@ -34,4 +34,8 @@
 
   newparam(:user_home) do
   end
+
+  newparam(:configure_params) do
+    defaultto ''
+  end
 end
diff --git a/manifests/version.pp b/manifests/version.pp
index 68af67f..974d135 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -11,8 +11,9 @@
 #     include php::5_3_20
 #
 define php::version(
-  $ensure    = 'installed',
-  $version   = $name
+  $ensure           = 'installed',
+  $version          = $name,
+  $configure_params = ''
 ) {
   require php
   include boxen::config
@@ -98,12 +99,12 @@
     # Install PHP!
 
     php_version { $version:
-      user          => $::boxen_user,
-      user_home     => "/Users/${::boxen_user}",
-      phpenv_root   => $php::config::root,
-      version       => $version,
-      homebrew_path => $boxen::config::homebrewdir,
-      require       => [
+      user              => $::boxen_user,
+      user_home         => "/Users/${::boxen_user}",
+      phpenv_root       => $php::config::root,
+      version           => $version,
+      homebrew_path     => $boxen::config::homebrewdir,
+      require           => [
         Repository["${php::config::root}/php-src"],
         Package['gettext'],
         Package['boxen/brews/freetypephp'],
@@ -116,7 +117,8 @@
         Package['autoconf'],
         Package['boxen/brews/autoconf213'],
       ],
-      notify        => Exec["phpenv-rehash-post-install-${version}"],
+      notify            => Exec["phpenv-rehash-post-install-${version}"],
+      configure_params  => $configure_params,
     }
 
     # Fix permissions for php versions installed prior to 0.3.5 of this module

From 4147bb5531b3475aaf748eacdc9785ac6ea8f92c Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Sat, 8 Nov 2014 11:37:23 +1100
Subject: [PATCH 27/57] Move config to Hiera, allow additional configure flags
 per PHP version via Hiera, add pthreads extension.

---
 data/common.yaml                              |  9 +++
 data/hiera.yaml                               |  3 +
 lib/puppet/provider/php_version/php_source.rb |  1 +
 manifests/config.pp                           | 21 ++---
 manifests/extension/pthreads.pp               | 52 +++++++++++++
 manifests/init.pp                             | 78 ++++++++++++++-----
 manifests/version.pp                          | 13 ++--
 7 files changed, 141 insertions(+), 36 deletions(-)
 create mode 100644 data/common.yaml
 create mode 100644 data/hiera.yaml
 create mode 100644 manifests/extension/pthreads.pp

diff --git a/data/common.yaml b/data/common.yaml
new file mode 100644
index 0000000..74e07dd
--- /dev/null
+++ b/data/common.yaml
@@ -0,0 +1,9 @@
+---
+php::root:              "%{::boxen::config::home}/phpenv"
+php::logdir:            "%{::boxen::config::logdir}/php"
+php::configdir:         "%{::boxen::config::configdir}/php"
+php::datadir:           "%{::boxen::config::datadir}/php"
+php::pluginsdir:        "%{php::root}/plugins"
+php::cachedir:          "%{php::datadir}/cache"
+php::extensioncachedir: "%{php::datadir}/cache/extensions"
+php::configure_params:  {}
diff --git a/data/hiera.yaml b/data/hiera.yaml
new file mode 100644
index 0000000..7e5202d
--- /dev/null
+++ b/data/hiera.yaml
@@ -0,0 +1,3 @@
+---
+:hierarchy:
+  - common
diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 26aab75..53e9b5d 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -269,6 +269,7 @@ def get_configure_args(version, install_path, config_path)
     # PHP-FPM isn't available until 5.3.3
     args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
 
+    # User specified configure params
     args << @resource[:configure_params]
 
     args
diff --git a/manifests/config.pp b/manifests/config.pp
index 3bb8d1c..2b4f67b 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -4,14 +4,15 @@
 #
 #     include php::config
 #
-class php::config {
-  require boxen::config
-
-  $root              = "${boxen::config::home}/phpenv"
-  $logdir            = "${boxen::config::logdir}/php"
-  $configdir         = "${boxen::config::configdir}/php"
-  $datadir           = "${boxen::config::datadir}/php"
-  $pluginsdir        = "${root}/plugins"
-  $cachedir          = "${php::config::datadir}/cache"
-  $extensioncachedir = "${php::config::datadir}/cache/extensions"
+class php::config(
+  $root               = undef,
+  $logdir             = undef,
+  $configdir          = undef,
+  $datadir            = undef,
+  $pluginsdir         = undef,
+  $cachedir           = undef,
+  $extensioncachedir  = undef,
+  $configure_params   = undef,
+) {
+  include boxen::config
 }
diff --git a/manifests/extension/pthreads.pp b/manifests/extension/pthreads.pp
new file mode 100644
index 0000000..36aa478
--- /dev/null
+++ b/manifests/extension/pthreads.pp
@@ -0,0 +1,52 @@
+# Installs the pthreads extension for a specific version of php.
+#
+# Requires PHP to be built with thread safety, add:
+#
+#     php::configure_params:
+#       5.5.18: '--enable-maintainer-zts'
+#
+# or similar to Hiera configs in your Boxen repo (adjust for your version).
+#
+# Usage:
+#
+#     php::extension::pthreads { 'pthreads for 5.5.18':
+#       php     => '5.5.18',
+#       version => '2.0.10'
+#     }
+#
+define php::extension::pthreads(
+  $php,
+  $version = '2.0.10',
+) {
+  require php::config
+
+  # Require php version eg. php::5_4_10
+  # This will compile, install and set up config dirs if not present
+  require join(['php', join(split($php, '[.]'), '_')], '::')
+
+  $extension = 'pthreads'
+  $package_name = "pthreads-${version}"
+  $url = "http://pecl.php.net/get/pthreads-${version}.tgz"
+
+  # Final module install path
+  $module_path = "${php::config::root}/versions/${php}/modules/${extension}.so"
+
+  php_extension { $name:
+    extension        => $extension,
+    version          => $version,
+    package_name     => $package_name,
+    package_url      => $url,
+    homebrew_path    => $boxen::config::homebrewdir,
+    phpenv_root      => $php::config::root,
+    php_version      => $php,
+    provider         => pecl,
+  }
+
+  # Add config file once extension is installed
+
+  file { "${php::config::configdir}/${php}/conf.d/${extension}.ini":
+    content => template('php/extensions/generic.ini.erb'),
+    require => Php_extension[$name],
+  }
+
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index c4f770e..e6d3068 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,8 +6,44 @@
 #
 #     include php
 #
-class php {
-  require php::config
+
+class php(
+  $root               = undef,
+  $logdir             = undef,
+  $configdir          = undef,
+  $datadir            = undef,
+  $pluginsdir         = undef,
+  $cachedir           = undef,
+  $extensioncachedir  = undef,
+  $configure_params   = undef,
+) {
+  include boxen::config
+
+  validate_string(
+    $root,
+    $logdir,
+    $configdir,
+    $datadir,
+    $pluginsdir,
+    $cachedir,
+    $extensioncachedir,
+  )
+
+  validate_hash(
+    $configure_params
+  )
+
+  class { 'php::config':
+    root              => $root,
+    logdir            => $logdir,
+    configdir         => $configdir,
+    datadir           => $datadir,
+    pluginsdir        => $pluginsdir,
+    cachedir          => $cachedir,
+    extensioncachedir => $extensioncachedir,
+    configure_params  => $configure_params,
+  }
+
   require homebrew
   include wget
   include stdlib
@@ -24,12 +60,12 @@
 
   file {
     [
-      $php::config::root,
-      $php::config::logdir,
-      $php::config::datadir,
-      $php::config::pluginsdir,
-      $php::config::cachedir,
-      $php::config::extensioncachedir,
+      $root,
+      $logdir,
+      $datadir,
+      $pluginsdir,
+      $cachedir,
+      $extensioncachedir,
     ]:
     ensure => directory
   }
@@ -37,7 +73,7 @@
   # Ensure we only have config files managed by Boxen
   # to prevent any conflicts by shipping a (nearly) empty
   # dir, and recursively purging
-  file { $php::config::configdir:
+  file { $configdir:
     ensure  => directory,
     recurse => true,
     purge   => true,
@@ -47,11 +83,11 @@
 
   file {
     [
-      "${php::config::root}/phpenv.d",
-      "${php::config::root}/phpenv.d/install",
-      "${php::config::root}/shims",
-      "${php::config::root}/versions",
-      "${php::config::root}/libexec",
+      "${root}/phpenv.d",
+      "${root}/phpenv.d/install",
+      "${root}/shims",
+      "${root}/versions",
+      "${root}/libexec",
     ]:
       ensure  => directory,
       require => Exec['phpenv-setup-root-repo'];
@@ -126,10 +162,10 @@
 
   exec { 'phpenv-setup-root-repo':
     command => "${git_init} && ${git_remote} && ${git_fetch} && ${git_reset}",
-    cwd     => $php::config::root,
-    creates => "${php::config::root}/bin/phpenv",
+    cwd     => $root,
+    creates => "${root}/bin/phpenv",
     require => [
-      File[$php::config::root],
+      File[$root],
       Class['git'],
     ]
   }
@@ -137,22 +173,22 @@
   exec { "ensure-phpenv-version-${phpenv_version}":
     command => "${git_fetch} && git reset --hard ${phpenv_version}",
     unless  => "git rev-parse HEAD | grep ${phpenv_version}",
-    cwd     => $php::config::root,
+    cwd     => $root,
     require => Exec['phpenv-setup-root-repo']
   }
 
   # Cache the PHP src repository we'll need this for extensions
   # and at some point building versions #todo
-  repository { "${php::config::root}/php-src":
+  repository { "${root}/php-src":
     source => 'php/php-src',
   }
 
   # Shared PEAR data directory - used for downloads & cache
-  file { "${php::config::datadir}/pear":
+  file { "${datadir}/pear":
     ensure  => directory,
     owner   => $::boxen_user,
     group   => 'staff',
-    require => File[$php::config::datadir],
+    require => File[$datadir],
   }
 
   # Kill off the legacy PHP-FPM daemon as we're moving to per version instances
diff --git a/manifests/version.pp b/manifests/version.pp
index 974d135..2af084e 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -11,13 +11,10 @@
 #     include php::5_3_20
 #
 define php::version(
-  $ensure           = 'installed',
-  $version          = $name,
-  $configure_params = ''
+  $ensure   = 'installed',
+  $version  = $name
 ) {
   require php
-  include boxen::config
-  include mysql::config
 
   # Install location
   $dest = "${php::config::root}/versions/${version}"
@@ -98,6 +95,12 @@
 
     # Install PHP!
 
+    # Get any additional configure params
+    $test_params = $php::config::configure_params
+    if is_hash($test_params) and has_key($test_params, $version) {
+      $configure_params = $test_params[$version]
+    }
+
     php_version { $version:
       user              => $::boxen_user,
       user_home         => "/Users/${::boxen_user}",

From ebf0bec0ba5763cb035b1cfc69d8f8d76e4924d9 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:15:12 +1100
Subject: [PATCH 28/57] Make config the reciever of config vars from Hiera.

---
 data/common.yaml    | 16 +++++-----
 manifests/config.pp | 14 +++++++++
 manifests/init.pp   | 73 +++++++++++++--------------------------------
 3 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 74e07dd..2b8d54c 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,9 +1,9 @@
 ---
-php::root:              "%{::boxen::config::home}/phpenv"
-php::logdir:            "%{::boxen::config::logdir}/php"
-php::configdir:         "%{::boxen::config::configdir}/php"
-php::datadir:           "%{::boxen::config::datadir}/php"
-php::pluginsdir:        "%{php::root}/plugins"
-php::cachedir:          "%{php::datadir}/cache"
-php::extensioncachedir: "%{php::datadir}/cache/extensions"
-php::configure_params:  {}
+php::config::root:              "%{::boxen::config::home}/phpenv"
+php::config::logdir:            "%{::boxen::config::logdir}/php"
+php::config::configdir:         "%{::boxen::config::configdir}/php"
+php::config::datadir:           "%{::boxen::config::datadir}/php"
+php::config::pluginsdir:        "%{php::config::root}/plugins"
+php::config::cachedir:          "%{php::config::datadir}/cache"
+php::config::extensioncachedir: "%{php::config::datadir}/cache/extensions"
+php::config::configure_params:  {}
diff --git a/manifests/config.pp b/manifests/config.pp
index 2b4f67b..35b4a66 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -15,4 +15,18 @@
   $configure_params   = undef,
 ) {
   include boxen::config
+
+  validate_string(
+    $root,
+    $logdir,
+    $configdir,
+    $datadir,
+    $pluginsdir,
+    $cachedir,
+    $extensioncachedir,
+  )
+
+  # validate_hash(
+  #   $configure_params
+  # )
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index e6d3068..a1e42f1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,41 +8,8 @@
 #
 
 class php(
-  $root               = undef,
-  $logdir             = undef,
-  $configdir          = undef,
-  $datadir            = undef,
-  $pluginsdir         = undef,
-  $cachedir           = undef,
-  $extensioncachedir  = undef,
-  $configure_params   = undef,
 ) {
-  include boxen::config
-
-  validate_string(
-    $root,
-    $logdir,
-    $configdir,
-    $datadir,
-    $pluginsdir,
-    $cachedir,
-    $extensioncachedir,
-  )
-
-  validate_hash(
-    $configure_params
-  )
-
-  class { 'php::config':
-    root              => $root,
-    logdir            => $logdir,
-    configdir         => $configdir,
-    datadir           => $datadir,
-    pluginsdir        => $pluginsdir,
-    cachedir          => $cachedir,
-    extensioncachedir => $extensioncachedir,
-    configure_params  => $configure_params,
-  }
+  include php::config
 
   require homebrew
   include wget
@@ -60,12 +27,12 @@
 
   file {
     [
-      $root,
-      $logdir,
-      $datadir,
-      $pluginsdir,
-      $cachedir,
-      $extensioncachedir,
+      $php::config::root,
+      $php::config::logdir,
+      $php::config::datadir,
+      $php::config::pluginsdir,
+      $php::config::cachedir,
+      $php::config::extensioncachedir,
     ]:
     ensure => directory
   }
@@ -73,7 +40,7 @@
   # Ensure we only have config files managed by Boxen
   # to prevent any conflicts by shipping a (nearly) empty
   # dir, and recursively purging
-  file { $configdir:
+  file { $php::config::configdir:
     ensure  => directory,
     recurse => true,
     purge   => true,
@@ -83,11 +50,11 @@
 
   file {
     [
-      "${root}/phpenv.d",
-      "${root}/phpenv.d/install",
-      "${root}/shims",
-      "${root}/versions",
-      "${root}/libexec",
+      "${php::config::root}/phpenv.d",
+      "${php::config::root}/phpenv.d/install",
+      "${php::config::root}/shims",
+      "${php::config::root}/versions",
+      "${php::config::root}/libexec",
     ]:
       ensure  => directory,
       require => Exec['phpenv-setup-root-repo'];
@@ -162,10 +129,10 @@
 
   exec { 'phpenv-setup-root-repo':
     command => "${git_init} && ${git_remote} && ${git_fetch} && ${git_reset}",
-    cwd     => $root,
-    creates => "${root}/bin/phpenv",
+    cwd     => $php::config::root,
+    creates => "${php::config::root}/bin/phpenv",
     require => [
-      File[$root],
+      File[$php::config::root],
       Class['git'],
     ]
   }
@@ -173,22 +140,22 @@
   exec { "ensure-phpenv-version-${phpenv_version}":
     command => "${git_fetch} && git reset --hard ${phpenv_version}",
     unless  => "git rev-parse HEAD | grep ${phpenv_version}",
-    cwd     => $root,
+    cwd     => $php::config::root,
     require => Exec['phpenv-setup-root-repo']
   }
 
   # Cache the PHP src repository we'll need this for extensions
   # and at some point building versions #todo
-  repository { "${root}/php-src":
+  repository { "${php::config::root}/php-src":
     source => 'php/php-src',
   }
 
   # Shared PEAR data directory - used for downloads & cache
-  file { "${datadir}/pear":
+  file { "${php::config::datadir}/pear":
     ensure  => directory,
     owner   => $::boxen_user,
     group   => 'staff',
-    require => File[$datadir],
+    require => File[$php::config::datadir],
   }
 
   # Kill off the legacy PHP-FPM daemon as we're moving to per version instances

From e2c9c43308247cddad2732f60f345ba22ed51a2c Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:22:58 +1100
Subject: [PATCH 29/57] Add validate_hash back into config class.

---
 manifests/config.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 35b4a66..62b9e7e 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -26,7 +26,7 @@
     $extensioncachedir,
   )
 
-  # validate_hash(
-  #   $configure_params
-  # )
+  validate_hash(
+    $configure_params
+  )
 }

From 16ba028a1e53226992f687e1f51d34ad8a89f9e3 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:29:19 +1100
Subject: [PATCH 30/57] Fully revert init PHP class.

---
 manifests/init.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a1e42f1..f006bf1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,9 +7,8 @@
 #     include php
 #
 
-class php(
-) {
-  include php::config
+class php {
+  require php::config
 
   require homebrew
   include wget

From f59ec6caa4be5d84e4e921ed14c4c73bdcff11a7 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 13:30:47 +1100
Subject: [PATCH 31/57] Tidy up instructions in PThreads extension.

---
 manifests/extension/pthreads.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/extension/pthreads.pp b/manifests/extension/pthreads.pp
index 36aa478..fa606b2 100644
--- a/manifests/extension/pthreads.pp
+++ b/manifests/extension/pthreads.pp
@@ -2,7 +2,7 @@
 #
 # Requires PHP to be built with thread safety, add:
 #
-#     php::configure_params:
+#     php::config::configure_params:
 #       5.5.18: '--enable-maintainer-zts'
 #
 # or similar to Hiera configs in your Boxen repo (adjust for your version).

From 7e3bac4425ac45dc9b18f71312a6048c607397ac Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 15:38:27 +1100
Subject: [PATCH 32/57] Update cardboard to 2.1.0, switch out deprecated specs
 causing errors, move spec config to Hiera.

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  | 111 +++++++++---------
 manifests/version.pp                          |   1 +
 spec/classes/fpm/php_fpm_fastcgi_spec.rb      |   2 +-
 spec/classes/php_5_3_spec.rb                  |   4 +-
 spec/classes/php_5_4_spec.rb                  |   4 +-
 spec/classes/php_composer_spec.rb             |   2 +-
 spec/classes/php_config_spec.rb               |   2 +-
 spec/classes/php_global_spec.rb               |   4 +-
 spec/classes/php_spec.rb                      |  18 +--
 .../extensions/php_extension_apc_spec.rb      |   4 +-
 .../php_extension_couchbase_spec.rb           |   6 +-
 .../extensions/php_extension_imagick_spec.rb  |   6 +-
 .../extensions/php_extension_intl_spec.rb     |   4 +-
 .../extensions/php_extension_mcrypt_spec.rb   |   4 +-
 .../php_extension_memcached_spec.rb           |   8 +-
 .../extensions/php_extension_mssql_spec.rb    |   6 +-
 .../php_extension_pdo_dblib_spec.rb           |   6 +-
 .../php_extension_pecl_http_spec.rb           |   6 +-
 .../extensions/php_extension_pgsql_spec.rb    |   4 +-
 .../extensions/php_extension_redis_spec.rb    |   6 +-
 .../extensions/php_extension_xdebug_spec.rb   |   4 +-
 .../extensions/php_extension_xhprof_spec.rb   |   4 +-
 .../extensions/php_extension_zmq_spec.rb      |   6 +-
 .../php_extension_zookeeper_spec.rb           |   8 +-
 spec/defines/fpm/php_fpm_pool_spec.rb         |   4 +-
 spec/defines/fpm/php_fpm_service_spec.rb      |   6 +-
 spec/defines/php_fpm_spec.rb                  |   2 +-
 spec/defines/php_local_spec.rb                |   6 +-
 spec/defines/php_project_spec.rb              |  46 ++++----
 spec/defines/php_version_spec.rb              |   4 +-
 spec/fixtures/Puppetfile                      |   1 +
 spec/fixtures/Puppetfile.lock                 |   6 +
 spec/fixtures/hiera/hiera.yaml                |   6 +
 spec/fixtures/hiera/test.yaml                 |   9 ++
 spec/spec_helper.rb                           |   3 +
 36 files changed, 178 insertions(+), 147 deletions(-)
 create mode 100644 spec/fixtures/hiera/hiera.yaml
 create mode 100644 spec/fixtures/hiera/test.yaml

diff --git a/Gemfile b/Gemfile
index b35fba7..acf5f45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard", "~> 2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index f63f5ca..71e2460 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,75 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    CFPropertyList (2.2.8)
+    addressable (2.3.6)
     ansi (1.4.3)
-    boxen (1.5.2)
+    boxen (2.7.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+      librarian-puppet (~> 1.0.0)
+      octokit (~> 2.7, >= 2.7.1)
+      puppet (~> 3.7)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
-    diff-lcs (1.2.4)
-    facter (1.7.2)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    hiera (1.2.1)
+      rspec-puppet (~> 1.0)
+    diff-lcs (1.2.5)
+    facter (2.3.0)
+      CFPropertyList (~> 2.2.6)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.19)
-    json (1.8.0)
-    json_pure (1.8.0)
-    librarian-puppet (0.9.10)
-      json
+    highline (1.6.21)
+    json (1.8.1)
+    json_pure (1.8.1)
+    librarian (0.1.2)
+      highline
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    librarian-puppet (1.0.9)
+      json
+      librarian (>= 0.1.2)
+    metaclass (0.0.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.25.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.2.4)
-      facter (~> 1.6)
+    multipart-post (2.0.0)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    puppet (3.7.3)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6.5)
+      json_pure
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-syntax (1.3.0)
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.0)
-    rgen (0.6.5)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-puppet (0.1.6)
+    puppetlabs_spec_helper (0.8.2)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec
+      rspec-puppet
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-puppet (1.0.1)
       rspec
-    thor (0.18.1)
+    rspec-support (3.1.2)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)
diff --git a/manifests/version.pp b/manifests/version.pp
index 2af084e..ef20256 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -15,6 +15,7 @@
   $version  = $name
 ) {
   require php
+  include mysql::config
 
   # Install location
   $dest = "${php::config::root}/versions/${version}"
diff --git a/spec/classes/fpm/php_fpm_fastcgi_spec.rb b/spec/classes/fpm/php_fpm_fastcgi_spec.rb
index 3c8fbfe..7580217 100644
--- a/spec/classes/fpm/php_fpm_fastcgi_spec.rb
+++ b/spec/classes/fpm/php_fpm_fastcgi_spec.rb
@@ -4,7 +4,7 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("nginx::config")
+    should contain_class("nginx::config")
 
     should contain_file("/test/boxen/config/nginx/fastcgi_params").with({
       :source  => 'puppet:///modules/php/nginx_fastcgi_params',
diff --git a/spec/classes/php_5_3_spec.rb b/spec/classes/php_5_3_spec.rb
index e58e976..329ff93 100644
--- a/spec/classes/php_5_3_spec.rb
+++ b/spec/classes/php_5_3_spec.rb
@@ -4,8 +4,8 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("php")
-    should include_class("php::5_3_27")
+    should contain_class("php")
+    should contain_class("php::5_3_27")
 
     should contain_file("/test/boxen/phpenv/versions/5.3").with({
       :ensure => "symlink",
diff --git a/spec/classes/php_5_4_spec.rb b/spec/classes/php_5_4_spec.rb
index 0e1eec3..ad52feb 100644
--- a/spec/classes/php_5_4_spec.rb
+++ b/spec/classes/php_5_4_spec.rb
@@ -4,8 +4,8 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("php")
-    should include_class("php::5_4_17")
+    should contain_class("php")
+    should contain_class("php::5_4_17")
 
     should contain_file("/test/boxen/phpenv/versions/5.4").with({
       :ensure => "symlink",
diff --git a/spec/classes/php_composer_spec.rb b/spec/classes/php_composer_spec.rb
index 9100930..51c0337 100644
--- a/spec/classes/php_composer_spec.rb
+++ b/spec/classes/php_composer_spec.rb
@@ -4,7 +4,7 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("php")
+    should contain_class("php")
 
     should contain_exec("download-php-composer").with({
       :command => "curl -sS -o /test/boxen/phpenv/bin/composer https://getcomposer.org/download/1.0.0-alpha8/composer.phar",
diff --git a/spec/classes/php_config_spec.rb b/spec/classes/php_config_spec.rb
index 9fbad3a..c253c9b 100644
--- a/spec/classes/php_config_spec.rb
+++ b/spec/classes/php_config_spec.rb
@@ -4,6 +4,6 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("boxen::config")
+    should contain_class("boxen::config")
   end
 end
diff --git a/spec/classes/php_global_spec.rb b/spec/classes/php_global_spec.rb
index 08474d0..5d8a271 100644
--- a/spec/classes/php_global_spec.rb
+++ b/spec/classes/php_global_spec.rb
@@ -9,8 +9,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_file("/test/boxen/phpenv/version").with({
       :ensure  => "present",
diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb
index 369dfb2..a48f976 100644
--- a/spec/classes/php_spec.rb
+++ b/spec/classes/php_spec.rb
@@ -5,15 +5,15 @@
   let(:phpenv_version) { "6499bb6c7b645af3f4e67f7e17708d5ee208453f" }
 
   it do
-    should include_class("php::config")
-    should include_class("homebrew")
-    should include_class("stdlib")
-    should include_class("wget")
-    should include_class("autoconf")
-    should include_class("libtool")
-    should include_class("pkgconfig")
-    should include_class("pcre")
-    should include_class("libpng")
+    should contain_class("boxen::config")
+    should contain_class("homebrew")
+    should contain_class("stdlib")
+    should contain_class("wget")
+    should contain_class("autoconf")
+    should contain_class("libtool")
+    should contain_class("pkgconfig")
+    should contain_class("pcre")
+    should contain_class("libpng")
 
     should contain_package("phpenv").with({
       :ensure => "absent"
diff --git a/spec/defines/extensions/php_extension_apc_spec.rb b/spec/defines/extensions/php_extension_apc_spec.rb
index 7eab8c6..a493987 100644
--- a/spec/defines/extensions/php_extension_apc_spec.rb
+++ b/spec/defines/extensions/php_extension_apc_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("apc for 5.4.17").with({
       :extension      => "apc",
diff --git a/spec/defines/extensions/php_extension_couchbase_spec.rb b/spec/defines/extensions/php_extension_couchbase_spec.rb
index b00378a..b92d081 100644
--- a/spec/defines/extensions/php_extension_couchbase_spec.rb
+++ b/spec/defines/extensions/php_extension_couchbase_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("couchbase::lib")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("couchbase::lib")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/couchbase").with({
       :source => "couchbase/php-ext-couchbase"
diff --git a/spec/defines/extensions/php_extension_imagick_spec.rb b/spec/defines/extensions/php_extension_imagick_spec.rb
index 11533de..a5f1f35 100644
--- a/spec/defines/extensions/php_extension_imagick_spec.rb
+++ b/spec/defines/extensions/php_extension_imagick_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("imagemagick")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("imagemagick")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("imagick for 5.4.17").with({
       :extension        => "imagick",
diff --git a/spec/defines/extensions/php_extension_intl_spec.rb b/spec/defines/extensions/php_extension_intl_spec.rb
index ff9a183..cdf1123 100644
--- a/spec/defines/extensions/php_extension_intl_spec.rb
+++ b/spec/defines/extensions/php_extension_intl_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("intl for 5.4.17").with({
       :extension        => "intl",
diff --git a/spec/defines/extensions/php_extension_mcrypt_spec.rb b/spec/defines/extensions/php_extension_mcrypt_spec.rb
index 1b455df..ea22662 100644
--- a/spec/defines/extensions/php_extension_mcrypt_spec.rb
+++ b/spec/defines/extensions/php_extension_mcrypt_spec.rb
@@ -10,8 +10,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("mcrypt for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_memcached_spec.rb b/spec/defines/extensions/php_extension_memcached_spec.rb
index 9df9bda..3da4469 100644
--- a/spec/defines/extensions/php_extension_memcached_spec.rb
+++ b/spec/defines/extensions/php_extension_memcached_spec.rb
@@ -12,10 +12,10 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("memcached::lib")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("memcached::lib")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("memcached for 5.4.17").with({
       :extension        => "memcached",
diff --git a/spec/defines/extensions/php_extension_mssql_spec.rb b/spec/defines/extensions/php_extension_mssql_spec.rb
index 866058e..9b9a1cd 100644
--- a/spec/defines/extensions/php_extension_mssql_spec.rb
+++ b/spec/defines/extensions/php_extension_mssql_spec.rb
@@ -10,9 +10,9 @@
   end
 
   it do
-    should include_class("php::dependencies::freetds")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::dependencies::freetds")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("mssql for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
index 2a3d896..e5192b2 100644
--- a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
+++ b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
@@ -10,9 +10,9 @@
   end
 
   it do
-    should include_class("php::dependencies::freetds")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::dependencies::freetds")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("pdo_dblib for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pecl_http_spec.rb b/spec/defines/extensions/php_extension_pecl_http_spec.rb
index 2adf3bd..b411fbc 100644
--- a/spec/defines/extensions/php_extension_pecl_http_spec.rb
+++ b/spec/defines/extensions/php_extension_pecl_http_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("pecl_http for 5.4.17").with({
       :extension     => "pecl_http",
diff --git a/spec/defines/extensions/php_extension_pgsql_spec.rb b/spec/defines/extensions/php_extension_pgsql_spec.rb
index 554e3d4..0e7bbb4 100644
--- a/spec/defines/extensions/php_extension_pgsql_spec.rb
+++ b/spec/defines/extensions/php_extension_pgsql_spec.rb
@@ -10,8 +10,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("pgsql for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_redis_spec.rb b/spec/defines/extensions/php_extension_redis_spec.rb
index 90bf0b3..4a00252 100644
--- a/spec/defines/extensions/php_extension_redis_spec.rb
+++ b/spec/defines/extensions/php_extension_redis_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("redis")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("redis")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/redis").with({
       :source => "nicolasff/phpredis"
diff --git a/spec/defines/extensions/php_extension_xdebug_spec.rb b/spec/defines/extensions/php_extension_xdebug_spec.rb
index fd5e0fe..b15cda4 100644
--- a/spec/defines/extensions/php_extension_xdebug_spec.rb
+++ b/spec/defines/extensions/php_extension_xdebug_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("xdebug for 5.4.17").with({
       :extension     => "xdebug",
diff --git a/spec/defines/extensions/php_extension_xhprof_spec.rb b/spec/defines/extensions/php_extension_xhprof_spec.rb
index a5c2638..1d95fd0 100644
--- a/spec/defines/extensions/php_extension_xhprof_spec.rb
+++ b/spec/defines/extensions/php_extension_xhprof_spec.rb
@@ -11,8 +11,8 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("xhprof for 5.4.17").with({
       :extension     => "xhprof",
diff --git a/spec/defines/extensions/php_extension_zmq_spec.rb b/spec/defines/extensions/php_extension_zmq_spec.rb
index 1d3488f..19cbf39 100644
--- a/spec/defines/extensions/php_extension_zmq_spec.rb
+++ b/spec/defines/extensions/php_extension_zmq_spec.rb
@@ -12,9 +12,9 @@
   end
 
   it do
-    should include_class("zeromq")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("zeromq")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/zmq").with({
       :source => "mkoppanen/php-zmq"
diff --git a/spec/defines/extensions/php_extension_zookeeper_spec.rb b/spec/defines/extensions/php_extension_zookeeper_spec.rb
index 52a422f..59d3d23 100644
--- a/spec/defines/extensions/php_extension_zookeeper_spec.rb
+++ b/spec/defines/extensions/php_extension_zookeeper_spec.rb
@@ -12,10 +12,10 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("zookeeper")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("zookeeper")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("zookeeper for 5.4.17").with({
       :extension     => "zookeeper",
diff --git a/spec/defines/fpm/php_fpm_pool_spec.rb b/spec/defines/fpm/php_fpm_pool_spec.rb
index cf643c6..d4c2289 100644
--- a/spec/defines/fpm/php_fpm_pool_spec.rb
+++ b/spec/defines/fpm/php_fpm_pool_spec.rb
@@ -14,8 +14,8 @@
     end
 
     it do
-      should include_class("php::config")
-      should include_class("php::fpm::5_4_17")
+      should contain_class("php::config")
+      should contain_class("php::fpm::5_4_17")
 
       should contain_file("/test/boxen/config/php/5.4.17/pool.d/5_4_17_for_test.conf").with({
         :content => File.read("spec/fixtures/php-fpm-pool-custom.conf"),
diff --git a/spec/defines/fpm/php_fpm_service_spec.rb b/spec/defines/fpm/php_fpm_service_spec.rb
index 1e392b0..c032ab8 100644
--- a/spec/defines/fpm/php_fpm_service_spec.rb
+++ b/spec/defines/fpm/php_fpm_service_spec.rb
@@ -11,9 +11,9 @@
       }
     end
     it do
-      should include_class("php::config")
-      should include_class("nginx::config")
-      should include_class("php::fpm::fastcgi")
+      should contain_class("php::config")
+      should contain_class("nginx::config")
+      should contain_class("php::fpm::fastcgi")
 
       should contain_file("/Library/LaunchDaemons/dev.php-fpm.5.4.17.plist").with({
         :content => File.read("spec/fixtures/dev.php-fpm.plist"),
diff --git a/spec/defines/php_fpm_spec.rb b/spec/defines/php_fpm_spec.rb
index 8f91b63..9ffb911 100644
--- a/spec/defines/php_fpm_spec.rb
+++ b/spec/defines/php_fpm_spec.rb
@@ -13,7 +13,7 @@
     end
 
     it do
-      should include_class("php::5_4_17")
+      should contain_class("php::5_4_17")
 
       should contain_file("/test/boxen/config/php/5.4.17/php-fpm.conf").with({
         :content => File.read("spec/fixtures/php-fpm.conf"),
diff --git a/spec/defines/php_local_spec.rb b/spec/defines/php_local_spec.rb
index 4c348d1..5e6b4e2 100644
--- a/spec/defines/php_local_spec.rb
+++ b/spec/defines/php_local_spec.rb
@@ -12,8 +12,8 @@
     end
 
     it do
-      should include_class("php::config")
-      should include_class('php::5_4_17')
+      should contain_class("php::config")
+      should contain_class('php::5_4_17')
 
       should contain_file('/tmp/.php-version').with({
         :ensure  => "present",
@@ -31,7 +31,7 @@
     end
 
     it do
-      should include_class("php::config")
+      should contain_class("php::config")
       should contain_file('/tmp/.php-version').with_ensure('absent')
     end
   end
diff --git a/spec/defines/php_project_spec.rb b/spec/defines/php_project_spec.rb
index 6f07212..7e7f252 100644
--- a/spec/defines/php_project_spec.rb
+++ b/spec/defines/php_project_spec.rb
@@ -11,31 +11,31 @@
   let(:params) { default_test_params }
 
   it do
-    should include_class("boxen::config")
+    should contain_class("boxen::config")
     should contain_repository("/Users/testuser/src/testproject").with({
       :source => "testuser/testproject-repo"
     })
 
-    should_not include_class("elasticsearch")
-    should_not include_class("memcached")
-    should_not include_class("mongodb")
-    should_not include_class("cassandra")
-    should_not include_class("beanstalk")
-    should_not include_class("zookeeper")
-    should_not include_class("zeromq")
-    should_not include_class("nsq")
+    should_not contain_class("elasticsearch")
+    should_not contain_class("memcached")
+    should_not contain_class("mongodb")
+    should_not contain_class("cassandra")
+    should_not contain_class("beanstalk")
+    should_not contain_class("zookeeper")
+    should_not contain_class("zeromq")
+    should_not contain_class("nsq")
 
     should_not contain_mysql__db
 
-    should_not include_class("nginx::config")
-    should_not include_class("nginx")
+    should_not contain_class("nginx::config")
+    should_not contain_class("nginx")
     should_not contain_file("/test/boxen/config/nginx/sites/testproject.conf")
 
     should_not contain_nodejs__local("/Users/testuser/src/testproject")
 
     should_not contain_postgresql__db
 
-    should_not include_class("redis")
+    should_not contain_class("redis")
 
     should_not contain_ruby__local("/Users/testuser/src/testproject")
 
@@ -66,7 +66,7 @@
       })
     end
 
-    it { should include_class("elasticsearch") }
+    it { should contain_class("elasticsearch") }
   end
 
   context "memcached => true" do
@@ -77,7 +77,7 @@
       })
     end
 
-    it { should include_class("memcached") }
+    it { should contain_class("memcached") }
   end
 
   context "mongodb => true" do
@@ -88,7 +88,7 @@
       })
     end
 
-    it { should include_class("mongodb") }
+    it { should contain_class("mongodb") }
   end
 
   context "cassandra => true" do
@@ -99,7 +99,7 @@
       })
     end
 
-    it { should include_class("cassandra") }
+    it { should contain_class("cassandra") }
   end
 
   context "beanstalk => true" do
@@ -110,7 +110,7 @@
       })
     end
 
-    it { should include_class("beanstalk") }
+    it { should contain_class("beanstalk") }
   end
 
   context "zookeeper => true" do
@@ -121,7 +121,7 @@
       })
     end
 
-    it { should include_class("zookeeper") }
+    it { should contain_class("zookeeper") }
   end
 
   context "zeromq => true" do
@@ -132,7 +132,7 @@
       })
     end
 
-    it { should include_class("zeromq") }
+    it { should contain_class("zeromq") }
   end
 
   context "nsq => true" do
@@ -143,7 +143,7 @@
       })
     end
 
-    it { should include_class("nsq") }
+    it { should contain_class("nsq") }
   end
 
   context "mysql => a_database_name" do
@@ -164,8 +164,8 @@
     end
 
     it do
-      should include_class("nginx::config")
-      should include_class("nginx")
+      should contain_class("nginx::config")
+      should contain_class("nginx")
 
       should contain_file("/test/boxen/config/nginx/sites/testproject.conf").with({
         :content => File.read("spec/fixtures/nginx.conf"),
@@ -215,7 +215,7 @@ class sysctl {}
       })
     end
 
-    it { should include_class("redis") }
+    it { should contain_class("redis") }
   end
 
   context "ruby => 2.0.0" do
diff --git a/spec/defines/php_version_spec.rb b/spec/defines/php_version_spec.rb
index b1a8cf4..1b0db9c 100644
--- a/spec/defines/php_version_spec.rb
+++ b/spec/defines/php_version_spec.rb
@@ -5,8 +5,8 @@
   let(:title) { "5.4.17" }
 
   it do
-    should include_class("php")
-    should include_class("boxen::config")
+    should contain_class("php")
+    should contain_class("boxen::config")
   end
 
   context 'ensure => installed' do
diff --git a/spec/fixtures/Puppetfile b/spec/fixtures/Puppetfile
index d8ba1f0..ede7f1a 100644
--- a/spec/fixtures/Puppetfile
+++ b/spec/fixtures/Puppetfile
@@ -11,3 +11,4 @@ mod "libpng",      "1.0.0", :github_tarball => "boxen/puppet-libpng"
 mod "mysql",       "1.1.3", :github_tarball => "boxen/puppet-mysql"
 mod "postgresql",  "2.0.1", :github_tarball => "boxen/puppet-postgresql"
 mod "nginx",       "1.4.2", :github_tarball => "boxen/puppet-nginx"
+mod "module_data", "0.0.3", :github_tarball => "ripienaar/puppet-module-data"
diff --git a/spec/fixtures/Puppetfile.lock b/spec/fixtures/Puppetfile.lock
index ef51276..7225d84 100644
--- a/spec/fixtures/Puppetfile.lock
+++ b/spec/fixtures/Puppetfile.lock
@@ -63,12 +63,18 @@ GITHUBTARBALL
   specs:
     stdlib (4.1.0)
 
+GITHUBTARBALL
+  remote: ripienaar/puppet-module-data
+  specs:
+    module_data (0.0.3)
+
 DEPENDENCIES
   autoconf (= 1.0.0)
   boxen (= 3.0.2)
   homebrew (= 1.4.1)
   libpng (= 1.0.0)
   libtool (= 1.0.0)
+  module_data (= 0.0.3)
   mysql (= 1.1.3)
   nginx (= 1.4.2)
   pcre (= 1.0.0)
diff --git a/spec/fixtures/hiera/hiera.yaml b/spec/fixtures/hiera/hiera.yaml
new file mode 100644
index 0000000..0350eed
--- /dev/null
+++ b/spec/fixtures/hiera/hiera.yaml
@@ -0,0 +1,6 @@
+---
+:hierarchy:
+  - test
+
+:yaml:
+  :datadir: 'spec/fixtures/hiera'
diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
new file mode 100644
index 0000000..f6d1d75
--- /dev/null
+++ b/spec/fixtures/hiera/test.yaml
@@ -0,0 +1,9 @@
+---
+php::config::root: "/test/boxen/phpenv"
+php::config::logdir: "/test/boxen/log/php"
+php::config::configdir: "/test/boxen/config/php"
+php::config::datadir: "/test/boxen/data/php"
+php::config::pluginsdir: "/test/boxen/phpenv/plugins"
+php::config::cachedir: "/test/boxen/data/php/cache"
+php::config::extensioncachedir: "/test/boxen/data/php/cache/extensions"
+php::config::configure_params: {}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index feedaf8..3f6240c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,9 +2,12 @@
 
 fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
 
+$: << File.join(fixture_path, 'modules/module_data/lib')
+
 RSpec.configure do |c|
   c.module_path = File.join(fixture_path, 'modules')
   c.manifest_dir = File.join(fixture_path, 'manifests')
+  c.hiera_config = File.join(fixture_path, 'hiera/hiera.yaml')
 end
 
 def default_test_facts

From 9edb58f65ebf8991f5f47e92888a387298b953a1 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 16:50:49 +1100
Subject: [PATCH 33/57] Fix error in php 5.5 manifst

---
 manifests/5_5.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/5_5.pp b/manifests/5_5.pp
index db4440e..105e6cd 100644
--- a/manifests/5_5.pp
+++ b/manifests/5_5.pp
@@ -2,7 +2,8 @@
 #
 # Usage:
 #
-#     include php::5-5
+#     include php::5_5
+#
 class php::5_5 {
   require php
   require php::5_5_0
@@ -10,6 +11,6 @@
   file { "${php::config::root}/versions/5.5":
     ensure  => symlink,
     force   => true,
-    target  => "${php::root}/versions/5.5.0"
+    target  => "${php::config::root}/versions/5.5.0"
   }
 }

From f596cebcc1e413df5e21a9fa83a991fed52b9ec1 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 16:51:54 +1100
Subject: [PATCH 34/57] Add better version checking to php source compilation.
 Remove libevent for newer PHP versions.

---
 lib/puppet/provider/php_version/php_source.rb | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 53e9b5d..356abba 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -1,5 +1,20 @@
 require 'puppet/util/execution'
 
+class Version < Array
+  def initialize s
+    super(s.split('.').map { |e| e.to_i })
+  end
+  def < x
+    (self <=> x) < 0
+  end
+  def > x
+    (self <=> x) > 0
+  end
+  def == x
+    (self <=> x) == 0
+  end
+end
+
 Puppet::Type.type(:php_version).provide(:php_source) do
   include Puppet::Util::Execution
   desc "Provides PHP versions compiled from the official source code repository"
@@ -253,7 +268,6 @@ def get_configure_args(version, install_path, config_path)
       "--with-zlib=#{@resource[:homebrew_path]}/opt/zlibphp",
       "--with-snmp=/usr",
       "--with-libedit",
-      "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent",
       "--with-mhash",
       "--with-curl",
       "--with-openssl=/usr",
@@ -267,7 +281,14 @@ def get_configure_args(version, install_path, config_path)
     ]
 
     # PHP-FPM isn't available until 5.3.3
-    args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
+    if Version.new(@resource[:version]) > Version.new('5.3.2')
+      args << "--enable-fpm"
+    end
+
+    # libevent was removed in 5.3.8
+    if Version.new(@resource[:version]) < Version.new('5.3.8')
+      args << "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent"
+    end
 
     # User specified configure params
     args << @resource[:configure_params]

From 229a547ef1d85c5077e7e543900162a74b9b6c88 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 16:52:46 +1100
Subject: [PATCH 35/57] Add PHP 5.6.X and specs, also add spec for pthreads
 extension.

---
 manifests/5_6.pp                              | 15 +++++++++
 manifests/5_6_0.pp                            |  8 +++++
 manifests/5_6_1.pp                            |  8 +++++
 manifests/fpm/5_6_0.pp                        | 10 ++++++
 manifests/fpm/5_6_1.pp                        | 10 ++++++
 spec/classes/fpm/php_fpm_5_6_0_spec.rb        |  9 ++++++
 spec/classes/fpm/php_fpm_5_6_1_spec.rb        |  9 ++++++
 spec/classes/php_5_5_spec.rb                  | 16 ++++++++++
 spec/classes/php_5_6_0_spec.rb                |  9 ++++++
 spec/classes/php_5_6_1_spec.rb                |  9 ++++++
 spec/classes/php_5_6_spec.rb                  | 16 ++++++++++
 .../extensions/php_extension_pthreads_spec.rb | 32 +++++++++++++++++++
 spec/fixtures/pthreads.ini                    |  1 +
 13 files changed, 152 insertions(+)
 create mode 100644 manifests/5_6.pp
 create mode 100644 manifests/5_6_0.pp
 create mode 100644 manifests/5_6_1.pp
 create mode 100644 manifests/fpm/5_6_0.pp
 create mode 100644 manifests/fpm/5_6_1.pp
 create mode 100644 spec/classes/fpm/php_fpm_5_6_0_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_1_spec.rb
 create mode 100644 spec/classes/php_5_5_spec.rb
 create mode 100644 spec/classes/php_5_6_0_spec.rb
 create mode 100644 spec/classes/php_5_6_1_spec.rb
 create mode 100644 spec/classes/php_5_6_spec.rb
 create mode 100644 spec/defines/extensions/php_extension_pthreads_spec.rb
 create mode 100644 spec/fixtures/pthreads.ini

diff --git a/manifests/5_6.pp b/manifests/5_6.pp
new file mode 100644
index 0000000..7a9a774
--- /dev/null
+++ b/manifests/5_6.pp
@@ -0,0 +1,15 @@
+# Installs php 5.6.0 and symlinks it as 5.6
+#
+# Usage:
+#
+#     include php::5_6
+class php::5_6 {
+  require php
+  require php::5_6_0
+
+  file { "${php::config::root}/versions/5.6":
+    ensure  => symlink,
+    force   => true,
+    target  => "${php::config::root}/versions/5.6.0"
+  }
+}
diff --git a/manifests/5_6_0.pp b/manifests/5_6_0.pp
new file mode 100644
index 0000000..f7a9287
--- /dev/null
+++ b/manifests/5_6_0.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.0
+#
+# Usage:
+#
+#     include php::5_6_0
+class php::5_6_0 {
+  php::version { '5.6.0': }
+}
diff --git a/manifests/5_6_1.pp b/manifests/5_6_1.pp
new file mode 100644
index 0000000..4a8e3f9
--- /dev/null
+++ b/manifests/5_6_1.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.1
+#
+# Usage:
+#
+#     include php::5_6_1
+class php::5_6_1 {
+  php::version { '5.6.1': }
+}
diff --git a/manifests/fpm/5_6_0.pp b/manifests/fpm/5_6_0.pp
new file mode 100644
index 0000000..70a1a0b
--- /dev/null
+++ b/manifests/fpm/5_6_0.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.0
+# Installs PHP 5.6.0 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_0
+#
+class php::fpm::5_6_0 {
+  php::fpm { '5.6.0': }
+}
diff --git a/manifests/fpm/5_6_1.pp b/manifests/fpm/5_6_1.pp
new file mode 100644
index 0000000..40e0aab
--- /dev/null
+++ b/manifests/fpm/5_6_1.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.1
+# Installs PHP 5.6.1 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_1
+#
+class php::fpm::5_6_1 {
+  php::fpm { '5.6.1': }
+}
diff --git a/spec/classes/fpm/php_fpm_5_6_0_spec.rb b/spec/classes/fpm/php_fpm_5_6_0_spec.rb
new file mode 100644
index 0000000..99152ec
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_0_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_0" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.0")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_1_spec.rb b/spec/classes/fpm/php_fpm_5_6_1_spec.rb
new file mode 100644
index 0000000..98ce4d0
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_1_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_1" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.1")
+  end
+end
diff --git a/spec/classes/php_5_5_spec.rb b/spec/classes/php_5_5_spec.rb
new file mode 100644
index 0000000..bef96f3
--- /dev/null
+++ b/spec/classes/php_5_5_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "php::5_5" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_class("php")
+    should contain_class("php::5_5_0")
+
+    should contain_file("/test/boxen/phpenv/versions/5.5").with({
+      :ensure => "symlink",
+      :force  => true,
+      :target => "/test/boxen/phpenv/versions/5.5.0"
+    })
+  end
+end
diff --git a/spec/classes/php_5_6_0_spec.rb b/spec/classes/php_5_6_0_spec.rb
new file mode 100644
index 0000000..55ff16c
--- /dev/null
+++ b/spec/classes/php_5_6_0_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_0" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.0")
+  end
+end
diff --git a/spec/classes/php_5_6_1_spec.rb b/spec/classes/php_5_6_1_spec.rb
new file mode 100644
index 0000000..590c432
--- /dev/null
+++ b/spec/classes/php_5_6_1_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_1" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.1")
+  end
+end
diff --git a/spec/classes/php_5_6_spec.rb b/spec/classes/php_5_6_spec.rb
new file mode 100644
index 0000000..aded60e
--- /dev/null
+++ b/spec/classes/php_5_6_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "php::5_6" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_class("php")
+    should contain_class("php::5_6_0")
+
+    should contain_file("/test/boxen/phpenv/versions/5.6").with({
+      :ensure => "symlink",
+      :force  => true,
+      :target => "/test/boxen/phpenv/versions/5.6.0"
+    })
+  end
+end
diff --git a/spec/defines/extensions/php_extension_pthreads_spec.rb b/spec/defines/extensions/php_extension_pthreads_spec.rb
new file mode 100644
index 0000000..02c191d
--- /dev/null
+++ b/spec/defines/extensions/php_extension_pthreads_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "php::extension::pthreads" do
+  let(:facts) { default_test_facts }
+  let(:title) { "pthreads for 5.4.17" }
+  let(:params) do
+    {
+      :php     => "5.4.17",
+      :version => "2.0.10"
+    }
+  end
+
+  it do
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
+
+    should contain_php_extension("pthreads for 5.4.17").with({
+      :extension      => "pthreads",
+      :version        => "2.0.10",
+      :package_name   => "pthreads-2.0.10",
+      :package_url    => "http://pecl.php.net/get/pthreads-2.0.10.tgz",
+      :homebrew_path  => "/test/boxen/homebrew",
+      :phpenv_root    => "/test/boxen/phpenv",
+      :php_version    => "5.4.17",
+    })
+
+    should contain_file("/test/boxen/config/php/5.4.17/conf.d/pthreads.ini").with({
+      :content => File.read("spec/fixtures/pthreads.ini"),
+      :require => "Php_extension[pthreads for 5.4.17]"
+    })
+  end
+end
diff --git a/spec/fixtures/pthreads.ini b/spec/fixtures/pthreads.ini
new file mode 100644
index 0000000..d7b01c2
--- /dev/null
+++ b/spec/fixtures/pthreads.ini
@@ -0,0 +1 @@
+extension=/test/boxen/phpenv/versions/5.4.17/modules/pthreads.so

From 42e4680d016d965de0d5e0d0e99210d82123b59b Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 17:24:43 +1100
Subject: [PATCH 36/57] Put Version class into it's own file.

---
 lib/puppet/provider/php_version/php_source.rb | 16 +---------------
 lib/util/version.rb                           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 lib/util/version.rb

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index 356abba..a4df267 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -1,19 +1,5 @@
 require 'puppet/util/execution'
-
-class Version < Array
-  def initialize s
-    super(s.split('.').map { |e| e.to_i })
-  end
-  def < x
-    (self <=> x) < 0
-  end
-  def > x
-    (self <=> x) > 0
-  end
-  def == x
-    (self <=> x) == 0
-  end
-end
+require 'lib/util/version'
 
 Puppet::Type.type(:php_version).provide(:php_source) do
   include Puppet::Util::Execution
diff --git a/lib/util/version.rb b/lib/util/version.rb
new file mode 100644
index 0000000..313c4e5
--- /dev/null
+++ b/lib/util/version.rb
@@ -0,0 +1,14 @@
+class Version < Array
+  def initialize s
+    super(s.split('.').map { |e| e.to_i })
+  end
+  def < x
+    (self <=> x) < 0
+  end
+  def > x
+    (self <=> x) > 0
+  end
+  def == x
+    (self <=> x) == 0
+  end
+end

From 4567a8f05ba5e8c58f3228f6c497adc125bf0267 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 10 Nov 2014 17:55:33 +1100
Subject: [PATCH 37/57] Use Gem::Version

---
 lib/puppet/provider/php_version/php_source.rb |  5 ++---
 lib/util/version.rb                           | 14 --------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 lib/util/version.rb

diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb
index a4df267..563164a 100644
--- a/lib/puppet/provider/php_version/php_source.rb
+++ b/lib/puppet/provider/php_version/php_source.rb
@@ -1,5 +1,4 @@
 require 'puppet/util/execution'
-require 'lib/util/version'
 
 Puppet::Type.type(:php_version).provide(:php_source) do
   include Puppet::Util::Execution
@@ -267,12 +266,12 @@ def get_configure_args(version, install_path, config_path)
     ]
 
     # PHP-FPM isn't available until 5.3.3
-    if Version.new(@resource[:version]) > Version.new('5.3.2')
+    if Gem::Version.new(@resource[:version]) > Gem::Version.new('5.3.2')
       args << "--enable-fpm"
     end
 
     # libevent was removed in 5.3.8
-    if Version.new(@resource[:version]) < Version.new('5.3.8')
+    if Gem::Version.new(@resource[:version]) < Gem::Version.new('5.3.8')
       args << "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent"
     end
 
diff --git a/lib/util/version.rb b/lib/util/version.rb
deleted file mode 100644
index 313c4e5..0000000
--- a/lib/util/version.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Version < Array
-  def initialize s
-    super(s.split('.').map { |e| e.to_i })
-  end
-  def < x
-    (self <=> x) < 0
-  end
-  def > x
-    (self <=> x) > 0
-  end
-  def == x
-    (self <=> x) == 0
-  end
-end

From aa22d1a1a260055088c5db68b03f4f0b64d954b7 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 27 Nov 2014 11:53:15 +1100
Subject: [PATCH 38/57] boxen::config is included in php::config

---
 manifests/extension/ssh2.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/extension/ssh2.pp b/manifests/extension/ssh2.pp
index 6174f5b..982135e 100644
--- a/manifests/extension/ssh2.pp
+++ b/manifests/extension/ssh2.pp
@@ -11,7 +11,6 @@
   $php,
   $version = '0.12'
 ) {
-  include boxen::config
   require ssh2::lib
 
   require php::config

From 73b403538ea9b589d6b78566a05f322bc1b3ffb8 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 27 Nov 2014 11:54:10 +1100
Subject: [PATCH 39/57] Update to newer spec methods.

---
 spec/defines/extensions/php_extension_ssh2_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/defines/extensions/php_extension_ssh2_spec.rb b/spec/defines/extensions/php_extension_ssh2_spec.rb
index 4109033..a834f05 100644
--- a/spec/defines/extensions/php_extension_ssh2_spec.rb
+++ b/spec/defines/extensions/php_extension_ssh2_spec.rb
@@ -12,10 +12,10 @@
   end
 
   it do
-    should include_class("boxen::config")
-    should include_class("ssh2::lib")
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("boxen::config")
+    should contain_class("ssh2::lib")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("ssh2 for 5.4.17").with({
       :extension        => "ssh2",

From e85ef2c020bc7e7aa5bc40aa80ec728c8db614d5 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 27 Nov 2014 14:24:19 +1100
Subject: [PATCH 40/57] Add newer versions of PHP and notify when user installs
 insecure version of PHP.

---
 manifests/5_4_35.pp                     |  9 +++++++++
 manifests/5_5_19.pp                     |  8 ++++++++
 manifests/5_6_2.pp                      |  8 ++++++++
 manifests/5_6_3.pp                      |  8 ++++++++
 manifests/fpm/5_4_35.pp                 | 10 ++++++++++
 manifests/fpm/5_5_19.pp                 | 10 ++++++++++
 manifests/fpm/5_6_2.pp                  | 10 ++++++++++
 manifests/fpm/5_6_3.pp                  | 10 ++++++++++
 manifests/version.pp                    | 20 ++++++++++++++++++++
 spec/classes/fpm/php_fpm_5_4_35_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_5_19_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_6_2_spec.rb  |  9 +++++++++
 spec/classes/fpm/php_fpm_5_6_3_spec.rb  |  9 +++++++++
 spec/classes/php_5_4_35_spec.rb         |  9 +++++++++
 spec/classes/php_5_5_19_spec.rb         |  9 +++++++++
 spec/classes/php_5_6_2_spec.rb          |  9 +++++++++
 spec/classes/php_5_6_3_spec.rb          |  9 +++++++++
 17 files changed, 165 insertions(+)
 create mode 100644 manifests/5_4_35.pp
 create mode 100644 manifests/5_5_19.pp
 create mode 100644 manifests/5_6_2.pp
 create mode 100644 manifests/5_6_3.pp
 create mode 100644 manifests/fpm/5_4_35.pp
 create mode 100644 manifests/fpm/5_5_19.pp
 create mode 100644 manifests/fpm/5_6_2.pp
 create mode 100644 manifests/fpm/5_6_3.pp
 create mode 100644 spec/classes/fpm/php_fpm_5_4_35_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_5_19_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_2_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_3_spec.rb
 create mode 100644 spec/classes/php_5_4_35_spec.rb
 create mode 100644 spec/classes/php_5_5_19_spec.rb
 create mode 100644 spec/classes/php_5_6_2_spec.rb
 create mode 100644 spec/classes/php_5_6_3_spec.rb

diff --git a/manifests/5_4_35.pp b/manifests/5_4_35.pp
new file mode 100644
index 0000000..2bdb94e
--- /dev/null
+++ b/manifests/5_4_35.pp
@@ -0,0 +1,9 @@
+# Installs php 5.4.35
+#
+# Usage:
+#
+#     include php::5_4_35
+#
+class php::5_4_35 {
+  php::version { '5.4.35': }
+}
diff --git a/manifests/5_5_19.pp b/manifests/5_5_19.pp
new file mode 100644
index 0000000..d453aa4
--- /dev/null
+++ b/manifests/5_5_19.pp
@@ -0,0 +1,8 @@
+# Installs php 5.5.19
+#
+# Usage:
+#
+#     include php::5_5_19
+class php::5_5_19 {
+  php::version { '5.5.19': }
+}
diff --git a/manifests/5_6_2.pp b/manifests/5_6_2.pp
new file mode 100644
index 0000000..0b7931e
--- /dev/null
+++ b/manifests/5_6_2.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.2
+#
+# Usage:
+#
+#     include php::5_6_2
+class php::5_6_2 {
+  php::version { '5.6.2': }
+}
diff --git a/manifests/5_6_3.pp b/manifests/5_6_3.pp
new file mode 100644
index 0000000..5500853
--- /dev/null
+++ b/manifests/5_6_3.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.3
+#
+# Usage:
+#
+#     include php::5_6_3
+class php::5_6_3 {
+  php::version { '5.6.3': }
+}
diff --git a/manifests/fpm/5_4_35.pp b/manifests/fpm/5_4_35.pp
new file mode 100644
index 0000000..b6b7b42
--- /dev/null
+++ b/manifests/fpm/5_4_35.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.4.35
+# Installs PHP 5.4.35 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_4_35
+#
+class php::fpm::5_4_35 {
+  php::fpm { '5.4.35': }
+}
diff --git a/manifests/fpm/5_5_19.pp b/manifests/fpm/5_5_19.pp
new file mode 100644
index 0000000..fc1d482
--- /dev/null
+++ b/manifests/fpm/5_5_19.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.19
+# Installs PHP 5.5.19 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_19
+#
+class php::fpm::5_5_19 {
+  php::fpm { '5.5.19': }
+}
diff --git a/manifests/fpm/5_6_2.pp b/manifests/fpm/5_6_2.pp
new file mode 100644
index 0000000..358203a
--- /dev/null
+++ b/manifests/fpm/5_6_2.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.2
+# Installs PHP 5.6.2 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_2
+#
+class php::fpm::5_6_2 {
+  php::fpm { '5.6.2': }
+}
diff --git a/manifests/fpm/5_6_3.pp b/manifests/fpm/5_6_3.pp
new file mode 100644
index 0000000..55d91ce
--- /dev/null
+++ b/manifests/fpm/5_6_3.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.3
+# Installs PHP 5.6.3 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_3
+#
+class php::fpm::5_6_3 {
+  php::fpm { '5.6.3': }
+}
diff --git a/manifests/version.pp b/manifests/version.pp
index ef20256..7b9002b 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -17,6 +17,26 @@
   require php
   include mysql::config
 
+  # Current supported and secure versions
+  $secure_5_6 = '5.6.3'
+  $secure_5_5 = '5.5.19'
+  $secure_5_4 = '5.4.35'
+
+  # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
+  if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
+    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
+  }
+
+  # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
+  if versioncmp($version, '5.5') >= 0 and versioncmp($version, $secure_5_5) < 0 {
+    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
+  }
+
+  # Version is less than the minimum secure version
+  if versioncmp($version, $secure_5_4) < 0 {
+    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
+  }
+
   # Install location
   $dest = "${php::config::root}/versions/${version}"
 
diff --git a/spec/classes/fpm/php_fpm_5_4_35_spec.rb b/spec/classes/fpm/php_fpm_5_4_35_spec.rb
new file mode 100644
index 0000000..f2086d8
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_4_35_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_4_35" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.4.35")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_5_19_spec.rb b/spec/classes/fpm/php_fpm_5_5_19_spec.rb
new file mode 100644
index 0000000..9887b1f
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_5_19_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_19" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.19")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_2_spec.rb b/spec/classes/fpm/php_fpm_5_6_2_spec.rb
new file mode 100644
index 0000000..51a22e8
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_2_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_2" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.2")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_3_spec.rb b/spec/classes/fpm/php_fpm_5_6_3_spec.rb
new file mode 100644
index 0000000..1908566
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_3_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_3" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.3")
+  end
+end
diff --git a/spec/classes/php_5_4_35_spec.rb b/spec/classes/php_5_4_35_spec.rb
new file mode 100644
index 0000000..38c39fd
--- /dev/null
+++ b/spec/classes/php_5_4_35_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_4_35" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.4.35")
+  end
+end
diff --git a/spec/classes/php_5_5_19_spec.rb b/spec/classes/php_5_5_19_spec.rb
new file mode 100644
index 0000000..75d76af
--- /dev/null
+++ b/spec/classes/php_5_5_19_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_5_19" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.5.19")
+  end
+end
diff --git a/spec/classes/php_5_6_2_spec.rb b/spec/classes/php_5_6_2_spec.rb
new file mode 100644
index 0000000..9a4cbe2
--- /dev/null
+++ b/spec/classes/php_5_6_2_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_2" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.2")
+  end
+end
diff --git a/spec/classes/php_5_6_3_spec.rb b/spec/classes/php_5_6_3_spec.rb
new file mode 100644
index 0000000..0e47af2
--- /dev/null
+++ b/spec/classes/php_5_6_3_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_3" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.3")
+  end
+end

From f14565bc6794e6ee013765d66d04c08a0fec33a0 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Mon, 8 Dec 2014 13:10:52 +1100
Subject: [PATCH 41/57] Warn when PHP version is insecure

Don't just notice
---
 manifests/version.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 7b9002b..74d74e4 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -24,17 +24,17 @@
 
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
   if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
-    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
+    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
   }
 
   # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
   if versioncmp($version, '5.5') >= 0 and versioncmp($version, $secure_5_5) < 0 {
-    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
+    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
   }
 
   # Version is less than the minimum secure version
   if versioncmp($version, $secure_5_4) < 0 {
-    notice("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
+    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
   }
 
   # Install location

From c1c75fd66fdb268c87f8644328813942d149631a Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 23 Dec 2014 19:06:10 +1100
Subject: [PATCH 42/57] Add PHP 5.4.36, 5.5.20, 5.6.4

---
 manifests/5_4_36.pp                     |  9 +++++++++
 manifests/5_5_20.pp                     |  8 ++++++++
 manifests/5_6_4.pp                      |  8 ++++++++
 manifests/fpm/5_4_36.pp                 | 10 ++++++++++
 manifests/fpm/5_5_20.pp                 | 10 ++++++++++
 manifests/fpm/5_6_4.pp                  | 10 ++++++++++
 manifests/version.pp                    |  6 +++---
 spec/classes/fpm/php_fpm_5_4_36_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_5_20_spec.rb |  9 +++++++++
 spec/classes/fpm/php_fpm_5_6_4_spec.rb  |  9 +++++++++
 spec/classes/php_5_4_36_spec.rb         |  9 +++++++++
 spec/classes/php_5_5_20_spec.rb         |  9 +++++++++
 spec/classes/php_5_6_4_spec.rb          |  9 +++++++++
 13 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 manifests/5_4_36.pp
 create mode 100644 manifests/5_5_20.pp
 create mode 100644 manifests/5_6_4.pp
 create mode 100644 manifests/fpm/5_4_36.pp
 create mode 100644 manifests/fpm/5_5_20.pp
 create mode 100644 manifests/fpm/5_6_4.pp
 create mode 100644 spec/classes/fpm/php_fpm_5_4_36_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_5_20_spec.rb
 create mode 100644 spec/classes/fpm/php_fpm_5_6_4_spec.rb
 create mode 100644 spec/classes/php_5_4_36_spec.rb
 create mode 100644 spec/classes/php_5_5_20_spec.rb
 create mode 100644 spec/classes/php_5_6_4_spec.rb

diff --git a/manifests/5_4_36.pp b/manifests/5_4_36.pp
new file mode 100644
index 0000000..9f294d3
--- /dev/null
+++ b/manifests/5_4_36.pp
@@ -0,0 +1,9 @@
+# Installs php 5.4.36
+#
+# Usage:
+#
+#     include php::5_4_36
+#
+class php::5_4_36 {
+  php::version { '5.4.36': }
+}
diff --git a/manifests/5_5_20.pp b/manifests/5_5_20.pp
new file mode 100644
index 0000000..7ff2232
--- /dev/null
+++ b/manifests/5_5_20.pp
@@ -0,0 +1,8 @@
+# Installs php 5.5.20
+#
+# Usage:
+#
+#     include php::5_5_20
+class php::5_5_20 {
+  php::version { '5.5.20': }
+}
diff --git a/manifests/5_6_4.pp b/manifests/5_6_4.pp
new file mode 100644
index 0000000..9bfa082
--- /dev/null
+++ b/manifests/5_6_4.pp
@@ -0,0 +1,8 @@
+# Installs php 5.6.4
+#
+# Usage:
+#
+#     include php::5_6_4
+class php::5_6_4 {
+  php::version { '5.6.4': }
+}
diff --git a/manifests/fpm/5_4_36.pp b/manifests/fpm/5_4_36.pp
new file mode 100644
index 0000000..8be1c34
--- /dev/null
+++ b/manifests/fpm/5_4_36.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.4.36
+# Installs PHP 5.4.36 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_4_36
+#
+class php::fpm::5_4_36 {
+  php::fpm { '5.4.36': }
+}
diff --git a/manifests/fpm/5_5_20.pp b/manifests/fpm/5_5_20.pp
new file mode 100644
index 0000000..07fcca8
--- /dev/null
+++ b/manifests/fpm/5_5_20.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.20
+# Installs PHP 5.5.20 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_20
+#
+class php::fpm::5_5_20 {
+  php::fpm { '5.5.20': }
+}
diff --git a/manifests/fpm/5_6_4.pp b/manifests/fpm/5_6_4.pp
new file mode 100644
index 0000000..8d51efc
--- /dev/null
+++ b/manifests/fpm/5_6_4.pp
@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.6.4
+# Installs PHP 5.6.4 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_6_4
+#
+class php::fpm::5_6_4 {
+  php::fpm { '5.6.4': }
+}
diff --git a/manifests/version.pp b/manifests/version.pp
index 74d74e4..fc68d95 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -18,9 +18,9 @@
   include mysql::config
 
   # Current supported and secure versions
-  $secure_5_6 = '5.6.3'
-  $secure_5_5 = '5.5.19'
-  $secure_5_4 = '5.4.35'
+  $secure_5_6 = '5.6.4'
+  $secure_5_5 = '5.5.20'
+  $secure_5_4 = '5.4.36'
 
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
   if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
diff --git a/spec/classes/fpm/php_fpm_5_4_36_spec.rb b/spec/classes/fpm/php_fpm_5_4_36_spec.rb
new file mode 100644
index 0000000..c9e83fa
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_4_36_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_4_36" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.4.36")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_5_20_spec.rb b/spec/classes/fpm/php_fpm_5_5_20_spec.rb
new file mode 100644
index 0000000..328d696
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_5_20_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_20" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.20")
+  end
+end
diff --git a/spec/classes/fpm/php_fpm_5_6_4_spec.rb b/spec/classes/fpm/php_fpm_5_6_4_spec.rb
new file mode 100644
index 0000000..9e6042f
--- /dev/null
+++ b/spec/classes/fpm/php_fpm_5_6_4_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_6_4" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.6.4")
+  end
+end
diff --git a/spec/classes/php_5_4_36_spec.rb b/spec/classes/php_5_4_36_spec.rb
new file mode 100644
index 0000000..df8aff9
--- /dev/null
+++ b/spec/classes/php_5_4_36_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_4_36" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.4.36")
+  end
+end
diff --git a/spec/classes/php_5_5_20_spec.rb b/spec/classes/php_5_5_20_spec.rb
new file mode 100644
index 0000000..26baf4e
--- /dev/null
+++ b/spec/classes/php_5_5_20_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_5_20" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.5.20")
+  end
+end
diff --git a/spec/classes/php_5_6_4_spec.rb b/spec/classes/php_5_6_4_spec.rb
new file mode 100644
index 0000000..44a41ac
--- /dev/null
+++ b/spec/classes/php_5_6_4_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::5_6_4" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__version("5.6.4")
+  end
+end

From 5e07387ba04df67ebbca46b1149c5baafff3abda Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 8 Jan 2015 14:55:46 +1100
Subject: [PATCH 43/57] Fix tests for stats extension.

---
 .../extensions/php_extension_stats_spec.rb    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/defines/extensions/php_extension_stats_spec.rb b/spec/defines/extensions/php_extension_stats_spec.rb
index 9eca570..560d2d4 100644
--- a/spec/defines/extensions/php_extension_stats_spec.rb
+++ b/spec/defines/extensions/php_extension_stats_spec.rb
@@ -11,18 +11,18 @@
   end
 
   it do
-    should include_class("php::config")
-    should include_class("php::5_4_17")
+    should contain_class("php::config")
+    should contain_class("php::5_4_17")
 
     should contain_php_extension("stats for 5.4.17").with({
-      :extension     => "stats",
-      :version       => "1.0.3",
-      :package_name  => "stats-1.0.3",
-      :package_url   => "http://pecl.php.net/get/stats-1.0.3.tgz",
-      :homebrew_path => "/test/boxen/homebrew",
-      :phpenv_root   => "/test/boxen/phpenv",
-      :php_version   => "5.4.17",
-      :cache_dir     => "/test/boxen/data/php/cache/extensions",
+      :extension      => "stats",
+      :version        => "1.0.3",
+      :package_name   => "stats-1.0.3",
+      :package_url    => "http://pecl.php.net/get/stats-1.0.3.tgz",
+      :homebrew_path  => "/test/boxen/homebrew",
+      :phpenv_root    => "/test/boxen/phpenv",
+      :php_version    => "5.4.17",
+      :cache_dir      => "/test/boxen/data/php/cache/extensions",
     })
 
     should contain_file("/test/boxen/config/php/5.4.17/conf.d/stats.ini").with({

From 84612e76c1d2424e826814f0333de6acece866d5 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 8 Jan 2015 23:20:18 +1100
Subject: [PATCH 44/57] Make Composer version and checksum configurable. Bump
 to 1.0.0-alpha9 as well.

---
 data/common.yaml                  |  3 +++
 manifests/composer.pp             | 27 ++++++++++++++++++++++++---
 manifests/config.pp               |  4 +++-
 spec/classes/php_composer_spec.rb |  4 ++--
 spec/fixtures/hiera/test.yaml     |  3 +++
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 2b8d54c..d256984 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -7,3 +7,6 @@ php::config::pluginsdir:        "%{php::config::root}/plugins"
 php::config::cachedir:          "%{php::config::datadir}/cache"
 php::config::extensioncachedir: "%{php::config::datadir}/cache/extensions"
 php::config::configure_params:  {}
+php::config::composer:
+  version:  '1.0.0-alpha9'
+  checksum: '05df355b5277c8c9012470e699fa5494'
diff --git a/manifests/composer.pp b/manifests/composer.pp
index 2dbfb9a..d898121 100644
--- a/manifests/composer.pp
+++ b/manifests/composer.pp
@@ -7,14 +7,35 @@
 class php::composer {
   require php
 
+  # Get composer config
+  $test_params = $php::config::composer
+  if is_hash($test_params) {
+    if has_key($test_params, 'version') {
+      $composer_version = $test_params['version']
+      $composer_url = "https://getcomposer.org/download/${composer_version}/composer.phar"
+    }
+    if has_key($test_params, 'checksum') {
+      $composer_checksum = $test_params['checksum']
+    }
+  }
+
+  if empty($composer_version) {
+    err('No Composer version has been specified. Cannot install Composer.')
+  }
+  if empty($composer_checksum) {
+    err('No Composer checksum has been specified. Cannot install Composer.')
+  }
+
+  $composer_path = "${php::config::root}/bin/composer"
+
   exec { 'download-php-composer':
-    command => "curl -sS -o ${php::config::root}/bin/composer https://getcomposer.org/download/1.0.0-alpha8/composer.phar",
-    unless  => "[ -f ${php::config::root}/bin/composer ] && [ \"`md5 -q ${php::config::root}/bin/composer`\" = \"df1001975035f07d09307bf1f1e62584\" ]",
+    command => "curl -sS -o ${composer_path} ${composer_url}",
+    unless  => "[ -f ${composer_path} ] && [ \"`md5 -q ${composer_path}`\" = \"${composer_checksum}\" ]",
     cwd     => $php::config::root,
     require => Exec['phpenv-setup-root-repo']
   } ->
 
-  file { "${php::config::root}/bin/composer":
+  file { $composer_path:
     mode => '0755'
   }
 }
diff --git a/manifests/config.pp b/manifests/config.pp
index 62b9e7e..5df4647 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -13,6 +13,7 @@
   $cachedir           = undef,
   $extensioncachedir  = undef,
   $configure_params   = undef,
+  $composer           = undef,
 ) {
   include boxen::config
 
@@ -27,6 +28,7 @@
   )
 
   validate_hash(
-    $configure_params
+    $configure_params,
+    $composer,
   )
 }
diff --git a/spec/classes/php_composer_spec.rb b/spec/classes/php_composer_spec.rb
index 51c0337..edb4729 100644
--- a/spec/classes/php_composer_spec.rb
+++ b/spec/classes/php_composer_spec.rb
@@ -7,8 +7,8 @@
     should contain_class("php")
 
     should contain_exec("download-php-composer").with({
-      :command => "curl -sS -o /test/boxen/phpenv/bin/composer https://getcomposer.org/download/1.0.0-alpha8/composer.phar",
-      :unless  => "[ -f /test/boxen/phpenv/bin/composer ] && [ \"`md5 -q /test/boxen/phpenv/bin/composer`\" = \"df1001975035f07d09307bf1f1e62584\" ]",
+      :command => "curl -sS -o /test/boxen/phpenv/bin/composer https://getcomposer.org/download/1.0.0-alpha9/composer.phar",
+      :unless  => "[ -f /test/boxen/phpenv/bin/composer ] && [ \"`md5 -q /test/boxen/phpenv/bin/composer`\" = \"05df355b5277c8c9012470e699fa5494\" ]",
       :cwd     => "/test/boxen/phpenv",
       :require => "Exec[phpenv-setup-root-repo]"
     })
diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
index f6d1d75..5200c62 100644
--- a/spec/fixtures/hiera/test.yaml
+++ b/spec/fixtures/hiera/test.yaml
@@ -7,3 +7,6 @@ php::config::pluginsdir: "/test/boxen/phpenv/plugins"
 php::config::cachedir: "/test/boxen/data/php/cache"
 php::config::extensioncachedir: "/test/boxen/data/php/cache/extensions"
 php::config::configure_params: {}
+php::config::composer:
+  version:  '1.0.0-alpha9'
+  checksum: '05df355b5277c8c9012470e699fa5494'

From 584d6f220efa85d826597dd31954777df77cf7e3 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Thu, 8 Jan 2015 23:58:23 +1100
Subject: [PATCH 45/57] Move phpenv revision to Hiera config.

---
 data/common.yaml              |  2 ++
 manifests/config.pp           |  2 ++
 manifests/init.pp             | 17 ++++++++---------
 spec/fixtures/hiera/test.yaml |  2 ++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index d256984..6db19f5 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -10,3 +10,5 @@ php::config::configure_params:  {}
 php::config::composer:
   version:  '1.0.0-alpha9'
   checksum: '05df355b5277c8c9012470e699fa5494'
+php::config::phpenv:
+  revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
diff --git a/manifests/config.pp b/manifests/config.pp
index 5df4647..36eda48 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -14,6 +14,7 @@
   $extensioncachedir  = undef,
   $configure_params   = undef,
   $composer           = undef,
+  $phpenv             = undef,
 ) {
   include boxen::config
 
@@ -30,5 +31,6 @@
   validate_hash(
     $configure_params,
     $composer,
+    $phpenv,
   )
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index f006bf1..e9eebf6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,8 +22,6 @@
   # Get rid of any pre-installed packages
   package { ['phpenv', 'php-build']: ensure => absent; }
 
-  $phpenv_version = '6499bb6c7b645af3f4e67f7e17708d5ee208453f' # Pin to latest version of dev branch as of 2013-10-11
-
   file {
     [
       $php::config::root,
@@ -121,10 +119,11 @@
 
   # Set up phpenv
 
-  $git_init   = 'git init .'
-  $git_remote = 'git remote add origin https://github.com/phpenv/phpenv.git'
-  $git_fetch  = 'git fetch -q origin'
-  $git_reset  = "git reset --hard ${phpenv_version}"
+  $git_init     = 'git init .'
+  $git_remote   = 'git remote add origin https://github.com/phpenv/phpenv.git'
+  $git_fetch    = 'git fetch -q origin'
+  $git_revision = $php::config::phpenv['revision']
+  $git_reset    = "git reset --hard ${git_revision}"
 
   exec { 'phpenv-setup-root-repo':
     command => "${git_init} && ${git_remote} && ${git_fetch} && ${git_reset}",
@@ -136,9 +135,9 @@
     ]
   }
 
-  exec { "ensure-phpenv-version-${phpenv_version}":
-    command => "${git_fetch} && git reset --hard ${phpenv_version}",
-    unless  => "git rev-parse HEAD | grep ${phpenv_version}",
+  exec { "ensure-phpenv-version-${git_revision}":
+    command => "${git_fetch} && git reset --hard ${git_revision}",
+    unless  => "git rev-parse HEAD | grep ${git_revision}",
     cwd     => $php::config::root,
     require => Exec['phpenv-setup-root-repo']
   }
diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
index 5200c62..5876257 100644
--- a/spec/fixtures/hiera/test.yaml
+++ b/spec/fixtures/hiera/test.yaml
@@ -10,3 +10,5 @@ php::config::configure_params: {}
 php::config::composer:
   version:  '1.0.0-alpha9'
   checksum: '05df355b5277c8c9012470e699fa5494'
+php::config::phpenv:
+  revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'

From 3b1f7a4bca31da80c894ac6936f8a077cc14cd00 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 13 Jan 2015 13:44:57 +1100
Subject: [PATCH 46/57] Dry up PHP require actions into a custom Puppet
 function.

---
 lib/puppet/parser/functions/php_require.rb           |  6 ++++++
 manifests/extension/apc.pp                           |  2 +-
 manifests/extension/couchbase.pp                     |  2 +-
 manifests/extension/imagick.pp                       |  2 +-
 manifests/extension/intl.pp                          |  2 +-
 manifests/extension/mcrypt.pp                        |  2 +-
 manifests/extension/memcache.pp                      |  2 +-
 manifests/extension/memcached.pp                     |  2 +-
 manifests/extension/mongo.pp                         |  2 +-
 manifests/extension/mssql.pp                         |  2 +-
 manifests/extension/oauth.pp                         |  2 +-
 manifests/extension/pdo_dblib.pp                     |  2 +-
 manifests/extension/pdo_pgsql.pp                     |  2 +-
 manifests/extension/pecl_http.pp                     |  2 +-
 manifests/extension/pgsql.pp                         |  2 +-
 manifests/extension/pthreads.pp                      |  2 +-
 manifests/extension/redis.pp                         |  2 +-
 manifests/extension/ssh2.pp                          |  2 +-
 manifests/extension/stats.pp                         |  2 +-
 manifests/extension/xdebug.pp                        |  2 +-
 manifests/extension/xhprof.pp                        |  2 +-
 manifests/extension/zmq.pp                           |  2 +-
 manifests/extension/zookeeper.pp                     |  2 +-
 manifests/fpm.pp                                     |  2 +-
 manifests/global.pp                                  |  2 +-
 manifests/local.pp                                   |  2 +-
 spec/lib/puppet/parser/functions/php_require_spec.rb | 11 +++++++++++
 27 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 lib/puppet/parser/functions/php_require.rb
 create mode 100644 spec/lib/puppet/parser/functions/php_require_spec.rb

diff --git a/lib/puppet/parser/functions/php_require.rb b/lib/puppet/parser/functions/php_require.rb
new file mode 100644
index 0000000..9957c08
--- /dev/null
+++ b/lib/puppet/parser/functions/php_require.rb
@@ -0,0 +1,6 @@
+module Puppet::Parser::Functions
+  newfunction(:php_require) do |args|
+    Puppet::Parser::Functions.function('require')
+    function_require( [ ['php', args[0].split('.').join('_')].join('::') ] )
+  end
+end
diff --git a/manifests/extension/apc.pp b/manifests/extension/apc.pp
index d056873..90776e6 100644
--- a/manifests/extension/apc.pp
+++ b/manifests/extension/apc.pp
@@ -14,7 +14,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'apc'
   $package_name = "APC-${version}"
diff --git a/manifests/extension/couchbase.pp b/manifests/extension/couchbase.pp
index ba6969a..c8542a8 100644
--- a/manifests/extension/couchbase.pp
+++ b/manifests/extension/couchbase.pp
@@ -16,7 +16,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'couchbase'
 
diff --git a/manifests/extension/imagick.pp b/manifests/extension/imagick.pp
index d34428c..1e26a96 100644
--- a/manifests/extension/imagick.pp
+++ b/manifests/extension/imagick.pp
@@ -16,7 +16,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'imagick'
   $package_name = "imagick-${version}"
diff --git a/manifests/extension/intl.pp b/manifests/extension/intl.pp
index 9d1a2ff..d6e41f2 100644
--- a/manifests/extension/intl.pp
+++ b/manifests/extension/intl.pp
@@ -15,7 +15,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'intl'
   $package_name = "intl-${version}"
diff --git a/manifests/extension/mcrypt.pp b/manifests/extension/mcrypt.pp
index 8c7d666..ab40e3f 100644
--- a/manifests/extension/mcrypt.pp
+++ b/manifests/extension/mcrypt.pp
@@ -13,7 +13,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'mcrypt'
 
diff --git a/manifests/extension/memcache.pp b/manifests/extension/memcache.pp
index 0a41a6d..3cdbf67 100644
--- a/manifests/extension/memcache.pp
+++ b/manifests/extension/memcache.pp
@@ -16,7 +16,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
 
   $extension = 'memcache'
diff --git a/manifests/extension/memcached.pp b/manifests/extension/memcached.pp
index 331f055..edd1046 100644
--- a/manifests/extension/memcached.pp
+++ b/manifests/extension/memcached.pp
@@ -17,7 +17,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
 
   $extension = 'memcached'
diff --git a/manifests/extension/mongo.pp b/manifests/extension/mongo.pp
index c9021ed..d9c7035 100644
--- a/manifests/extension/mongo.pp
+++ b/manifests/extension/mongo.pp
@@ -14,7 +14,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'mongo'
   $package_name = "mongo-${version}"
diff --git a/manifests/extension/mssql.pp b/manifests/extension/mssql.pp
index 7b94d38..e27ad5c 100644
--- a/manifests/extension/mssql.pp
+++ b/manifests/extension/mssql.pp
@@ -14,7 +14,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'mssql'
 
diff --git a/manifests/extension/oauth.pp b/manifests/extension/oauth.pp
index e1e7999..d8c84e8 100644
--- a/manifests/extension/oauth.pp
+++ b/manifests/extension/oauth.pp
@@ -14,7 +14,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'oauth'
   $package_name = "oauth-${version}"
diff --git a/manifests/extension/pdo_dblib.pp b/manifests/extension/pdo_dblib.pp
index 255c705..0b70a2b 100644
--- a/manifests/extension/pdo_dblib.pp
+++ b/manifests/extension/pdo_dblib.pp
@@ -14,7 +14,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'pdo_dblib'
 
diff --git a/manifests/extension/pdo_pgsql.pp b/manifests/extension/pdo_pgsql.pp
index a0dd825..8592065 100644
--- a/manifests/extension/pdo_pgsql.pp
+++ b/manifests/extension/pdo_pgsql.pp
@@ -13,7 +13,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'pdo_pgsql'
 
diff --git a/manifests/extension/pecl_http.pp b/manifests/extension/pecl_http.pp
index 3269dbb..c563cac 100644
--- a/manifests/extension/pecl_http.pp
+++ b/manifests/extension/pecl_http.pp
@@ -16,7 +16,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'pecl_http'
   $package_name = "pecl_http-${version}"
diff --git a/manifests/extension/pgsql.pp b/manifests/extension/pgsql.pp
index 597ad28..4e5c7eb 100644
--- a/manifests/extension/pgsql.pp
+++ b/manifests/extension/pgsql.pp
@@ -13,7 +13,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'pgsql'
 
diff --git a/manifests/extension/pthreads.pp b/manifests/extension/pthreads.pp
index fa606b2..4184919 100644
--- a/manifests/extension/pthreads.pp
+++ b/manifests/extension/pthreads.pp
@@ -22,7 +22,7 @@
 
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'pthreads'
   $package_name = "pthreads-${version}"
diff --git a/manifests/extension/redis.pp b/manifests/extension/redis.pp
index 31f94a8..d3359a4 100644
--- a/manifests/extension/redis.pp
+++ b/manifests/extension/redis.pp
@@ -16,7 +16,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'redis'
 
diff --git a/manifests/extension/ssh2.pp b/manifests/extension/ssh2.pp
index 982135e..780a273 100644
--- a/manifests/extension/ssh2.pp
+++ b/manifests/extension/ssh2.pp
@@ -16,7 +16,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'ssh2'
   $package_name = "ssh2-${version}"
diff --git a/manifests/extension/stats.pp b/manifests/extension/stats.pp
index 22f3920..5af61a9 100644
--- a/manifests/extension/stats.pp
+++ b/manifests/extension/stats.pp
@@ -14,7 +14,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'stats'
   $package_name = "stats-${version}"
diff --git a/manifests/extension/xdebug.pp b/manifests/extension/xdebug.pp
index bd27986..d9ffe1b 100644
--- a/manifests/extension/xdebug.pp
+++ b/manifests/extension/xdebug.pp
@@ -14,7 +14,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'xdebug'
   $package_name = "xdebug-${version}"
diff --git a/manifests/extension/xhprof.pp b/manifests/extension/xhprof.pp
index b0d1efd..7ed7846 100644
--- a/manifests/extension/xhprof.pp
+++ b/manifests/extension/xhprof.pp
@@ -15,7 +15,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'xhprof'
   $package_name = "xhprof-${version}"
diff --git a/manifests/extension/zmq.pp b/manifests/extension/zmq.pp
index f4c0405..96af6cf 100644
--- a/manifests/extension/zmq.pp
+++ b/manifests/extension/zmq.pp
@@ -16,7 +16,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'zmq'
 
diff --git a/manifests/extension/zookeeper.pp b/manifests/extension/zookeeper.pp
index 26247e0..236943d 100644
--- a/manifests/extension/zookeeper.pp
+++ b/manifests/extension/zookeeper.pp
@@ -17,7 +17,7 @@
   require php::config
   # Require php version eg. php::5_4_10
   # This will compile, install and set up config dirs if not present
-  require join(['php', join(split($php, '[.]'), '_')], '::')
+  php_require($php)
 
   $extension = 'zookeeper'
   $package_name = "zookeeper-${version}"
diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index 61dc30b..a827b70 100644
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -28,7 +28,7 @@
   if $ensure == present {
     # Require php version eg. php::5_4_10
     # This will compile, install and set up config dirs if not present
-    require join(['php', join(split($version, '[.]'), '_')], '::')
+    php_require($version)
 
     # FPM Binary
     $bin = "${php::config::root}/versions/${version}/sbin/php-fpm"
diff --git a/manifests/global.pp b/manifests/global.pp
index 515b7e6..c417aac 100644
--- a/manifests/global.pp
+++ b/manifests/global.pp
@@ -14,7 +14,7 @@
   }
 
   if $version != 'system' {
-    require join(['php', join(split($version, '[.]'), '_')], '::')
+    php_require($version)
   }
 
   file { "${php::config::root}/version":
diff --git a/manifests/local.pp b/manifests/local.pp
index 942b075..12ec33c 100644
--- a/manifests/local.pp
+++ b/manifests/local.pp
@@ -10,7 +10,7 @@
 
   if $version != 'system' and $ensure == present {
     # Requires php version eg. php::5_4_10
-    require join(['php', join(split($version, '[.]'), '_')], '::')
+    php_require($version)
   }
 
   file { "${name}/.php-version":
diff --git a/spec/lib/puppet/parser/functions/php_require_spec.rb b/spec/lib/puppet/parser/functions/php_require_spec.rb
new file mode 100644
index 0000000..6145659
--- /dev/null
+++ b/spec/lib/puppet/parser/functions/php_require_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "the php_require function" do
+  before :all do
+    Puppet::Parser::Functions.autoloader.loadall
+  end
+
+  it "should exist" do
+    Puppet::Parser::Functions.function("php_require").should == "function_php_require"
+  end
+end

From 7bc8c521223e553cd6dca0df03cd4707a0ec209d Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 13 Jan 2015 14:29:15 +1100
Subject: [PATCH 47/57] Move to ensure_resource instead of include.

---
 lib/puppet/parser/functions/php_require.rb              | 4 ++--
 spec/classes/php_global_spec.rb                         | 2 +-
 spec/defines/extensions/php_extension_apc_spec.rb       | 2 +-
 spec/defines/extensions/php_extension_couchbase_spec.rb | 2 +-
 spec/defines/extensions/php_extension_imagick_spec.rb   | 2 +-
 spec/defines/extensions/php_extension_intl_spec.rb      | 2 +-
 spec/defines/extensions/php_extension_mcrypt_spec.rb    | 2 +-
 spec/defines/extensions/php_extension_memcached_spec.rb | 2 +-
 spec/defines/extensions/php_extension_mssql_spec.rb     | 2 +-
 spec/defines/extensions/php_extension_pdo_dblib_spec.rb | 2 +-
 spec/defines/extensions/php_extension_pecl_http_spec.rb | 2 +-
 spec/defines/extensions/php_extension_pgsql_spec.rb     | 2 +-
 spec/defines/extensions/php_extension_pthreads_spec.rb  | 2 +-
 spec/defines/extensions/php_extension_redis_spec.rb     | 2 +-
 spec/defines/extensions/php_extension_ssh2_spec.rb      | 2 +-
 spec/defines/extensions/php_extension_stats_spec.rb     | 2 +-
 spec/defines/extensions/php_extension_xdebug_spec.rb    | 2 +-
 spec/defines/extensions/php_extension_xhprof_spec.rb    | 2 +-
 spec/defines/extensions/php_extension_zmq_spec.rb       | 2 +-
 spec/defines/extensions/php_extension_zookeeper_spec.rb | 2 +-
 spec/defines/php_fpm_spec.rb                            | 2 +-
 spec/defines/php_local_spec.rb                          | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/puppet/parser/functions/php_require.rb b/lib/puppet/parser/functions/php_require.rb
index 9957c08..538d476 100644
--- a/lib/puppet/parser/functions/php_require.rb
+++ b/lib/puppet/parser/functions/php_require.rb
@@ -1,6 +1,6 @@
 module Puppet::Parser::Functions
   newfunction(:php_require) do |args|
-    Puppet::Parser::Functions.function('require')
-    function_require( [ ['php', args[0].split('.').join('_')].join('::') ] )
+    Puppet::Parser::Functions.function('ensure_resource')
+    function_ensure_resource( [ 'php::version', args[0] ] )
   end
 end
diff --git a/spec/classes/php_global_spec.rb b/spec/classes/php_global_spec.rb
index 5d8a271..6b8173c 100644
--- a/spec/classes/php_global_spec.rb
+++ b/spec/classes/php_global_spec.rb
@@ -10,7 +10,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_file("/test/boxen/phpenv/version").with({
       :ensure  => "present",
diff --git a/spec/defines/extensions/php_extension_apc_spec.rb b/spec/defines/extensions/php_extension_apc_spec.rb
index a493987..f0ac172 100644
--- a/spec/defines/extensions/php_extension_apc_spec.rb
+++ b/spec/defines/extensions/php_extension_apc_spec.rb
@@ -12,7 +12,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("apc for 5.4.17").with({
       :extension      => "apc",
diff --git a/spec/defines/extensions/php_extension_couchbase_spec.rb b/spec/defines/extensions/php_extension_couchbase_spec.rb
index b92d081..1aa29ab 100644
--- a/spec/defines/extensions/php_extension_couchbase_spec.rb
+++ b/spec/defines/extensions/php_extension_couchbase_spec.rb
@@ -14,7 +14,7 @@
   it do
     should contain_class("couchbase::lib")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/couchbase").with({
       :source => "couchbase/php-ext-couchbase"
diff --git a/spec/defines/extensions/php_extension_imagick_spec.rb b/spec/defines/extensions/php_extension_imagick_spec.rb
index a5f1f35..0666e4a 100644
--- a/spec/defines/extensions/php_extension_imagick_spec.rb
+++ b/spec/defines/extensions/php_extension_imagick_spec.rb
@@ -14,7 +14,7 @@
   it do
     should contain_class("php::config")
     should contain_class("imagemagick")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("imagick for 5.4.17").with({
       :extension        => "imagick",
diff --git a/spec/defines/extensions/php_extension_intl_spec.rb b/spec/defines/extensions/php_extension_intl_spec.rb
index cdf1123..3b73953 100644
--- a/spec/defines/extensions/php_extension_intl_spec.rb
+++ b/spec/defines/extensions/php_extension_intl_spec.rb
@@ -12,7 +12,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("intl for 5.4.17").with({
       :extension        => "intl",
diff --git a/spec/defines/extensions/php_extension_mcrypt_spec.rb b/spec/defines/extensions/php_extension_mcrypt_spec.rb
index ea22662..f801208 100644
--- a/spec/defines/extensions/php_extension_mcrypt_spec.rb
+++ b/spec/defines/extensions/php_extension_mcrypt_spec.rb
@@ -11,7 +11,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("mcrypt for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_memcached_spec.rb b/spec/defines/extensions/php_extension_memcached_spec.rb
index 3da4469..762db0d 100644
--- a/spec/defines/extensions/php_extension_memcached_spec.rb
+++ b/spec/defines/extensions/php_extension_memcached_spec.rb
@@ -15,7 +15,7 @@
     should contain_class("boxen::config")
     should contain_class("memcached::lib")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("memcached for 5.4.17").with({
       :extension        => "memcached",
diff --git a/spec/defines/extensions/php_extension_mssql_spec.rb b/spec/defines/extensions/php_extension_mssql_spec.rb
index 9b9a1cd..ad3ec48 100644
--- a/spec/defines/extensions/php_extension_mssql_spec.rb
+++ b/spec/defines/extensions/php_extension_mssql_spec.rb
@@ -12,7 +12,7 @@
   it do
     should contain_class("php::dependencies::freetds")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("mssql for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
index e5192b2..64a34fa 100644
--- a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
+++ b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb
@@ -12,7 +12,7 @@
   it do
     should contain_class("php::dependencies::freetds")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("pdo_dblib for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pecl_http_spec.rb b/spec/defines/extensions/php_extension_pecl_http_spec.rb
index b411fbc..f78cb2f 100644
--- a/spec/defines/extensions/php_extension_pecl_http_spec.rb
+++ b/spec/defines/extensions/php_extension_pecl_http_spec.rb
@@ -14,7 +14,7 @@
   it do
     should contain_class("boxen::config")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("pecl_http for 5.4.17").with({
       :extension     => "pecl_http",
diff --git a/spec/defines/extensions/php_extension_pgsql_spec.rb b/spec/defines/extensions/php_extension_pgsql_spec.rb
index 0e7bbb4..cb60e94 100644
--- a/spec/defines/extensions/php_extension_pgsql_spec.rb
+++ b/spec/defines/extensions/php_extension_pgsql_spec.rb
@@ -11,7 +11,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("pgsql for 5.4.17").with({
       :provider         => "php_source",
diff --git a/spec/defines/extensions/php_extension_pthreads_spec.rb b/spec/defines/extensions/php_extension_pthreads_spec.rb
index 02c191d..2bcc91c 100644
--- a/spec/defines/extensions/php_extension_pthreads_spec.rb
+++ b/spec/defines/extensions/php_extension_pthreads_spec.rb
@@ -12,7 +12,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("pthreads for 5.4.17").with({
       :extension      => "pthreads",
diff --git a/spec/defines/extensions/php_extension_redis_spec.rb b/spec/defines/extensions/php_extension_redis_spec.rb
index 4a00252..86b4f93 100644
--- a/spec/defines/extensions/php_extension_redis_spec.rb
+++ b/spec/defines/extensions/php_extension_redis_spec.rb
@@ -14,7 +14,7 @@
   it do
     should contain_class("redis")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/redis").with({
       :source => "nicolasff/phpredis"
diff --git a/spec/defines/extensions/php_extension_ssh2_spec.rb b/spec/defines/extensions/php_extension_ssh2_spec.rb
index a834f05..35192a4 100644
--- a/spec/defines/extensions/php_extension_ssh2_spec.rb
+++ b/spec/defines/extensions/php_extension_ssh2_spec.rb
@@ -15,7 +15,7 @@
     should contain_class("boxen::config")
     should contain_class("ssh2::lib")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("ssh2 for 5.4.17").with({
       :extension        => "ssh2",
diff --git a/spec/defines/extensions/php_extension_stats_spec.rb b/spec/defines/extensions/php_extension_stats_spec.rb
index 560d2d4..9dd45cb 100644
--- a/spec/defines/extensions/php_extension_stats_spec.rb
+++ b/spec/defines/extensions/php_extension_stats_spec.rb
@@ -12,7 +12,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("stats for 5.4.17").with({
       :extension      => "stats",
diff --git a/spec/defines/extensions/php_extension_xdebug_spec.rb b/spec/defines/extensions/php_extension_xdebug_spec.rb
index b15cda4..4763874 100644
--- a/spec/defines/extensions/php_extension_xdebug_spec.rb
+++ b/spec/defines/extensions/php_extension_xdebug_spec.rb
@@ -12,7 +12,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("xdebug for 5.4.17").with({
       :extension     => "xdebug",
diff --git a/spec/defines/extensions/php_extension_xhprof_spec.rb b/spec/defines/extensions/php_extension_xhprof_spec.rb
index 1d95fd0..7753911 100644
--- a/spec/defines/extensions/php_extension_xhprof_spec.rb
+++ b/spec/defines/extensions/php_extension_xhprof_spec.rb
@@ -12,7 +12,7 @@
 
   it do
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("xhprof for 5.4.17").with({
       :extension     => "xhprof",
diff --git a/spec/defines/extensions/php_extension_zmq_spec.rb b/spec/defines/extensions/php_extension_zmq_spec.rb
index 19cbf39..599d8df 100644
--- a/spec/defines/extensions/php_extension_zmq_spec.rb
+++ b/spec/defines/extensions/php_extension_zmq_spec.rb
@@ -14,7 +14,7 @@
   it do
     should contain_class("zeromq")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_repository("/test/boxen/data/php/cache/extensions/zmq").with({
       :source => "mkoppanen/php-zmq"
diff --git a/spec/defines/extensions/php_extension_zookeeper_spec.rb b/spec/defines/extensions/php_extension_zookeeper_spec.rb
index 59d3d23..bd08e89 100644
--- a/spec/defines/extensions/php_extension_zookeeper_spec.rb
+++ b/spec/defines/extensions/php_extension_zookeeper_spec.rb
@@ -15,7 +15,7 @@
     should contain_class("boxen::config")
     should contain_class("zookeeper")
     should contain_class("php::config")
-    should contain_class("php::5_4_17")
+    should contain_php__version("5.4.17")
 
     should contain_php_extension("zookeeper for 5.4.17").with({
       :extension     => "zookeeper",
diff --git a/spec/defines/php_fpm_spec.rb b/spec/defines/php_fpm_spec.rb
index 9ffb911..628316d 100644
--- a/spec/defines/php_fpm_spec.rb
+++ b/spec/defines/php_fpm_spec.rb
@@ -13,7 +13,7 @@
     end
 
     it do
-      should contain_class("php::5_4_17")
+      should contain_php__version("5.4.17")
 
       should contain_file("/test/boxen/config/php/5.4.17/php-fpm.conf").with({
         :content => File.read("spec/fixtures/php-fpm.conf"),
diff --git a/spec/defines/php_local_spec.rb b/spec/defines/php_local_spec.rb
index 5e6b4e2..8a6d264 100644
--- a/spec/defines/php_local_spec.rb
+++ b/spec/defines/php_local_spec.rb
@@ -13,7 +13,7 @@
 
     it do
       should contain_class("php::config")
-      should contain_class('php::5_4_17')
+      should contain_php__version("5.4.17")
 
       should contain_file('/tmp/.php-version').with({
         :ensure  => "present",

From 43c1477aedafe51bc340a98c95c73a8f07d902b9 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 13 Jan 2015 15:18:03 +1100
Subject: [PATCH 48/57] Remove PHP and PHP::FPM static classes.

---
 README.md                                     | 12 ++--
 .../parser/functions/php_fpm_require.rb       |  6 ++
 manifests/5_3.pp                              | 16 -----
 manifests/5_3_10.pp                           |  9 ---
 manifests/5_3_11.pp                           |  9 ---
 manifests/5_3_12.pp                           |  9 ---
 manifests/5_3_13.pp                           |  9 ---
 manifests/5_3_14.pp                           |  9 ---
 manifests/5_3_15.pp                           |  9 ---
 manifests/5_3_16.pp                           |  9 ---
 manifests/5_3_17.pp                           |  9 ---
 manifests/5_3_18.pp                           |  9 ---
 manifests/5_3_19.pp                           |  9 ---
 manifests/5_3_2.pp                            |  9 ---
 manifests/5_3_20.pp                           |  9 ---
 manifests/5_3_21.pp                           |  9 ---
 manifests/5_3_22.pp                           |  9 ---
 manifests/5_3_23.pp                           |  9 ---
 manifests/5_3_24.pp                           |  9 ---
 manifests/5_3_25.pp                           |  9 ---
 manifests/5_3_26.pp                           |  9 ---
 manifests/5_3_27.pp                           |  9 ---
 manifests/5_3_28.pp                           |  9 ---
 manifests/5_3_3.pp                            |  9 ---
 manifests/5_3_4.pp                            |  9 ---
 manifests/5_3_5.pp                            |  9 ---
 manifests/5_3_6.pp                            |  9 ---
 manifests/5_3_7.pp                            |  9 ---
 manifests/5_3_8.pp                            |  9 ---
 manifests/5_3_9.pp                            |  9 ---
 manifests/5_4.pp                              | 16 -----
 manifests/5_4_0.pp                            |  9 ---
 manifests/5_4_1.pp                            |  9 ---
 manifests/5_4_10.pp                           |  9 ---
 manifests/5_4_11.pp                           |  9 ---
 manifests/5_4_12.pp                           |  9 ---
 manifests/5_4_13.pp                           |  9 ---
 manifests/5_4_14.pp                           |  9 ---
 manifests/5_4_15.pp                           |  9 ---
 manifests/5_4_16.pp                           |  9 ---
 manifests/5_4_17.pp                           |  9 ---
 manifests/5_4_18.pp                           |  9 ---
 manifests/5_4_19.pp                           |  9 ---
 manifests/5_4_2.pp                            |  9 ---
 manifests/5_4_20.pp                           |  9 ---
 manifests/5_4_21.pp                           |  9 ---
 manifests/5_4_22.pp                           |  9 ---
 manifests/5_4_23.pp                           |  9 ---
 manifests/5_4_24.pp                           |  9 ---
 manifests/5_4_25.pp                           |  9 ---
 manifests/5_4_26.pp                           |  9 ---
 manifests/5_4_27.pp                           |  9 ---
 manifests/5_4_28.pp                           |  9 ---
 manifests/5_4_29.pp                           |  9 ---
 manifests/5_4_3.pp                            |  9 ---
 manifests/5_4_35.pp                           |  9 ---
 manifests/5_4_36.pp                           |  9 ---
 manifests/5_4_4.pp                            |  9 ---
 manifests/5_4_5.pp                            |  9 ---
 manifests/5_4_6.pp                            |  9 ---
 manifests/5_4_7.pp                            |  9 ---
 manifests/5_4_8.pp                            |  9 ---
 manifests/5_4_9.pp                            |  9 ---
 manifests/5_5.pp                              | 16 -----
 manifests/5_5_0.pp                            |  8 ---
 manifests/5_5_1.pp                            |  8 ---
 manifests/5_5_10.pp                           |  8 ---
 manifests/5_5_11.pp                           |  8 ---
 manifests/5_5_12.pp                           |  8 ---
 manifests/5_5_13.pp                           |  8 ---
 manifests/5_5_14.pp                           |  8 ---
 manifests/5_5_15.pp                           |  8 ---
 manifests/5_5_16.pp                           |  8 ---
 manifests/5_5_18.pp                           |  8 ---
 manifests/5_5_19.pp                           |  8 ---
 manifests/5_5_2.pp                            |  8 ---
 manifests/5_5_20.pp                           |  8 ---
 manifests/5_5_3.pp                            |  8 ---
 manifests/5_5_4.pp                            |  8 ---
 manifests/5_5_5.pp                            |  8 ---
 manifests/5_5_6.pp                            |  8 ---
 manifests/5_5_7.pp                            |  8 ---
 manifests/5_5_8.pp                            |  8 ---
 manifests/5_5_9.pp                            |  8 ---
 manifests/5_6.pp                              | 15 ----
 manifests/5_6_0.pp                            |  8 ---
 manifests/5_6_1.pp                            |  8 ---
 manifests/5_6_2.pp                            |  8 ---
 manifests/5_6_3.pp                            |  8 ---
 manifests/5_6_4.pp                            |  8 ---
 manifests/fpm/5_3_10.pp                       | 10 ---
 manifests/fpm/5_3_11.pp                       | 10 ---
 manifests/fpm/5_3_12.pp                       | 10 ---
 manifests/fpm/5_3_13.pp                       | 10 ---
 manifests/fpm/5_3_14.pp                       | 10 ---
 manifests/fpm/5_3_15.pp                       | 10 ---
 manifests/fpm/5_3_16.pp                       | 10 ---
 manifests/fpm/5_3_17.pp                       | 10 ---
 manifests/fpm/5_3_18.pp                       | 10 ---
 manifests/fpm/5_3_19.pp                       | 10 ---
 manifests/fpm/5_3_2.pp                        | 10 ---
 manifests/fpm/5_3_20.pp                       | 10 ---
 manifests/fpm/5_3_21.pp                       | 10 ---
 manifests/fpm/5_3_22.pp                       | 10 ---
 manifests/fpm/5_3_23.pp                       | 10 ---
 manifests/fpm/5_3_24.pp                       | 10 ---
 manifests/fpm/5_3_25.pp                       | 10 ---
 manifests/fpm/5_3_26.pp                       | 10 ---
 manifests/fpm/5_3_27.pp                       | 10 ---
 manifests/fpm/5_3_28.pp                       | 10 ---
 manifests/fpm/5_3_3.pp                        | 10 ---
 manifests/fpm/5_3_4.pp                        | 10 ---
 manifests/fpm/5_3_5.pp                        | 10 ---
 manifests/fpm/5_3_6.pp                        | 10 ---
 manifests/fpm/5_3_7.pp                        | 10 ---
 manifests/fpm/5_3_8.pp                        | 10 ---
 manifests/fpm/5_3_9.pp                        | 10 ---
 manifests/fpm/5_4_1.pp                        | 10 ---
 manifests/fpm/5_4_10.pp                       | 10 ---
 manifests/fpm/5_4_11.pp                       | 10 ---
 manifests/fpm/5_4_12.pp                       | 10 ---
 manifests/fpm/5_4_13.pp                       | 10 ---
 manifests/fpm/5_4_14.pp                       | 10 ---
 manifests/fpm/5_4_15.pp                       | 10 ---
 manifests/fpm/5_4_16.pp                       | 10 ---
 manifests/fpm/5_4_17.pp                       | 10 ---
 manifests/fpm/5_4_18.pp                       | 10 ---
 manifests/fpm/5_4_19.pp                       | 10 ---
 manifests/fpm/5_4_2.pp                        | 10 ---
 manifests/fpm/5_4_20.pp                       | 10 ---
 manifests/fpm/5_4_21.pp                       | 10 ---
 manifests/fpm/5_4_22.pp                       | 10 ---
 manifests/fpm/5_4_23.pp                       | 10 ---
 manifests/fpm/5_4_24.pp                       | 10 ---
 manifests/fpm/5_4_25.pp                       | 10 ---
 manifests/fpm/5_4_26.pp                       | 10 ---
 manifests/fpm/5_4_27.pp                       | 10 ---
 manifests/fpm/5_4_28.pp                       | 10 ---
 manifests/fpm/5_4_29.pp                       | 10 ---
 manifests/fpm/5_4_3.pp                        | 10 ---
 manifests/fpm/5_4_35.pp                       | 10 ---
 manifests/fpm/5_4_36.pp                       | 10 ---
 manifests/fpm/5_4_4.pp                        | 10 ---
 manifests/fpm/5_4_5.pp                        | 10 ---
 manifests/fpm/5_4_6.pp                        | 10 ---
 manifests/fpm/5_4_7.pp                        | 10 ---
 manifests/fpm/5_4_8.pp                        | 10 ---
 manifests/fpm/5_4_9.pp                        | 10 ---
 manifests/fpm/5_5_0.pp                        | 10 ---
 manifests/fpm/5_5_1.pp                        | 10 ---
 manifests/fpm/5_5_10.pp                       | 10 ---
 manifests/fpm/5_5_11.pp                       | 10 ---
 manifests/fpm/5_5_12.pp                       | 10 ---
 manifests/fpm/5_5_13.pp                       | 10 ---
 manifests/fpm/5_5_14.pp                       | 10 ---
 manifests/fpm/5_5_15.pp                       | 10 ---
 manifests/fpm/5_5_16.pp                       | 10 ---
 manifests/fpm/5_5_18.pp                       | 10 ---
 manifests/fpm/5_5_19.pp                       | 10 ---
 manifests/fpm/5_5_2.pp                        | 10 ---
 manifests/fpm/5_5_20.pp                       | 10 ---
 manifests/fpm/5_5_3.pp                        | 10 ---
 manifests/fpm/5_5_4.pp                        | 10 ---
 manifests/fpm/5_5_5.pp                        | 10 ---
 manifests/fpm/5_5_6.pp                        | 10 ---
 manifests/fpm/5_5_7.pp                        | 10 ---
 manifests/fpm/5_5_8.pp                        | 10 ---
 manifests/fpm/5_5_9.pp                        | 10 ---
 manifests/fpm/5_6_0.pp                        | 10 ---
 manifests/fpm/5_6_1.pp                        | 10 ---
 manifests/fpm/5_6_2.pp                        | 10 ---
 manifests/fpm/5_6_3.pp                        | 10 ---
 manifests/fpm/5_6_4.pp                        | 10 ---
 manifests/fpm/pool.pp                         |  2 +-
 manifests/version.pp                          | 69 +++++++++++--------
 spec/classes/fpm/php_fpm_5_3_10_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_11_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_12_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_13_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_14_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_15_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_16_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_17_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_18_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_19_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_20_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_21_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_22_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_23_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_24_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_25_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_26_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_27_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_28_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_3_2_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_3_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_4_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_5_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_6_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_7_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_8_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_3_9_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_10_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_11_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_12_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_13_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_14_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_15_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_16_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_17_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_18_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_19_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_1_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_20_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_21_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_22_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_23_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_24_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_25_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_26_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_2_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_35_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_36_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_4_3_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_4_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_5_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_6_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_7_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_8_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_4_9_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_0_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_10_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_11_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_12_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_13_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_18_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_19_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_1_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_20_spec.rb       |  9 ---
 spec/classes/fpm/php_fpm_5_5_2_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_3_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_4_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_5_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_6_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_7_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_8_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_5_9_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_6_0_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_6_1_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_6_2_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_6_3_spec.rb        |  9 ---
 spec/classes/fpm/php_fpm_5_6_4_spec.rb        |  9 ---
 spec/classes/php_5_3_10_spec.rb               |  9 ---
 spec/classes/php_5_3_11_spec.rb               |  9 ---
 spec/classes/php_5_3_12_spec.rb               |  9 ---
 spec/classes/php_5_3_13_spec.rb               |  9 ---
 spec/classes/php_5_3_14_spec.rb               |  9 ---
 spec/classes/php_5_3_15_spec.rb               |  9 ---
 spec/classes/php_5_3_16_spec.rb               |  9 ---
 spec/classes/php_5_3_17_spec.rb               |  9 ---
 spec/classes/php_5_3_18_spec.rb               |  9 ---
 spec/classes/php_5_3_19_spec.rb               |  9 ---
 spec/classes/php_5_3_20_spec.rb               |  9 ---
 spec/classes/php_5_3_21_spec.rb               |  9 ---
 spec/classes/php_5_3_22_spec.rb               |  9 ---
 spec/classes/php_5_3_23_spec.rb               |  9 ---
 spec/classes/php_5_3_24_spec.rb               |  9 ---
 spec/classes/php_5_3_25_spec.rb               |  9 ---
 spec/classes/php_5_3_26_spec.rb               |  9 ---
 spec/classes/php_5_3_27_spec.rb               |  9 ---
 spec/classes/php_5_3_28_spec.rb               |  9 ---
 spec/classes/php_5_3_2_spec.rb                |  9 ---
 spec/classes/php_5_3_3_spec.rb                |  9 ---
 spec/classes/php_5_3_4_spec.rb                |  9 ---
 spec/classes/php_5_3_5_spec.rb                |  9 ---
 spec/classes/php_5_3_6_spec.rb                |  9 ---
 spec/classes/php_5_3_7_spec.rb                |  9 ---
 spec/classes/php_5_3_8_spec.rb                |  9 ---
 spec/classes/php_5_3_9_spec.rb                |  9 ---
 spec/classes/php_5_3_spec.rb                  | 16 -----
 spec/classes/php_5_4_0_spec.rb                |  9 ---
 spec/classes/php_5_4_10_spec.rb               |  9 ---
 spec/classes/php_5_4_11_spec.rb               |  9 ---
 spec/classes/php_5_4_12_spec.rb               |  9 ---
 spec/classes/php_5_4_13_spec.rb               |  9 ---
 spec/classes/php_5_4_14_spec.rb               |  9 ---
 spec/classes/php_5_4_15_spec.rb               |  9 ---
 spec/classes/php_5_4_16_spec.rb               |  9 ---
 spec/classes/php_5_4_17_spec.rb               |  9 ---
 spec/classes/php_5_4_18_spec.rb               |  9 ---
 spec/classes/php_5_4_19_spec.rb               |  9 ---
 spec/classes/php_5_4_1_spec.rb                |  9 ---
 spec/classes/php_5_4_20_spec.rb               |  9 ---
 spec/classes/php_5_4_21_spec.rb               |  9 ---
 spec/classes/php_5_4_22_spec.rb               |  9 ---
 spec/classes/php_5_4_23_spec.rb               |  9 ---
 spec/classes/php_5_4_24_spec.rb               |  9 ---
 spec/classes/php_5_4_25_spec.rb               |  9 ---
 spec/classes/php_5_4_26_spec.rb               |  9 ---
 spec/classes/php_5_4_27_spec.rb               |  9 ---
 spec/classes/php_5_4_28_spec.rb               |  9 ---
 spec/classes/php_5_4_29_spec.rb               |  9 ---
 spec/classes/php_5_4_2_spec.rb                |  9 ---
 spec/classes/php_5_4_35_spec.rb               |  9 ---
 spec/classes/php_5_4_36_spec.rb               |  9 ---
 spec/classes/php_5_4_3_spec.rb                |  9 ---
 spec/classes/php_5_4_4_spec.rb                |  9 ---
 spec/classes/php_5_4_5_spec.rb                |  9 ---
 spec/classes/php_5_4_6_spec.rb                |  9 ---
 spec/classes/php_5_4_7_spec.rb                |  9 ---
 spec/classes/php_5_4_8_spec.rb                |  9 ---
 spec/classes/php_5_4_9_spec.rb                |  9 ---
 spec/classes/php_5_4_spec.rb                  | 16 -----
 spec/classes/php_5_5_0_spec.rb                |  9 ---
 spec/classes/php_5_5_10_spec.rb               |  9 ---
 spec/classes/php_5_5_11_spec.rb               |  9 ---
 spec/classes/php_5_5_12_spec.rb               |  9 ---
 spec/classes/php_5_5_13_spec.rb               |  9 ---
 spec/classes/php_5_5_18_spec.rb               |  9 ---
 spec/classes/php_5_5_19_spec.rb               |  9 ---
 spec/classes/php_5_5_1_spec.rb                |  9 ---
 spec/classes/php_5_5_20_spec.rb               |  9 ---
 spec/classes/php_5_5_2_spec.rb                |  9 ---
 spec/classes/php_5_5_3_spec.rb                |  9 ---
 spec/classes/php_5_5_4_spec.rb                |  9 ---
 spec/classes/php_5_5_5_spec.rb                |  9 ---
 spec/classes/php_5_5_6_spec.rb                |  9 ---
 spec/classes/php_5_5_7_spec.rb                |  9 ---
 spec/classes/php_5_5_8_spec.rb                |  9 ---
 spec/classes/php_5_5_9_spec.rb                |  9 ---
 spec/classes/php_5_5_spec.rb                  | 16 -----
 spec/classes/php_5_6_0_spec.rb                |  9 ---
 spec/classes/php_5_6_1_spec.rb                |  9 ---
 spec/classes/php_5_6_2_spec.rb                |  9 ---
 spec/classes/php_5_6_3_spec.rb                |  9 ---
 spec/classes/php_5_6_4_spec.rb                |  9 ---
 spec/classes/php_5_6_spec.rb                  | 16 -----
 spec/defines/fpm/php_fpm_pool_spec.rb         |  2 +-
 .../parser/functions/php_fpm_require_spec.rb  | 11 +++
 339 files changed, 64 insertions(+), 3148 deletions(-)
 create mode 100644 lib/puppet/parser/functions/php_fpm_require.rb
 delete mode 100644 manifests/5_3.pp
 delete mode 100644 manifests/5_3_10.pp
 delete mode 100644 manifests/5_3_11.pp
 delete mode 100644 manifests/5_3_12.pp
 delete mode 100644 manifests/5_3_13.pp
 delete mode 100644 manifests/5_3_14.pp
 delete mode 100644 manifests/5_3_15.pp
 delete mode 100644 manifests/5_3_16.pp
 delete mode 100644 manifests/5_3_17.pp
 delete mode 100644 manifests/5_3_18.pp
 delete mode 100644 manifests/5_3_19.pp
 delete mode 100644 manifests/5_3_2.pp
 delete mode 100644 manifests/5_3_20.pp
 delete mode 100644 manifests/5_3_21.pp
 delete mode 100644 manifests/5_3_22.pp
 delete mode 100644 manifests/5_3_23.pp
 delete mode 100644 manifests/5_3_24.pp
 delete mode 100644 manifests/5_3_25.pp
 delete mode 100644 manifests/5_3_26.pp
 delete mode 100644 manifests/5_3_27.pp
 delete mode 100644 manifests/5_3_28.pp
 delete mode 100644 manifests/5_3_3.pp
 delete mode 100644 manifests/5_3_4.pp
 delete mode 100644 manifests/5_3_5.pp
 delete mode 100644 manifests/5_3_6.pp
 delete mode 100644 manifests/5_3_7.pp
 delete mode 100644 manifests/5_3_8.pp
 delete mode 100644 manifests/5_3_9.pp
 delete mode 100644 manifests/5_4.pp
 delete mode 100644 manifests/5_4_0.pp
 delete mode 100644 manifests/5_4_1.pp
 delete mode 100644 manifests/5_4_10.pp
 delete mode 100644 manifests/5_4_11.pp
 delete mode 100644 manifests/5_4_12.pp
 delete mode 100644 manifests/5_4_13.pp
 delete mode 100644 manifests/5_4_14.pp
 delete mode 100644 manifests/5_4_15.pp
 delete mode 100644 manifests/5_4_16.pp
 delete mode 100644 manifests/5_4_17.pp
 delete mode 100644 manifests/5_4_18.pp
 delete mode 100644 manifests/5_4_19.pp
 delete mode 100644 manifests/5_4_2.pp
 delete mode 100644 manifests/5_4_20.pp
 delete mode 100644 manifests/5_4_21.pp
 delete mode 100644 manifests/5_4_22.pp
 delete mode 100644 manifests/5_4_23.pp
 delete mode 100644 manifests/5_4_24.pp
 delete mode 100644 manifests/5_4_25.pp
 delete mode 100644 manifests/5_4_26.pp
 delete mode 100644 manifests/5_4_27.pp
 delete mode 100644 manifests/5_4_28.pp
 delete mode 100644 manifests/5_4_29.pp
 delete mode 100644 manifests/5_4_3.pp
 delete mode 100644 manifests/5_4_35.pp
 delete mode 100644 manifests/5_4_36.pp
 delete mode 100644 manifests/5_4_4.pp
 delete mode 100644 manifests/5_4_5.pp
 delete mode 100644 manifests/5_4_6.pp
 delete mode 100644 manifests/5_4_7.pp
 delete mode 100644 manifests/5_4_8.pp
 delete mode 100644 manifests/5_4_9.pp
 delete mode 100644 manifests/5_5.pp
 delete mode 100644 manifests/5_5_0.pp
 delete mode 100644 manifests/5_5_1.pp
 delete mode 100644 manifests/5_5_10.pp
 delete mode 100644 manifests/5_5_11.pp
 delete mode 100644 manifests/5_5_12.pp
 delete mode 100644 manifests/5_5_13.pp
 delete mode 100644 manifests/5_5_14.pp
 delete mode 100644 manifests/5_5_15.pp
 delete mode 100644 manifests/5_5_16.pp
 delete mode 100644 manifests/5_5_18.pp
 delete mode 100644 manifests/5_5_19.pp
 delete mode 100644 manifests/5_5_2.pp
 delete mode 100644 manifests/5_5_20.pp
 delete mode 100644 manifests/5_5_3.pp
 delete mode 100644 manifests/5_5_4.pp
 delete mode 100644 manifests/5_5_5.pp
 delete mode 100644 manifests/5_5_6.pp
 delete mode 100644 manifests/5_5_7.pp
 delete mode 100644 manifests/5_5_8.pp
 delete mode 100644 manifests/5_5_9.pp
 delete mode 100644 manifests/5_6.pp
 delete mode 100644 manifests/5_6_0.pp
 delete mode 100644 manifests/5_6_1.pp
 delete mode 100644 manifests/5_6_2.pp
 delete mode 100644 manifests/5_6_3.pp
 delete mode 100644 manifests/5_6_4.pp
 delete mode 100644 manifests/fpm/5_3_10.pp
 delete mode 100644 manifests/fpm/5_3_11.pp
 delete mode 100644 manifests/fpm/5_3_12.pp
 delete mode 100644 manifests/fpm/5_3_13.pp
 delete mode 100644 manifests/fpm/5_3_14.pp
 delete mode 100644 manifests/fpm/5_3_15.pp
 delete mode 100644 manifests/fpm/5_3_16.pp
 delete mode 100644 manifests/fpm/5_3_17.pp
 delete mode 100644 manifests/fpm/5_3_18.pp
 delete mode 100644 manifests/fpm/5_3_19.pp
 delete mode 100644 manifests/fpm/5_3_2.pp
 delete mode 100644 manifests/fpm/5_3_20.pp
 delete mode 100644 manifests/fpm/5_3_21.pp
 delete mode 100644 manifests/fpm/5_3_22.pp
 delete mode 100644 manifests/fpm/5_3_23.pp
 delete mode 100644 manifests/fpm/5_3_24.pp
 delete mode 100644 manifests/fpm/5_3_25.pp
 delete mode 100644 manifests/fpm/5_3_26.pp
 delete mode 100644 manifests/fpm/5_3_27.pp
 delete mode 100644 manifests/fpm/5_3_28.pp
 delete mode 100644 manifests/fpm/5_3_3.pp
 delete mode 100644 manifests/fpm/5_3_4.pp
 delete mode 100644 manifests/fpm/5_3_5.pp
 delete mode 100644 manifests/fpm/5_3_6.pp
 delete mode 100644 manifests/fpm/5_3_7.pp
 delete mode 100644 manifests/fpm/5_3_8.pp
 delete mode 100644 manifests/fpm/5_3_9.pp
 delete mode 100644 manifests/fpm/5_4_1.pp
 delete mode 100644 manifests/fpm/5_4_10.pp
 delete mode 100644 manifests/fpm/5_4_11.pp
 delete mode 100644 manifests/fpm/5_4_12.pp
 delete mode 100644 manifests/fpm/5_4_13.pp
 delete mode 100644 manifests/fpm/5_4_14.pp
 delete mode 100644 manifests/fpm/5_4_15.pp
 delete mode 100644 manifests/fpm/5_4_16.pp
 delete mode 100644 manifests/fpm/5_4_17.pp
 delete mode 100644 manifests/fpm/5_4_18.pp
 delete mode 100644 manifests/fpm/5_4_19.pp
 delete mode 100644 manifests/fpm/5_4_2.pp
 delete mode 100644 manifests/fpm/5_4_20.pp
 delete mode 100644 manifests/fpm/5_4_21.pp
 delete mode 100644 manifests/fpm/5_4_22.pp
 delete mode 100644 manifests/fpm/5_4_23.pp
 delete mode 100644 manifests/fpm/5_4_24.pp
 delete mode 100644 manifests/fpm/5_4_25.pp
 delete mode 100644 manifests/fpm/5_4_26.pp
 delete mode 100644 manifests/fpm/5_4_27.pp
 delete mode 100644 manifests/fpm/5_4_28.pp
 delete mode 100644 manifests/fpm/5_4_29.pp
 delete mode 100644 manifests/fpm/5_4_3.pp
 delete mode 100644 manifests/fpm/5_4_35.pp
 delete mode 100644 manifests/fpm/5_4_36.pp
 delete mode 100644 manifests/fpm/5_4_4.pp
 delete mode 100644 manifests/fpm/5_4_5.pp
 delete mode 100644 manifests/fpm/5_4_6.pp
 delete mode 100644 manifests/fpm/5_4_7.pp
 delete mode 100644 manifests/fpm/5_4_8.pp
 delete mode 100644 manifests/fpm/5_4_9.pp
 delete mode 100644 manifests/fpm/5_5_0.pp
 delete mode 100644 manifests/fpm/5_5_1.pp
 delete mode 100644 manifests/fpm/5_5_10.pp
 delete mode 100644 manifests/fpm/5_5_11.pp
 delete mode 100644 manifests/fpm/5_5_12.pp
 delete mode 100644 manifests/fpm/5_5_13.pp
 delete mode 100644 manifests/fpm/5_5_14.pp
 delete mode 100644 manifests/fpm/5_5_15.pp
 delete mode 100644 manifests/fpm/5_5_16.pp
 delete mode 100644 manifests/fpm/5_5_18.pp
 delete mode 100644 manifests/fpm/5_5_19.pp
 delete mode 100644 manifests/fpm/5_5_2.pp
 delete mode 100644 manifests/fpm/5_5_20.pp
 delete mode 100644 manifests/fpm/5_5_3.pp
 delete mode 100644 manifests/fpm/5_5_4.pp
 delete mode 100644 manifests/fpm/5_5_5.pp
 delete mode 100644 manifests/fpm/5_5_6.pp
 delete mode 100644 manifests/fpm/5_5_7.pp
 delete mode 100644 manifests/fpm/5_5_8.pp
 delete mode 100644 manifests/fpm/5_5_9.pp
 delete mode 100644 manifests/fpm/5_6_0.pp
 delete mode 100644 manifests/fpm/5_6_1.pp
 delete mode 100644 manifests/fpm/5_6_2.pp
 delete mode 100644 manifests/fpm/5_6_3.pp
 delete mode 100644 manifests/fpm/5_6_4.pp
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_10_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_11_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_12_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_13_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_14_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_15_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_16_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_17_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_18_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_19_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_20_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_21_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_22_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_23_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_24_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_25_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_26_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_27_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_28_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_2_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_3_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_4_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_5_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_6_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_7_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_8_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_3_9_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_10_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_11_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_12_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_13_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_14_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_15_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_16_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_17_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_18_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_19_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_1_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_20_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_21_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_22_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_23_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_24_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_25_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_26_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_2_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_35_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_36_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_3_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_4_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_5_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_6_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_7_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_8_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_4_9_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_0_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_10_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_11_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_12_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_13_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_18_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_19_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_1_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_20_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_2_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_3_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_4_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_5_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_6_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_7_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_8_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_5_9_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_6_0_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_6_1_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_6_2_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_6_3_spec.rb
 delete mode 100644 spec/classes/fpm/php_fpm_5_6_4_spec.rb
 delete mode 100644 spec/classes/php_5_3_10_spec.rb
 delete mode 100644 spec/classes/php_5_3_11_spec.rb
 delete mode 100644 spec/classes/php_5_3_12_spec.rb
 delete mode 100644 spec/classes/php_5_3_13_spec.rb
 delete mode 100644 spec/classes/php_5_3_14_spec.rb
 delete mode 100644 spec/classes/php_5_3_15_spec.rb
 delete mode 100644 spec/classes/php_5_3_16_spec.rb
 delete mode 100644 spec/classes/php_5_3_17_spec.rb
 delete mode 100644 spec/classes/php_5_3_18_spec.rb
 delete mode 100644 spec/classes/php_5_3_19_spec.rb
 delete mode 100644 spec/classes/php_5_3_20_spec.rb
 delete mode 100644 spec/classes/php_5_3_21_spec.rb
 delete mode 100644 spec/classes/php_5_3_22_spec.rb
 delete mode 100644 spec/classes/php_5_3_23_spec.rb
 delete mode 100644 spec/classes/php_5_3_24_spec.rb
 delete mode 100644 spec/classes/php_5_3_25_spec.rb
 delete mode 100644 spec/classes/php_5_3_26_spec.rb
 delete mode 100644 spec/classes/php_5_3_27_spec.rb
 delete mode 100644 spec/classes/php_5_3_28_spec.rb
 delete mode 100644 spec/classes/php_5_3_2_spec.rb
 delete mode 100644 spec/classes/php_5_3_3_spec.rb
 delete mode 100644 spec/classes/php_5_3_4_spec.rb
 delete mode 100644 spec/classes/php_5_3_5_spec.rb
 delete mode 100644 spec/classes/php_5_3_6_spec.rb
 delete mode 100644 spec/classes/php_5_3_7_spec.rb
 delete mode 100644 spec/classes/php_5_3_8_spec.rb
 delete mode 100644 spec/classes/php_5_3_9_spec.rb
 delete mode 100644 spec/classes/php_5_3_spec.rb
 delete mode 100644 spec/classes/php_5_4_0_spec.rb
 delete mode 100644 spec/classes/php_5_4_10_spec.rb
 delete mode 100644 spec/classes/php_5_4_11_spec.rb
 delete mode 100644 spec/classes/php_5_4_12_spec.rb
 delete mode 100644 spec/classes/php_5_4_13_spec.rb
 delete mode 100644 spec/classes/php_5_4_14_spec.rb
 delete mode 100644 spec/classes/php_5_4_15_spec.rb
 delete mode 100644 spec/classes/php_5_4_16_spec.rb
 delete mode 100644 spec/classes/php_5_4_17_spec.rb
 delete mode 100644 spec/classes/php_5_4_18_spec.rb
 delete mode 100644 spec/classes/php_5_4_19_spec.rb
 delete mode 100644 spec/classes/php_5_4_1_spec.rb
 delete mode 100644 spec/classes/php_5_4_20_spec.rb
 delete mode 100644 spec/classes/php_5_4_21_spec.rb
 delete mode 100644 spec/classes/php_5_4_22_spec.rb
 delete mode 100644 spec/classes/php_5_4_23_spec.rb
 delete mode 100644 spec/classes/php_5_4_24_spec.rb
 delete mode 100644 spec/classes/php_5_4_25_spec.rb
 delete mode 100644 spec/classes/php_5_4_26_spec.rb
 delete mode 100644 spec/classes/php_5_4_27_spec.rb
 delete mode 100644 spec/classes/php_5_4_28_spec.rb
 delete mode 100644 spec/classes/php_5_4_29_spec.rb
 delete mode 100644 spec/classes/php_5_4_2_spec.rb
 delete mode 100644 spec/classes/php_5_4_35_spec.rb
 delete mode 100644 spec/classes/php_5_4_36_spec.rb
 delete mode 100644 spec/classes/php_5_4_3_spec.rb
 delete mode 100644 spec/classes/php_5_4_4_spec.rb
 delete mode 100644 spec/classes/php_5_4_5_spec.rb
 delete mode 100644 spec/classes/php_5_4_6_spec.rb
 delete mode 100644 spec/classes/php_5_4_7_spec.rb
 delete mode 100644 spec/classes/php_5_4_8_spec.rb
 delete mode 100644 spec/classes/php_5_4_9_spec.rb
 delete mode 100644 spec/classes/php_5_4_spec.rb
 delete mode 100644 spec/classes/php_5_5_0_spec.rb
 delete mode 100644 spec/classes/php_5_5_10_spec.rb
 delete mode 100644 spec/classes/php_5_5_11_spec.rb
 delete mode 100644 spec/classes/php_5_5_12_spec.rb
 delete mode 100644 spec/classes/php_5_5_13_spec.rb
 delete mode 100644 spec/classes/php_5_5_18_spec.rb
 delete mode 100644 spec/classes/php_5_5_19_spec.rb
 delete mode 100644 spec/classes/php_5_5_1_spec.rb
 delete mode 100644 spec/classes/php_5_5_20_spec.rb
 delete mode 100644 spec/classes/php_5_5_2_spec.rb
 delete mode 100644 spec/classes/php_5_5_3_spec.rb
 delete mode 100644 spec/classes/php_5_5_4_spec.rb
 delete mode 100644 spec/classes/php_5_5_5_spec.rb
 delete mode 100644 spec/classes/php_5_5_6_spec.rb
 delete mode 100644 spec/classes/php_5_5_7_spec.rb
 delete mode 100644 spec/classes/php_5_5_8_spec.rb
 delete mode 100644 spec/classes/php_5_5_9_spec.rb
 delete mode 100644 spec/classes/php_5_5_spec.rb
 delete mode 100644 spec/classes/php_5_6_0_spec.rb
 delete mode 100644 spec/classes/php_5_6_1_spec.rb
 delete mode 100644 spec/classes/php_5_6_2_spec.rb
 delete mode 100644 spec/classes/php_5_6_3_spec.rb
 delete mode 100644 spec/classes/php_5_6_4_spec.rb
 delete mode 100644 spec/classes/php_5_6_spec.rb
 create mode 100644 spec/lib/puppet/parser/functions/php_fpm_require_spec.rb

diff --git a/README.md b/README.md
index 84efc29..5246735 100644
--- a/README.md
+++ b/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:
diff --git a/lib/puppet/parser/functions/php_fpm_require.rb b/lib/puppet/parser/functions/php_fpm_require.rb
new file mode 100644
index 0000000..8b1d496
--- /dev/null
+++ b/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
diff --git a/manifests/5_3.pp b/manifests/5_3.pp
deleted file mode 100644
index 4103fd4..0000000
--- a/manifests/5_3.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Installs php 5.3.27 and symlinks it as 5.3
-#
-# Usage:
-#
-#     include php::5_3
-#
-class php::5_3 {
-  require php
-  require php::5_3_27
-
-  file { "${php::config::root}/versions/5.3":
-    ensure  => symlink,
-    force   => true,
-    target  => "${php::config::root}/versions/5.3.27"
-  }
-}
diff --git a/manifests/5_3_10.pp b/manifests/5_3_10.pp
deleted file mode 100644
index 4918af1..0000000
--- a/manifests/5_3_10.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.10
-#
-# Usage:
-#
-#     include php::5_3_10
-#
-class php::5_3_10 {
-  php::version { '5.3.10': }
-}
diff --git a/manifests/5_3_11.pp b/manifests/5_3_11.pp
deleted file mode 100644
index 42eaa3a..0000000
--- a/manifests/5_3_11.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.11
-#
-# Usage:
-#
-#     include php::5_3_11
-#
-class php::5_3_11 {
-  php::version { '5.3.11': }
-}
diff --git a/manifests/5_3_12.pp b/manifests/5_3_12.pp
deleted file mode 100644
index 309b94b..0000000
--- a/manifests/5_3_12.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.12
-#
-# Usage:
-#
-#     include php::5_3_12
-#
-class php::5_3_12 {
-  php::version { '5.3.12': }
-}
diff --git a/manifests/5_3_13.pp b/manifests/5_3_13.pp
deleted file mode 100644
index c20c86e..0000000
--- a/manifests/5_3_13.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.13
-#
-# Usage:
-#
-#     include php::5_3_13
-#
-class php::5_3_13 {
-  php::version { '5.3.13': }
-}
diff --git a/manifests/5_3_14.pp b/manifests/5_3_14.pp
deleted file mode 100644
index 89ffff4..0000000
--- a/manifests/5_3_14.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.14
-#
-# Usage:
-#
-#     include php::5_3_14
-#
-class php::5_3_14 {
-  php::version { '5.3.14': }
-}
diff --git a/manifests/5_3_15.pp b/manifests/5_3_15.pp
deleted file mode 100644
index e7203c1..0000000
--- a/manifests/5_3_15.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.15
-#
-# Usage:
-#
-#     include php::5_3_15
-#
-class php::5_3_15 {
-  php::version { '5.3.15': }
-}
diff --git a/manifests/5_3_16.pp b/manifests/5_3_16.pp
deleted file mode 100644
index 0ae9e60..0000000
--- a/manifests/5_3_16.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.16
-#
-# Usage:
-#
-#     include php::5_3_16
-#
-class php::5_3_16 {
-  php::version { '5.3.16': }
-}
diff --git a/manifests/5_3_17.pp b/manifests/5_3_17.pp
deleted file mode 100644
index fc7f760..0000000
--- a/manifests/5_3_17.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.17
-#
-# Usage:
-#
-#     include php::5_3_17
-#
-class php::5_3_17 {
-  php::version { '5.3.17': }
-}
diff --git a/manifests/5_3_18.pp b/manifests/5_3_18.pp
deleted file mode 100644
index c1fc5b1..0000000
--- a/manifests/5_3_18.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.18
-#
-# Usage:
-#
-#     include php::5_3_18
-#
-class php::5_3_18 {
-  php::version { '5.3.18': }
-}
diff --git a/manifests/5_3_19.pp b/manifests/5_3_19.pp
deleted file mode 100644
index f08693e..0000000
--- a/manifests/5_3_19.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.19
-#
-# Usage:
-#
-#     include php::5_3_19
-#
-class php::5_3_19 {
-  php::version { '5.3.19': }
-}
diff --git a/manifests/5_3_2.pp b/manifests/5_3_2.pp
deleted file mode 100644
index 5f4a78e..0000000
--- a/manifests/5_3_2.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.2
-#
-# Usage:
-#
-#     include php::5_3_2
-#
-class php::5_3_2 {
-  php::version { '5.3.2': }
-}
diff --git a/manifests/5_3_20.pp b/manifests/5_3_20.pp
deleted file mode 100644
index 4b80df7..0000000
--- a/manifests/5_3_20.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.20
-#
-# Usage:
-#
-#     include php::5_3_20
-#
-class php::5_3_20 {
-  php::version { '5.3.20': }
-}
diff --git a/manifests/5_3_21.pp b/manifests/5_3_21.pp
deleted file mode 100644
index ba3af38..0000000
--- a/manifests/5_3_21.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.21
-#
-# Usage:
-#
-#     include php::5_3_21
-#
-class php::5_3_21 {
-  php::version { '5.3.21': }
-}
diff --git a/manifests/5_3_22.pp b/manifests/5_3_22.pp
deleted file mode 100644
index a1c8aa3..0000000
--- a/manifests/5_3_22.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.22
-#
-# Usage:
-#
-#     include php::5_3_22
-#
-class php::5_3_22 {
-  php::version { '5.3.22': }
-}
diff --git a/manifests/5_3_23.pp b/manifests/5_3_23.pp
deleted file mode 100644
index 8570a31..0000000
--- a/manifests/5_3_23.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.23
-#
-# Usage:
-#
-#     include php::5_3_23
-#
-class php::5_3_23 {
-  php::version { '5.3.23': }
-}
diff --git a/manifests/5_3_24.pp b/manifests/5_3_24.pp
deleted file mode 100644
index fa01f53..0000000
--- a/manifests/5_3_24.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.24
-#
-# Usage:
-#
-#     include php::5_3_24
-#
-class php::5_3_24 {
-  php::version { '5.3.24': }
-}
diff --git a/manifests/5_3_25.pp b/manifests/5_3_25.pp
deleted file mode 100644
index 6f0ce64..0000000
--- a/manifests/5_3_25.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.25
-#
-# Usage:
-#
-#     include php::5_3_25
-#
-class php::5_3_25 {
-  php::version { '5.3.25': }
-}
diff --git a/manifests/5_3_26.pp b/manifests/5_3_26.pp
deleted file mode 100644
index cd38fc7..0000000
--- a/manifests/5_3_26.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.26
-#
-# Usage:
-#
-#     include php::5_3_26
-#
-class php::5_3_26 {
-  php::version { '5.3.26': }
-}
diff --git a/manifests/5_3_27.pp b/manifests/5_3_27.pp
deleted file mode 100644
index 93f9778..0000000
--- a/manifests/5_3_27.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.27
-#
-# Usage:
-#
-#     include php::5_3_27
-#
-class php::5_3_27 {
-  php::version { '5.3.27': }
-}
diff --git a/manifests/5_3_28.pp b/manifests/5_3_28.pp
deleted file mode 100644
index f03918d..0000000
--- a/manifests/5_3_28.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.28
-#
-# Usage:
-#
-#     include php::5_3_28
-#
-class php::5_3_28 {
-  php::version { '5.3.28': }
-}
diff --git a/manifests/5_3_3.pp b/manifests/5_3_3.pp
deleted file mode 100644
index 560a0e2..0000000
--- a/manifests/5_3_3.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.3
-#
-# Usage:
-#
-#     include php::5_3_3
-#
-class php::5_3_3 {
-  php::version { '5.3.3': }
-}
diff --git a/manifests/5_3_4.pp b/manifests/5_3_4.pp
deleted file mode 100644
index 61abf7e..0000000
--- a/manifests/5_3_4.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.4
-#
-# Usage:
-#
-#     include php::5_3_4
-#
-class php::5_3_4 {
-  php::version { '5.3.4': }
-}
diff --git a/manifests/5_3_5.pp b/manifests/5_3_5.pp
deleted file mode 100644
index af26197..0000000
--- a/manifests/5_3_5.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.5
-#
-# Usage:
-#
-#     include php::5_3_5
-#
-class php::5_3_5 {
-  php::version { '5.3.5': }
-}
diff --git a/manifests/5_3_6.pp b/manifests/5_3_6.pp
deleted file mode 100644
index e07efc0..0000000
--- a/manifests/5_3_6.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.6
-#
-# Usage:
-#
-#     include php::5_3_6
-#
-class php::5_3_6 {
-  php::version { '5.3.6': }
-}
diff --git a/manifests/5_3_7.pp b/manifests/5_3_7.pp
deleted file mode 100644
index b7d6945..0000000
--- a/manifests/5_3_7.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.7
-#
-# Usage:
-#
-#     include php::5_3_7
-#
-class php::5_3_7 {
-  php::version { '5.3.7': }
-}
diff --git a/manifests/5_3_8.pp b/manifests/5_3_8.pp
deleted file mode 100644
index 75e550f..0000000
--- a/manifests/5_3_8.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.8
-#
-# Usage:
-#
-#     include php::5_3_8
-#
-class php::5_3_8 {
-  php::version { '5.3.8': }
-}
diff --git a/manifests/5_3_9.pp b/manifests/5_3_9.pp
deleted file mode 100644
index 5465f54..0000000
--- a/manifests/5_3_9.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.3.9
-#
-# Usage:
-#
-#     include php::5_3_9
-#
-class php::5_3_9 {
-  php::version { '5.3.9': }
-}
diff --git a/manifests/5_4.pp b/manifests/5_4.pp
deleted file mode 100644
index 06573bc..0000000
--- a/manifests/5_4.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Installs php 5.4.17 and symlinks it as 5.4
-#
-# Usage:
-#
-#     include php::5_4
-#
-class php::5_4 {
-  require php
-  require php::5_4_17
-
-  file { "${php::config::root}/versions/5.4":
-    ensure  => symlink,
-    force   => true,
-    target  => "${php::config::root}/versions/5.4.17"
-  }
-}
diff --git a/manifests/5_4_0.pp b/manifests/5_4_0.pp
deleted file mode 100644
index 88e86ee..0000000
--- a/manifests/5_4_0.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.0
-#
-# Usage:
-#
-#     include php::5_4_0
-#
-class php::5_4_0 {
-  php::version { '5.4.0': }
-}
diff --git a/manifests/5_4_1.pp b/manifests/5_4_1.pp
deleted file mode 100644
index 9498d2c..0000000
--- a/manifests/5_4_1.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.1
-#
-# Usage:
-#
-#     include php::5_4_1
-#
-class php::5_4_1 {
-  php::version { '5.4.1': }
-}
diff --git a/manifests/5_4_10.pp b/manifests/5_4_10.pp
deleted file mode 100644
index 7f0c133..0000000
--- a/manifests/5_4_10.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.10
-#
-# Usage:
-#
-#     include php::5_4_10
-#
-class php::5_4_10 {
-  php::version { '5.4.10': }
-}
diff --git a/manifests/5_4_11.pp b/manifests/5_4_11.pp
deleted file mode 100644
index 544a9c6..0000000
--- a/manifests/5_4_11.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.11
-#
-# Usage:
-#
-#     include php::5_4_11
-#
-class php::5_4_11 {
-  php::version { '5.4.11': }
-}
diff --git a/manifests/5_4_12.pp b/manifests/5_4_12.pp
deleted file mode 100644
index 09fa831..0000000
--- a/manifests/5_4_12.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.12
-#
-# Usage:
-#
-#     include php::5_4_12
-#
-class php::5_4_12 {
-  php::version { '5.4.12': }
-}
diff --git a/manifests/5_4_13.pp b/manifests/5_4_13.pp
deleted file mode 100644
index 98e2066..0000000
--- a/manifests/5_4_13.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.13
-#
-# Usage:
-#
-#     include php::5_4_13
-#
-class php::5_4_13 {
-  php::version { '5.4.13': }
-}
diff --git a/manifests/5_4_14.pp b/manifests/5_4_14.pp
deleted file mode 100644
index 996d761..0000000
--- a/manifests/5_4_14.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.14
-#
-# Usage:
-#
-#     include php::5_4_14
-#
-class php::5_4_14 {
-  php::version { '5.4.14': }
-}
diff --git a/manifests/5_4_15.pp b/manifests/5_4_15.pp
deleted file mode 100644
index 1ff2f16..0000000
--- a/manifests/5_4_15.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.15
-#
-# Usage:
-#
-#     include php::5_4_15
-#
-class php::5_4_15 {
-  php::version { '5.4.15': }
-}
diff --git a/manifests/5_4_16.pp b/manifests/5_4_16.pp
deleted file mode 100644
index 2f12194..0000000
--- a/manifests/5_4_16.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.16
-#
-# Usage:
-#
-#     include php::5_4_16
-#
-class php::5_4_16 {
-  php::version { '5.4.16': }
-}
diff --git a/manifests/5_4_17.pp b/manifests/5_4_17.pp
deleted file mode 100644
index c01d1b5..0000000
--- a/manifests/5_4_17.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.17
-#
-# Usage:
-#
-#     include php::5_4_17
-#
-class php::5_4_17 {
-  php::version { '5.4.17': }
-}
diff --git a/manifests/5_4_18.pp b/manifests/5_4_18.pp
deleted file mode 100644
index b7d77ce..0000000
--- a/manifests/5_4_18.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.18
-#
-# Usage:
-#
-#     include php::5_4_18
-#
-class php::5_4_18 {
-  php::version { '5.4.18': }
-}
diff --git a/manifests/5_4_19.pp b/manifests/5_4_19.pp
deleted file mode 100644
index 796d557..0000000
--- a/manifests/5_4_19.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.19
-#
-# Usage:
-#
-#     include php::5_4_19
-#
-class php::5_4_19 {
-  php::version { '5.4.19': }
-}
diff --git a/manifests/5_4_2.pp b/manifests/5_4_2.pp
deleted file mode 100644
index bf7a3bf..0000000
--- a/manifests/5_4_2.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.2
-#
-# Usage:
-#
-#     include php::5_4_2
-#
-class php::5_4_2 {
-  php::version { '5.4.2': }
-}
diff --git a/manifests/5_4_20.pp b/manifests/5_4_20.pp
deleted file mode 100644
index 879075b..0000000
--- a/manifests/5_4_20.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.20
-#
-# Usage:
-#
-#     include php::5_4_20
-#
-class php::5_4_20 {
-  php::version { '5.4.20': }
-}
diff --git a/manifests/5_4_21.pp b/manifests/5_4_21.pp
deleted file mode 100644
index cf16599..0000000
--- a/manifests/5_4_21.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.21
-#
-# Usage:
-#
-#     include php::5_4_21
-#
-class php::5_4_21 {
-  php::version { '5.4.21': }
-}
diff --git a/manifests/5_4_22.pp b/manifests/5_4_22.pp
deleted file mode 100644
index c6dd850..0000000
--- a/manifests/5_4_22.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.22
-#
-# Usage:
-#
-#     include php::5_4_22
-#
-class php::5_4_22 {
-  php::version { '5.4.22': }
-}
diff --git a/manifests/5_4_23.pp b/manifests/5_4_23.pp
deleted file mode 100644
index 81973bc..0000000
--- a/manifests/5_4_23.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.23
-#
-# Usage:
-#
-#     include php::5_4_23
-#
-class php::5_4_23 {
-  php::version { '5.4.23': }
-}
diff --git a/manifests/5_4_24.pp b/manifests/5_4_24.pp
deleted file mode 100644
index 9f6f9df..0000000
--- a/manifests/5_4_24.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.24
-#
-# Usage:
-#
-#     include php::5_4_24
-#
-class php::5_4_24 {
-  php::version { '5.4.24': }
-}
diff --git a/manifests/5_4_25.pp b/manifests/5_4_25.pp
deleted file mode 100644
index ad6df9f..0000000
--- a/manifests/5_4_25.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.25
-#
-# Usage:
-#
-#     include php::5_4_25
-#
-class php::5_4_25 {
-  php::version { '5.4.25': }
-}
diff --git a/manifests/5_4_26.pp b/manifests/5_4_26.pp
deleted file mode 100644
index e76eca6..0000000
--- a/manifests/5_4_26.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.26
-#
-# Usage:
-#
-#     include php::5_4_26
-#
-class php::5_4_26 {
-  php::version { '5.4.26': }
-}
diff --git a/manifests/5_4_27.pp b/manifests/5_4_27.pp
deleted file mode 100644
index 926be35..0000000
--- a/manifests/5_4_27.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.27
-#
-# Usage:
-#
-#     include php::5_4_27
-#
-class php::5_4_27 {
-  php::version { '5.4.27': }
-}
diff --git a/manifests/5_4_28.pp b/manifests/5_4_28.pp
deleted file mode 100644
index 6565ddb..0000000
--- a/manifests/5_4_28.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.28
-#
-# Usage:
-#
-#     include php::5_4_28
-#
-class php::5_4_28 {
-  php::version { '5.4.28': }
-}
diff --git a/manifests/5_4_29.pp b/manifests/5_4_29.pp
deleted file mode 100644
index 0d37727..0000000
--- a/manifests/5_4_29.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.29
-#
-# Usage:
-#
-#     include php::5_4_29
-#
-class php::5_4_29 {
-  php::version { '5.4.29': }
-}
diff --git a/manifests/5_4_3.pp b/manifests/5_4_3.pp
deleted file mode 100644
index 6af6eba..0000000
--- a/manifests/5_4_3.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.3
-#
-# Usage:
-#
-#     include php::5_4_3
-#
-class php::5_4_3 {
-  php::version { '5.4.3': }
-}
diff --git a/manifests/5_4_35.pp b/manifests/5_4_35.pp
deleted file mode 100644
index 2bdb94e..0000000
--- a/manifests/5_4_35.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.35
-#
-# Usage:
-#
-#     include php::5_4_35
-#
-class php::5_4_35 {
-  php::version { '5.4.35': }
-}
diff --git a/manifests/5_4_36.pp b/manifests/5_4_36.pp
deleted file mode 100644
index 9f294d3..0000000
--- a/manifests/5_4_36.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.36
-#
-# Usage:
-#
-#     include php::5_4_36
-#
-class php::5_4_36 {
-  php::version { '5.4.36': }
-}
diff --git a/manifests/5_4_4.pp b/manifests/5_4_4.pp
deleted file mode 100644
index 91bfdf1..0000000
--- a/manifests/5_4_4.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.4
-#
-# Usage:
-#
-#     include php::5_4_4
-#
-class php::5_4_4 {
-  php::version { '5.4.4': }
-}
diff --git a/manifests/5_4_5.pp b/manifests/5_4_5.pp
deleted file mode 100644
index 1248dab..0000000
--- a/manifests/5_4_5.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.5
-#
-# Usage:
-#
-#     include php::5_4_5
-#
-class php::5_4_5 {
-  php::version { '5.4.5': }
-}
diff --git a/manifests/5_4_6.pp b/manifests/5_4_6.pp
deleted file mode 100644
index 012ab77..0000000
--- a/manifests/5_4_6.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.6
-#
-# Usage:
-#
-#     include php::5_4_6
-#
-class php::5_4_6 {
-  php::version { '5.4.6': }
-}
diff --git a/manifests/5_4_7.pp b/manifests/5_4_7.pp
deleted file mode 100644
index 4a73a17..0000000
--- a/manifests/5_4_7.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.7
-#
-# Usage:
-#
-#     include php::5_4_7
-#
-class php::5_4_7 {
-  php::version { '5.4.7': }
-}
diff --git a/manifests/5_4_8.pp b/manifests/5_4_8.pp
deleted file mode 100644
index 9bb5929..0000000
--- a/manifests/5_4_8.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.8
-#
-# Usage:
-#
-#     include php::5_4_8
-#
-class php::5_4_8 {
-  php::version { '5.4.8': }
-}
diff --git a/manifests/5_4_9.pp b/manifests/5_4_9.pp
deleted file mode 100644
index 1fad8c8..0000000
--- a/manifests/5_4_9.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Installs php 5.4.9
-#
-# Usage:
-#
-#     include php::5_4_9
-#
-class php::5_4_9 {
-  php::version { '5.4.9': }
-}
diff --git a/manifests/5_5.pp b/manifests/5_5.pp
deleted file mode 100644
index 105e6cd..0000000
--- a/manifests/5_5.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Installs php 5.5.0 and symlinks it as 5.5
-#
-# Usage:
-#
-#     include php::5_5
-#
-class php::5_5 {
-  require php
-  require php::5_5_0
-
-  file { "${php::config::root}/versions/5.5":
-    ensure  => symlink,
-    force   => true,
-    target  => "${php::config::root}/versions/5.5.0"
-  }
-}
diff --git a/manifests/5_5_0.pp b/manifests/5_5_0.pp
deleted file mode 100644
index 00dbf66..0000000
--- a/manifests/5_5_0.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.0
-#
-# Usage:
-#
-#     include php::5_5_0
-class php::5_5_0 {
-  php::version { '5.5.0': }
-}
diff --git a/manifests/5_5_1.pp b/manifests/5_5_1.pp
deleted file mode 100644
index 7174e6a..0000000
--- a/manifests/5_5_1.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.1
-#
-# Usage:
-#
-#     include php::5_5_1
-class php::5_5_1 {
-  php::version { '5.5.1': }
-}
diff --git a/manifests/5_5_10.pp b/manifests/5_5_10.pp
deleted file mode 100644
index ddfa44d..0000000
--- a/manifests/5_5_10.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.10
-#
-# Usage:
-#
-#     include php::5_5_10
-class php::5_5_10 {
-  php::version { '5.5.10': }
-}
diff --git a/manifests/5_5_11.pp b/manifests/5_5_11.pp
deleted file mode 100644
index 8773472..0000000
--- a/manifests/5_5_11.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.11
-#
-# Usage:
-#
-#     include php::5_5_11
-class php::5_5_11 {
-  php::version { '5.5.11': }
-}
diff --git a/manifests/5_5_12.pp b/manifests/5_5_12.pp
deleted file mode 100644
index 7659c6d..0000000
--- a/manifests/5_5_12.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.12
-#
-# Usage:
-#
-#     include php::5_5_12
-class php::5_5_12 {
-  php::version { '5.5.12': }
-}
diff --git a/manifests/5_5_13.pp b/manifests/5_5_13.pp
deleted file mode 100644
index 82ca3a4..0000000
--- a/manifests/5_5_13.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.13
-#
-# Usage:
-#
-#     include php::5_5_13
-class php::5_5_13 {
-  php::version { '5.5.13': }
-}
diff --git a/manifests/5_5_14.pp b/manifests/5_5_14.pp
deleted file mode 100644
index cd06609..0000000
--- a/manifests/5_5_14.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.14
-#
-# Usage:
-#
-#     include php::5_5_14
-class php::5_5_14 {
-  php::version { '5.5.14': }
-}
diff --git a/manifests/5_5_15.pp b/manifests/5_5_15.pp
deleted file mode 100644
index 1232749..0000000
--- a/manifests/5_5_15.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.15
-#
-# Usage:
-#
-#     include php::5_5_15
-class php::5_5_15 {
-  php::version { '5.5.15': }
-}
diff --git a/manifests/5_5_16.pp b/manifests/5_5_16.pp
deleted file mode 100644
index f002883..0000000
--- a/manifests/5_5_16.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.16
-#
-# Usage:
-#
-#     include php::5_5_16
-class php::5_5_16 {
-  php::version { '5.5.16': }
-}
diff --git a/manifests/5_5_18.pp b/manifests/5_5_18.pp
deleted file mode 100644
index 2b69919..0000000
--- a/manifests/5_5_18.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.18
-#
-# Usage:
-#
-#     include php::5_5_18
-class php::5_5_18 {
-  php::version { '5.5.18': }
-}
diff --git a/manifests/5_5_19.pp b/manifests/5_5_19.pp
deleted file mode 100644
index d453aa4..0000000
--- a/manifests/5_5_19.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.19
-#
-# Usage:
-#
-#     include php::5_5_19
-class php::5_5_19 {
-  php::version { '5.5.19': }
-}
diff --git a/manifests/5_5_2.pp b/manifests/5_5_2.pp
deleted file mode 100644
index c960f29..0000000
--- a/manifests/5_5_2.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.2
-#
-# Usage:
-#
-#     include php::5_5_2
-class php::5_5_2 {
-  php::version { '5.5.2': }
-}
diff --git a/manifests/5_5_20.pp b/manifests/5_5_20.pp
deleted file mode 100644
index 7ff2232..0000000
--- a/manifests/5_5_20.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.20
-#
-# Usage:
-#
-#     include php::5_5_20
-class php::5_5_20 {
-  php::version { '5.5.20': }
-}
diff --git a/manifests/5_5_3.pp b/manifests/5_5_3.pp
deleted file mode 100644
index 8cde17c..0000000
--- a/manifests/5_5_3.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.3
-#
-# Usage:
-#
-#     include php::5_5_3
-class php::5_5_3 {
-  php::version { '5.5.3': }
-}
diff --git a/manifests/5_5_4.pp b/manifests/5_5_4.pp
deleted file mode 100644
index 8b96952..0000000
--- a/manifests/5_5_4.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.4
-#
-# Usage:
-#
-#     include php::5_5_4
-class php::5_5_4 {
-  php::version { '5.5.4': }
-}
diff --git a/manifests/5_5_5.pp b/manifests/5_5_5.pp
deleted file mode 100644
index b36da82..0000000
--- a/manifests/5_5_5.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.5
-#
-# Usage:
-#
-#     include php::5_5_5
-class php::5_5_5 {
-  php::version { '5.5.5': }
-}
diff --git a/manifests/5_5_6.pp b/manifests/5_5_6.pp
deleted file mode 100644
index 8696454..0000000
--- a/manifests/5_5_6.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.6
-#
-# Usage:
-#
-#     include php::5_5_6
-class php::5_5_6 {
-  php::version { '5.5.6': }
-}
diff --git a/manifests/5_5_7.pp b/manifests/5_5_7.pp
deleted file mode 100644
index a5b1d78..0000000
--- a/manifests/5_5_7.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.7
-#
-# Usage:
-#
-#     include php::5_5_7
-class php::5_5_7 {
-  php::version { '5.5.7': }
-}
diff --git a/manifests/5_5_8.pp b/manifests/5_5_8.pp
deleted file mode 100644
index 88da5bb..0000000
--- a/manifests/5_5_8.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.8
-#
-# Usage:
-#
-#     include php::5_5_8
-class php::5_5_8 {
-  php::version { '5.5.8': }
-}
diff --git a/manifests/5_5_9.pp b/manifests/5_5_9.pp
deleted file mode 100644
index 9f4bd4e..0000000
--- a/manifests/5_5_9.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.5.9
-#
-# Usage:
-#
-#     include php::5_5_9
-class php::5_5_9 {
-  php::version { '5.5.9': }
-}
diff --git a/manifests/5_6.pp b/manifests/5_6.pp
deleted file mode 100644
index 7a9a774..0000000
--- a/manifests/5_6.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# Installs php 5.6.0 and symlinks it as 5.6
-#
-# Usage:
-#
-#     include php::5_6
-class php::5_6 {
-  require php
-  require php::5_6_0
-
-  file { "${php::config::root}/versions/5.6":
-    ensure  => symlink,
-    force   => true,
-    target  => "${php::config::root}/versions/5.6.0"
-  }
-}
diff --git a/manifests/5_6_0.pp b/manifests/5_6_0.pp
deleted file mode 100644
index f7a9287..0000000
--- a/manifests/5_6_0.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.6.0
-#
-# Usage:
-#
-#     include php::5_6_0
-class php::5_6_0 {
-  php::version { '5.6.0': }
-}
diff --git a/manifests/5_6_1.pp b/manifests/5_6_1.pp
deleted file mode 100644
index 4a8e3f9..0000000
--- a/manifests/5_6_1.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.6.1
-#
-# Usage:
-#
-#     include php::5_6_1
-class php::5_6_1 {
-  php::version { '5.6.1': }
-}
diff --git a/manifests/5_6_2.pp b/manifests/5_6_2.pp
deleted file mode 100644
index 0b7931e..0000000
--- a/manifests/5_6_2.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.6.2
-#
-# Usage:
-#
-#     include php::5_6_2
-class php::5_6_2 {
-  php::version { '5.6.2': }
-}
diff --git a/manifests/5_6_3.pp b/manifests/5_6_3.pp
deleted file mode 100644
index 5500853..0000000
--- a/manifests/5_6_3.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.6.3
-#
-# Usage:
-#
-#     include php::5_6_3
-class php::5_6_3 {
-  php::version { '5.6.3': }
-}
diff --git a/manifests/5_6_4.pp b/manifests/5_6_4.pp
deleted file mode 100644
index 9bfa082..0000000
--- a/manifests/5_6_4.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Installs php 5.6.4
-#
-# Usage:
-#
-#     include php::5_6_4
-class php::5_6_4 {
-  php::version { '5.6.4': }
-}
diff --git a/manifests/fpm/5_3_10.pp b/manifests/fpm/5_3_10.pp
deleted file mode 100644
index 230d8f9..0000000
--- a/manifests/fpm/5_3_10.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.10
-# Installs PHP 5.3.10 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_10
-#
-class php::fpm::5_3_10 {
-  php::fpm { '5.3.10': }
-}
diff --git a/manifests/fpm/5_3_11.pp b/manifests/fpm/5_3_11.pp
deleted file mode 100644
index 3fb6ff8..0000000
--- a/manifests/fpm/5_3_11.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.11
-# Installs PHP 5.3.11 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_11
-#
-class php::fpm::5_3_11 {
-  php::fpm { '5.3.11': }
-}
diff --git a/manifests/fpm/5_3_12.pp b/manifests/fpm/5_3_12.pp
deleted file mode 100644
index 344dbf8..0000000
--- a/manifests/fpm/5_3_12.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.12
-# Installs PHP 5.3.12 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_12
-#
-class php::fpm::5_3_12 {
-  php::fpm { '5.3.12': }
-}
diff --git a/manifests/fpm/5_3_13.pp b/manifests/fpm/5_3_13.pp
deleted file mode 100644
index 833c3f7..0000000
--- a/manifests/fpm/5_3_13.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.13
-# Installs PHP 5.3.13 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_13
-#
-class php::fpm::5_3_13 {
-  php::fpm { '5.3.13': }
-}
diff --git a/manifests/fpm/5_3_14.pp b/manifests/fpm/5_3_14.pp
deleted file mode 100644
index 0f505448..0000000
--- a/manifests/fpm/5_3_14.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.14
-# Installs PHP 5.3.14 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_14
-#
-class php::fpm::5_3_14 {
-  php::fpm { '5.3.14': }
-}
diff --git a/manifests/fpm/5_3_15.pp b/manifests/fpm/5_3_15.pp
deleted file mode 100644
index 874c2a9..0000000
--- a/manifests/fpm/5_3_15.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.15
-# Installs PHP 5.3.15 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_15
-#
-class php::fpm::5_3_15 {
-  php::fpm { '5.3.15': }
-}
diff --git a/manifests/fpm/5_3_16.pp b/manifests/fpm/5_3_16.pp
deleted file mode 100644
index 007553f..0000000
--- a/manifests/fpm/5_3_16.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.16
-# Installs PHP 5.3.16 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_16
-#
-class php::fpm::5_3_16 {
-  php::fpm { '5.3.16': }
-}
diff --git a/manifests/fpm/5_3_17.pp b/manifests/fpm/5_3_17.pp
deleted file mode 100644
index f4ba832..0000000
--- a/manifests/fpm/5_3_17.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.17
-# Installs PHP 5.3.17 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_17
-#
-class php::fpm::5_3_17 {
-  php::fpm { '5.3.17': }
-}
diff --git a/manifests/fpm/5_3_18.pp b/manifests/fpm/5_3_18.pp
deleted file mode 100644
index 6fca9ee..0000000
--- a/manifests/fpm/5_3_18.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.18
-# Installs PHP 5.3.18 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_18
-#
-class php::fpm::5_3_18 {
-  php::fpm { '5.3.18': }
-}
diff --git a/manifests/fpm/5_3_19.pp b/manifests/fpm/5_3_19.pp
deleted file mode 100644
index 54ceaef..0000000
--- a/manifests/fpm/5_3_19.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.19
-# Installs PHP 5.3.19 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_19
-#
-class php::fpm::5_3_19 {
-  php::fpm { '5.3.19': }
-}
diff --git a/manifests/fpm/5_3_2.pp b/manifests/fpm/5_3_2.pp
deleted file mode 100644
index c7e726d..0000000
--- a/manifests/fpm/5_3_2.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.2
-# Installs PHP 5.3.2 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_2
-#
-class php::fpm::5_3_2 {
-  php::fpm { '5.3.2': }
-}
diff --git a/manifests/fpm/5_3_20.pp b/manifests/fpm/5_3_20.pp
deleted file mode 100644
index 6cb69e7..0000000
--- a/manifests/fpm/5_3_20.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.20
-# Installs PHP 5.3.20 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_20
-#
-class php::fpm::5_3_20 {
-  php::fpm { '5.3.20': }
-}
diff --git a/manifests/fpm/5_3_21.pp b/manifests/fpm/5_3_21.pp
deleted file mode 100644
index 9de6193..0000000
--- a/manifests/fpm/5_3_21.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.21
-# Installs PHP 5.3.21 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_21
-#
-class php::fpm::5_3_21 {
-  php::fpm { '5.3.21': }
-}
diff --git a/manifests/fpm/5_3_22.pp b/manifests/fpm/5_3_22.pp
deleted file mode 100644
index 645afba..0000000
--- a/manifests/fpm/5_3_22.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.22
-# Installs PHP 5.3.22 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_22
-#
-class php::fpm::5_3_22 {
-  php::fpm { '5.3.22': }
-}
diff --git a/manifests/fpm/5_3_23.pp b/manifests/fpm/5_3_23.pp
deleted file mode 100644
index 1e76c93..0000000
--- a/manifests/fpm/5_3_23.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.23
-# Installs PHP 5.3.23 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_23
-#
-class php::fpm::5_3_23 {
-  php::fpm { '5.3.23': }
-}
diff --git a/manifests/fpm/5_3_24.pp b/manifests/fpm/5_3_24.pp
deleted file mode 100644
index 320b4a4..0000000
--- a/manifests/fpm/5_3_24.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.24
-# Installs PHP 5.3.24 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_24
-#
-class php::fpm::5_3_24 {
-  php::fpm { '5.3.24': }
-}
diff --git a/manifests/fpm/5_3_25.pp b/manifests/fpm/5_3_25.pp
deleted file mode 100644
index f9fe67e..0000000
--- a/manifests/fpm/5_3_25.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.25
-# Installs PHP 5.3.25 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_25
-#
-class php::fpm::5_3_25 {
-  php::fpm { '5.3.25': }
-}
diff --git a/manifests/fpm/5_3_26.pp b/manifests/fpm/5_3_26.pp
deleted file mode 100644
index 725d26c..0000000
--- a/manifests/fpm/5_3_26.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.26
-# Installs PHP 5.3.26 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_26
-#
-class php::fpm::5_3_26 {
-  php::fpm { '5.3.26': }
-}
diff --git a/manifests/fpm/5_3_27.pp b/manifests/fpm/5_3_27.pp
deleted file mode 100644
index b953292..0000000
--- a/manifests/fpm/5_3_27.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.27
-# Installs PHP 5.3.27 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_27
-#
-class php::fpm::5_3_27 {
-  php::fpm { '5.3.27': }
-}
diff --git a/manifests/fpm/5_3_28.pp b/manifests/fpm/5_3_28.pp
deleted file mode 100644
index 815cff6..0000000
--- a/manifests/fpm/5_3_28.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.28
-# Installs PHP 5.3.28 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_28
-#
-class php::fpm::5_3_28 {
-  php::fpm { '5.3.28': }
-}
diff --git a/manifests/fpm/5_3_3.pp b/manifests/fpm/5_3_3.pp
deleted file mode 100644
index 6624441..0000000
--- a/manifests/fpm/5_3_3.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.3
-# Installs PHP 5.3.3 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_3
-#
-class php::fpm::5_3_3 {
-  php::fpm { '5.3.3': }
-}
diff --git a/manifests/fpm/5_3_4.pp b/manifests/fpm/5_3_4.pp
deleted file mode 100644
index ce258d1..0000000
--- a/manifests/fpm/5_3_4.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.4
-# Installs PHP 5.3.4 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_4
-#
-class php::fpm::5_3_4 {
-  php::fpm { '5.3.4': }
-}
diff --git a/manifests/fpm/5_3_5.pp b/manifests/fpm/5_3_5.pp
deleted file mode 100644
index 22480f3..0000000
--- a/manifests/fpm/5_3_5.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.5
-# Installs PHP 5.3.5 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_5
-#
-class php::fpm::5_3_5 {
-  php::fpm { '5.3.5': }
-}
diff --git a/manifests/fpm/5_3_6.pp b/manifests/fpm/5_3_6.pp
deleted file mode 100644
index a895373..0000000
--- a/manifests/fpm/5_3_6.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.6
-# Installs PHP 5.3.6 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_6
-#
-class php::fpm::5_3_6 {
-  php::fpm { '5.3.6': }
-}
diff --git a/manifests/fpm/5_3_7.pp b/manifests/fpm/5_3_7.pp
deleted file mode 100644
index 8232bab..0000000
--- a/manifests/fpm/5_3_7.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.7
-# Installs PHP 5.3.7 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_7
-#
-class php::fpm::5_3_7 {
-  php::fpm { '5.3.7': }
-}
diff --git a/manifests/fpm/5_3_8.pp b/manifests/fpm/5_3_8.pp
deleted file mode 100644
index b83da3e..0000000
--- a/manifests/fpm/5_3_8.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.8
-# Installs PHP 5.3.8 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_8
-#
-class php::fpm::5_3_8 {
-  php::fpm { '5.3.8': }
-}
diff --git a/manifests/fpm/5_3_9.pp b/manifests/fpm/5_3_9.pp
deleted file mode 100644
index 8b91160..0000000
--- a/manifests/fpm/5_3_9.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.3.9
-# Installs PHP 5.3.9 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_3_9
-#
-class php::fpm::5_3_9 {
-  php::fpm { '5.3.9': }
-}
diff --git a/manifests/fpm/5_4_1.pp b/manifests/fpm/5_4_1.pp
deleted file mode 100644
index 6cdfb49..0000000
--- a/manifests/fpm/5_4_1.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.1
-# Installs PHP 5.4.1 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_1
-#
-class php::fpm::5_4_1 {
-  php::fpm { '5.4.1': }
-}
diff --git a/manifests/fpm/5_4_10.pp b/manifests/fpm/5_4_10.pp
deleted file mode 100644
index dcf2c2c..0000000
--- a/manifests/fpm/5_4_10.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.10
-# Installs PHP 5.4.10 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_10
-#
-class php::fpm::5_4_10 {
-  php::fpm { '5.4.10': }
-}
diff --git a/manifests/fpm/5_4_11.pp b/manifests/fpm/5_4_11.pp
deleted file mode 100644
index f0a88a4..0000000
--- a/manifests/fpm/5_4_11.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.11
-# Installs PHP 5.4.11 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_11
-#
-class php::fpm::5_4_11 {
-  php::fpm { '5.4.11': }
-}
diff --git a/manifests/fpm/5_4_12.pp b/manifests/fpm/5_4_12.pp
deleted file mode 100644
index 63729e6..0000000
--- a/manifests/fpm/5_4_12.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.12
-# Installs PHP 5.4.12 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_12
-#
-class php::fpm::5_4_12 {
-  php::fpm { '5.4.12': }
-}
diff --git a/manifests/fpm/5_4_13.pp b/manifests/fpm/5_4_13.pp
deleted file mode 100644
index 1b1d145..0000000
--- a/manifests/fpm/5_4_13.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.13
-# Installs PHP 5.4.13 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_13
-#
-class php::fpm::5_4_13 {
-  php::fpm { '5.4.13': }
-}
diff --git a/manifests/fpm/5_4_14.pp b/manifests/fpm/5_4_14.pp
deleted file mode 100644
index 8bce8a0..0000000
--- a/manifests/fpm/5_4_14.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.14
-# Installs PHP 5.4.14 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_14
-#
-class php::fpm::5_4_14 {
-  php::fpm { '5.4.14': }
-}
diff --git a/manifests/fpm/5_4_15.pp b/manifests/fpm/5_4_15.pp
deleted file mode 100644
index 2f4c5dc..0000000
--- a/manifests/fpm/5_4_15.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.15
-# Installs PHP 5.4.15 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_15
-#
-class php::fpm::5_4_15 {
-  php::fpm { '5.4.15': }
-}
diff --git a/manifests/fpm/5_4_16.pp b/manifests/fpm/5_4_16.pp
deleted file mode 100644
index 9f59858..0000000
--- a/manifests/fpm/5_4_16.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.16
-# Installs PHP 5.4.16 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_16
-#
-class php::fpm::5_4_16 {
-  php::fpm { '5.4.16': }
-}
diff --git a/manifests/fpm/5_4_17.pp b/manifests/fpm/5_4_17.pp
deleted file mode 100644
index 9d8c11f..0000000
--- a/manifests/fpm/5_4_17.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.17
-# Installs PHP 5.4.17 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_17
-#
-class php::fpm::5_4_17 {
-  php::fpm { '5.4.17': }
-}
diff --git a/manifests/fpm/5_4_18.pp b/manifests/fpm/5_4_18.pp
deleted file mode 100644
index 5e92adb..0000000
--- a/manifests/fpm/5_4_18.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.18
-# Installs PHP 5.4.18 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_18
-#
-class php::fpm::5_4_18 {
-  php::fpm { '5.4.18': }
-}
diff --git a/manifests/fpm/5_4_19.pp b/manifests/fpm/5_4_19.pp
deleted file mode 100644
index 42c3e91..0000000
--- a/manifests/fpm/5_4_19.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.19
-# Installs PHP 5.4.19 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_19
-#
-class php::fpm::5_4_19 {
-  php::fpm { '5.4.19': }
-}
diff --git a/manifests/fpm/5_4_2.pp b/manifests/fpm/5_4_2.pp
deleted file mode 100644
index 3330af5..0000000
--- a/manifests/fpm/5_4_2.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.2
-# Installs PHP 5.4.2 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_2
-#
-class php::fpm::5_4_2 {
-  php::fpm { '5.4.2': }
-}
diff --git a/manifests/fpm/5_4_20.pp b/manifests/fpm/5_4_20.pp
deleted file mode 100644
index 0951919..0000000
--- a/manifests/fpm/5_4_20.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.20
-# Installs PHP 5.4.20 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_20
-#
-class php::fpm::5_4_20 {
-  php::fpm { '5.4.20': }
-}
diff --git a/manifests/fpm/5_4_21.pp b/manifests/fpm/5_4_21.pp
deleted file mode 100644
index 904b42a..0000000
--- a/manifests/fpm/5_4_21.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.21
-# Installs PHP 5.4.21 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_21
-#
-class php::fpm::5_4_21 {
-  php::fpm { '5.4.21': }
-}
diff --git a/manifests/fpm/5_4_22.pp b/manifests/fpm/5_4_22.pp
deleted file mode 100644
index 8e4ef0f..0000000
--- a/manifests/fpm/5_4_22.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.22
-# Installs PHP 5.4.22 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_22
-#
-class php::fpm::5_4_22 {
-  php::fpm { '5.4.22': }
-}
diff --git a/manifests/fpm/5_4_23.pp b/manifests/fpm/5_4_23.pp
deleted file mode 100644
index 914f195..0000000
--- a/manifests/fpm/5_4_23.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.23
-# Installs PHP 5.4.23 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_23
-#
-class php::fpm::5_4_23 {
-  php::fpm { '5.4.23': }
-}
diff --git a/manifests/fpm/5_4_24.pp b/manifests/fpm/5_4_24.pp
deleted file mode 100644
index cd9ac22..0000000
--- a/manifests/fpm/5_4_24.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.24
-# Installs PHP 5.4.24 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_24
-#
-class php::fpm::5_4_24 {
-  php::fpm { '5.4.24': }
-}
diff --git a/manifests/fpm/5_4_25.pp b/manifests/fpm/5_4_25.pp
deleted file mode 100644
index d449053..0000000
--- a/manifests/fpm/5_4_25.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.25
-# Installs PHP 5.4.25 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_25
-#
-class php::fpm::5_4_25 {
-  php::fpm { '5.4.25': }
-}
diff --git a/manifests/fpm/5_4_26.pp b/manifests/fpm/5_4_26.pp
deleted file mode 100644
index 66ae916..0000000
--- a/manifests/fpm/5_4_26.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.26
-# Installs PHP 5.4.26 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_26
-#
-class php::fpm::5_4_26 {
-  php::fpm { '5.4.26': }
-}
diff --git a/manifests/fpm/5_4_27.pp b/manifests/fpm/5_4_27.pp
deleted file mode 100644
index 10c54a1..0000000
--- a/manifests/fpm/5_4_27.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.27
-# Installs PHP 5.4.27 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_27
-#
-class php::fpm::5_4_27 {
-  php::fpm { '5.4.27': }
-}
diff --git a/manifests/fpm/5_4_28.pp b/manifests/fpm/5_4_28.pp
deleted file mode 100644
index 63a0071..0000000
--- a/manifests/fpm/5_4_28.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.28
-# Installs PHP 5.4.28 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_28
-#
-class php::fpm::5_4_28 {
-  php::fpm { '5.4.28': }
-}
diff --git a/manifests/fpm/5_4_29.pp b/manifests/fpm/5_4_29.pp
deleted file mode 100644
index c5768b8..0000000
--- a/manifests/fpm/5_4_29.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.29
-# Installs PHP 5.4.29 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_29
-#
-class php::fpm::5_4_29 {
-  php::fpm { '5.4.29': }
-}
diff --git a/manifests/fpm/5_4_3.pp b/manifests/fpm/5_4_3.pp
deleted file mode 100644
index 2f50f51..0000000
--- a/manifests/fpm/5_4_3.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.3
-# Installs PHP 5.4.3 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_3
-#
-class php::fpm::5_4_3 {
-  php::fpm { '5.4.3': }
-}
diff --git a/manifests/fpm/5_4_35.pp b/manifests/fpm/5_4_35.pp
deleted file mode 100644
index b6b7b42..0000000
--- a/manifests/fpm/5_4_35.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.35
-# Installs PHP 5.4.35 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_35
-#
-class php::fpm::5_4_35 {
-  php::fpm { '5.4.35': }
-}
diff --git a/manifests/fpm/5_4_36.pp b/manifests/fpm/5_4_36.pp
deleted file mode 100644
index 8be1c34..0000000
--- a/manifests/fpm/5_4_36.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.36
-# Installs PHP 5.4.36 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_36
-#
-class php::fpm::5_4_36 {
-  php::fpm { '5.4.36': }
-}
diff --git a/manifests/fpm/5_4_4.pp b/manifests/fpm/5_4_4.pp
deleted file mode 100644
index ab03b1d..0000000
--- a/manifests/fpm/5_4_4.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.4
-# Installs PHP 5.4.4 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_4
-#
-class php::fpm::5_4_4 {
-  php::fpm { '5.4.4': }
-}
diff --git a/manifests/fpm/5_4_5.pp b/manifests/fpm/5_4_5.pp
deleted file mode 100644
index 54c1706..0000000
--- a/manifests/fpm/5_4_5.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.5
-# Installs PHP 5.4.5 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_5
-#
-class php::fpm::5_4_5 {
-  php::fpm { '5.4.5': }
-}
diff --git a/manifests/fpm/5_4_6.pp b/manifests/fpm/5_4_6.pp
deleted file mode 100644
index 063b0a0..0000000
--- a/manifests/fpm/5_4_6.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.6
-# Installs PHP 5.4.6 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_6
-#
-class php::fpm::5_4_6 {
-  php::fpm { '5.4.6': }
-}
diff --git a/manifests/fpm/5_4_7.pp b/manifests/fpm/5_4_7.pp
deleted file mode 100644
index c6bf24f..0000000
--- a/manifests/fpm/5_4_7.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.7
-# Installs PHP 5.4.7 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_7
-#
-class php::fpm::5_4_7 {
-  php::fpm { '5.4.7': }
-}
diff --git a/manifests/fpm/5_4_8.pp b/manifests/fpm/5_4_8.pp
deleted file mode 100644
index aa5bc8c..0000000
--- a/manifests/fpm/5_4_8.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.8
-# Installs PHP 5.4.8 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_8
-#
-class php::fpm::5_4_8 {
-  php::fpm { '5.4.8': }
-}
diff --git a/manifests/fpm/5_4_9.pp b/manifests/fpm/5_4_9.pp
deleted file mode 100644
index 2ed460c..0000000
--- a/manifests/fpm/5_4_9.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.4.9
-# Installs PHP 5.4.9 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_4_9
-#
-class php::fpm::5_4_9 {
-  php::fpm { '5.4.9': }
-}
diff --git a/manifests/fpm/5_5_0.pp b/manifests/fpm/5_5_0.pp
deleted file mode 100644
index 77d4ad9..0000000
--- a/manifests/fpm/5_5_0.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.0
-# Installs PHP 5.5.0 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_0
-#
-class php::fpm::5_5_0 {
-  php::fpm { '5.5.0': }
-}
diff --git a/manifests/fpm/5_5_1.pp b/manifests/fpm/5_5_1.pp
deleted file mode 100644
index 0a59519..0000000
--- a/manifests/fpm/5_5_1.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.1
-# Installs PHP 5.5.1 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_1
-#
-class php::fpm::5_5_1 {
-  php::fpm { '5.5.1': }
-}
diff --git a/manifests/fpm/5_5_10.pp b/manifests/fpm/5_5_10.pp
deleted file mode 100644
index fad7525..0000000
--- a/manifests/fpm/5_5_10.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.10
-# Installs PHP 5.5.10 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_10
-#
-class php::fpm::5_5_10 {
-  php::fpm { '5.5.10': }
-}
diff --git a/manifests/fpm/5_5_11.pp b/manifests/fpm/5_5_11.pp
deleted file mode 100644
index 02ece3b..0000000
--- a/manifests/fpm/5_5_11.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.11
-# Installs PHP 5.5.11 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_11
-#
-class php::fpm::5_5_11 {
-  php::fpm { '5.5.11': }
-}
diff --git a/manifests/fpm/5_5_12.pp b/manifests/fpm/5_5_12.pp
deleted file mode 100644
index cf87a78..0000000
--- a/manifests/fpm/5_5_12.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.12
-# Installs PHP 5.5.12 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_12
-#
-class php::fpm::5_5_12 {
-  php::fpm { '5.5.12': }
-}
diff --git a/manifests/fpm/5_5_13.pp b/manifests/fpm/5_5_13.pp
deleted file mode 100644
index 02a2b73..0000000
--- a/manifests/fpm/5_5_13.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.13
-# Installs PHP 5.5.13 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_13
-#
-class php::fpm::5_5_13 {
-  php::fpm { '5.5.13': }
-}
diff --git a/manifests/fpm/5_5_14.pp b/manifests/fpm/5_5_14.pp
deleted file mode 100644
index b7835e6..0000000
--- a/manifests/fpm/5_5_14.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.14
-# Installs PHP 5.5.14 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_14
-#
-class php::fpm::5_5_14 {
-  php::fpm { '5.5.14': }
-}
diff --git a/manifests/fpm/5_5_15.pp b/manifests/fpm/5_5_15.pp
deleted file mode 100644
index 987f598..0000000
--- a/manifests/fpm/5_5_15.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.15
-# Installs PHP 5.5.15 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_15
-#
-class php::fpm::5_5_15 {
-  php::fpm { '5.5.15': }
-}
diff --git a/manifests/fpm/5_5_16.pp b/manifests/fpm/5_5_16.pp
deleted file mode 100644
index 8065d84..0000000
--- a/manifests/fpm/5_5_16.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.16
-# Installs PHP 5.5.16 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_16
-#
-class php::fpm::5_5_16 {
-  php::fpm { '5.5.16': }
-}
diff --git a/manifests/fpm/5_5_18.pp b/manifests/fpm/5_5_18.pp
deleted file mode 100644
index 20a3dd2..0000000
--- a/manifests/fpm/5_5_18.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.18
-# Installs PHP 5.5.18 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_18
-#
-class php::fpm::5_5_18 {
-  php::fpm { '5.5.18': }
-}
diff --git a/manifests/fpm/5_5_19.pp b/manifests/fpm/5_5_19.pp
deleted file mode 100644
index fc1d482..0000000
--- a/manifests/fpm/5_5_19.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.19
-# Installs PHP 5.5.19 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_19
-#
-class php::fpm::5_5_19 {
-  php::fpm { '5.5.19': }
-}
diff --git a/manifests/fpm/5_5_2.pp b/manifests/fpm/5_5_2.pp
deleted file mode 100644
index b10e0b2..0000000
--- a/manifests/fpm/5_5_2.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.2
-# Installs PHP 5.5.2 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_2
-#
-class php::fpm::5_5_2 {
-  php::fpm { '5.5.2': }
-}
diff --git a/manifests/fpm/5_5_20.pp b/manifests/fpm/5_5_20.pp
deleted file mode 100644
index 07fcca8..0000000
--- a/manifests/fpm/5_5_20.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.20
-# Installs PHP 5.5.20 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_20
-#
-class php::fpm::5_5_20 {
-  php::fpm { '5.5.20': }
-}
diff --git a/manifests/fpm/5_5_3.pp b/manifests/fpm/5_5_3.pp
deleted file mode 100644
index 2bac8ce..0000000
--- a/manifests/fpm/5_5_3.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.3
-# Installs PHP 5.5.3 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_3
-#
-class php::fpm::5_5_3 {
-  php::fpm { '5.5.3': }
-}
diff --git a/manifests/fpm/5_5_4.pp b/manifests/fpm/5_5_4.pp
deleted file mode 100644
index c17f52a..0000000
--- a/manifests/fpm/5_5_4.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.4
-# Installs PHP 5.5.4 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_4
-#
-class php::fpm::5_5_4 {
-  php::fpm { '5.5.4': }
-}
diff --git a/manifests/fpm/5_5_5.pp b/manifests/fpm/5_5_5.pp
deleted file mode 100644
index e118b77..0000000
--- a/manifests/fpm/5_5_5.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.5
-# Installs PHP 5.5.5 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_5
-#
-class php::fpm::5_5_5 {
-  php::fpm { '5.5.5': }
-}
diff --git a/manifests/fpm/5_5_6.pp b/manifests/fpm/5_5_6.pp
deleted file mode 100644
index c58859b..0000000
--- a/manifests/fpm/5_5_6.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.6
-# Installs PHP 5.5.6 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_6
-#
-class php::fpm::5_5_6 {
-  php::fpm { '5.5.6': }
-}
diff --git a/manifests/fpm/5_5_7.pp b/manifests/fpm/5_5_7.pp
deleted file mode 100644
index bfbd7d0..0000000
--- a/manifests/fpm/5_5_7.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.7
-# Installs PHP 5.5.7 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_7
-#
-class php::fpm::5_5_7 {
-  php::fpm { '5.5.7': }
-}
diff --git a/manifests/fpm/5_5_8.pp b/manifests/fpm/5_5_8.pp
deleted file mode 100644
index 6581553..0000000
--- a/manifests/fpm/5_5_8.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.8
-# Installs PHP 5.5.8 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_8
-#
-class php::fpm::5_5_8 {
-  php::fpm { '5.5.8': }
-}
diff --git a/manifests/fpm/5_5_9.pp b/manifests/fpm/5_5_9.pp
deleted file mode 100644
index 3955c84..0000000
--- a/manifests/fpm/5_5_9.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.5.9
-# Installs PHP 5.5.9 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_5_9
-#
-class php::fpm::5_5_9 {
-  php::fpm { '5.5.9': }
-}
diff --git a/manifests/fpm/5_6_0.pp b/manifests/fpm/5_6_0.pp
deleted file mode 100644
index 70a1a0b..0000000
--- a/manifests/fpm/5_6_0.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.6.0
-# Installs PHP 5.6.0 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_6_0
-#
-class php::fpm::5_6_0 {
-  php::fpm { '5.6.0': }
-}
diff --git a/manifests/fpm/5_6_1.pp b/manifests/fpm/5_6_1.pp
deleted file mode 100644
index 40e0aab..0000000
--- a/manifests/fpm/5_6_1.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.6.1
-# Installs PHP 5.6.1 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_6_1
-#
-class php::fpm::5_6_1 {
-  php::fpm { '5.6.1': }
-}
diff --git a/manifests/fpm/5_6_2.pp b/manifests/fpm/5_6_2.pp
deleted file mode 100644
index 358203a..0000000
--- a/manifests/fpm/5_6_2.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.6.2
-# Installs PHP 5.6.2 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_6_2
-#
-class php::fpm::5_6_2 {
-  php::fpm { '5.6.2': }
-}
diff --git a/manifests/fpm/5_6_3.pp b/manifests/fpm/5_6_3.pp
deleted file mode 100644
index 55d91ce..0000000
--- a/manifests/fpm/5_6_3.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.6.3
-# Installs PHP 5.6.3 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_6_3
-#
-class php::fpm::5_6_3 {
-  php::fpm { '5.6.3': }
-}
diff --git a/manifests/fpm/5_6_4.pp b/manifests/fpm/5_6_4.pp
deleted file mode 100644
index 8d51efc..0000000
--- a/manifests/fpm/5_6_4.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Launches a PHP FPM service running PHP 5.6.4
-# Installs PHP 5.6.4 if it doesn't already exist
-#
-# Usage:
-#
-#     include php::fpm::5_6_4
-#
-class php::fpm::5_6_4 {
-  php::fpm { '5.6.4': }
-}
diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp
index c9fee56..3edb239 100644
--- a/manifests/fpm/pool.pp
+++ b/manifests/fpm/pool.pp
@@ -33,7 +33,7 @@
   if $ensure == present {
     # Ensure that the php fpm service for this php version is installed
     # eg. php::fpm::5_4_10
-    include join(['php', 'fpm', join(split($version, '[.]'), '_')], '::')
+    php_fpm_require $version
 
     # Create a pool config file
     file { "${fpm_pool_config_dir}/${pool_name}.conf":
diff --git a/manifests/version.pp b/manifests/version.pp
index fc68d95..837a9c5 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -22,29 +22,42 @@
   $secure_5_5 = '5.5.20'
   $secure_5_4 = '5.4.36'
 
+  # Specify secure version if no minor point specified
+  if $version == '5' {
+    $minor_version = $secure_5_6
+  } elsif $version == '5.6' {
+    $minor_version = $secure_5_6
+  } elsif $version == '5.5' {
+    $minor_version = $secure_5_5
+  } elsif $version == '5.4' {
+    $minor_version = $secure_5_4
+  } else {
+    $minor_version = $version
+  }
+
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
-  if versioncmp($version, '5.6') >= 0 and versioncmp($version, $secure_5_6) < 0 {
-    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
+  if versioncmp($minor_version, '5.6') >= 0 and versioncmp($minor_version, $secure_5_6) < 0 {
+    warning("You are installing PHP ${minor_version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
   }
 
   # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
-  if versioncmp($version, '5.5') >= 0 and versioncmp($version, $secure_5_5) < 0 {
-    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
+  if versioncmp($minor_version, '5.5') >= 0 and versioncmp($minor_version, $secure_5_5) < 0 {
+    warning("You are installing PHP ${minor_version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
   }
 
   # Version is less than the minimum secure version
-  if versioncmp($version, $secure_5_4) < 0 {
-    warning("You are installing PHP ${version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
+  if versioncmp($minor_version, $secure_5_4) < 0 {
+    warning("You are installing PHP ${minor_version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
   }
 
   # Install location
-  $dest = "${php::config::root}/versions/${version}"
+  $dest = "${php::config::root}/versions/${minor_version}"
 
   # Log locations
-  $error_log = "${php::config::logdir}/${version}.error.log"
+  $error_log = "${php::config::logdir}/${minor_version}.error.log"
 
   # Config locations
-  $version_config_root  = "${php::config::configdir}/${version}"
+  $version_config_root  = "${php::config::configdir}/${minor_version}"
   $php_ini              = "${version_config_root}/php.ini"
   $conf_d               = "${version_config_root}/conf.d"
 
@@ -52,14 +65,14 @@
   $module_dir = "${dest}/modules"
 
   # Data directory for this version
-  $version_data_root = "${php::config::datadir}/${version}"
+  $version_data_root = "${php::config::datadir}/${minor_version}"
 
   if $ensure == 'absent' {
 
     # If we're nuking a version of PHP also ensure we shut down
     # and get rid of the PHP FPM Service & config
 
-    php::fpm { $version:
+    php::fpm { $minor_version:
       ensure => 'absent'
     }
 
@@ -76,13 +89,11 @@
   } else {
 
     # Data directory
-
     file { $version_data_root:
       ensure => directory,
     }
 
     # Set up config directories
-
     file { $version_config_root:
       ensure => directory,
     }
@@ -97,18 +108,16 @@
     # Ensure module dir is created for extensions AFTER php is installed
     file { $module_dir:
       ensure  => directory,
-      require => Php_version[$version],
+      require => Php_version[$minor_version],
     }
 
     # Set up config files
-
     file { $php_ini:
       content => template('php/php.ini.erb'),
       require => File[$version_config_root]
     }
 
     # Log files
-
     file { $error_log:
       owner => $::boxen_user,
       mode  => '0644',
@@ -118,15 +127,15 @@
 
     # Get any additional configure params
     $test_params = $php::config::configure_params
-    if is_hash($test_params) and has_key($test_params, $version) {
-      $configure_params = $test_params[$version]
+    if is_hash($test_params) and has_key($test_params, $minor_version) {
+      $configure_params = $test_params[$minor_version]
     }
 
-    php_version { $version:
+    php_version { $minor_version:
       user              => $::boxen_user,
       user_home         => "/Users/${::boxen_user}",
       phpenv_root       => $php::config::root,
-      version           => $version,
+      version           => $minor_version,
       homebrew_path     => $boxen::config::homebrewdir,
       require           => [
         Repository["${php::config::root}/php-src"],
@@ -141,7 +150,7 @@
         Package['autoconf'],
         Package['boxen/brews/autoconf213'],
       ],
-      notify            => Exec["phpenv-rehash-post-install-${version}"],
+      notify            => Exec["phpenv-rehash-post-install-${minor_version}"],
       configure_params  => $configure_params,
     }
 
@@ -151,13 +160,13 @@
       owner   => $::boxen_user,
       group   => 'staff',
       recurse => true,
-      require => Php_version[$version],
+      require => Php_version[$minor_version],
     }
 
     # Rehash phpenv shims when a new version is installed
-    exec { "phpenv-rehash-post-install-${version}":
+    exec { "phpenv-rehash-post-install-${minor_version}":
       command     => "/bin/rm -rf ${php::config::root}/shims && PHPENV_ROOT=${php::config::root} ${php::config::root}/bin/phpenv rehash",
-      require     => Php_version[$version],
+      require     => Php_version[$minor_version],
       refreshonly => true,
     }
 
@@ -170,31 +179,31 @@
     }
 
     # Set cache_dir for PEAR
-    exec { "pear-${version}-cache_dir":
+    exec { "pear-${minor_version}-cache_dir":
       command => "${dest}/bin/pear config-set cache_dir ${php::config::datadir}/pear",
       unless  => "${dest}/bin/pear config-get cache_dir | grep -i ${php::config::datadir}/pear",
       require => [
-        Php_version[$version],
+        Php_version[$minor_version],
         File["${php::config::datadir}/pear"],
       ],
     }
 
     # Set download_dir for PEAR
-    exec { "pear-${version}-download_dir":
+    exec { "pear-${minor_version}-download_dir":
       command => "${dest}/bin/pear config-set download_dir ${php::config::datadir}/pear",
       unless  => "${dest}/bin/pear config-get download_dir | grep -i ${php::config::datadir}/pear",
       require => [
-        Php_version[$version],
+        Php_version[$minor_version],
         File["${php::config::datadir}/pear"],
       ],
     }
 
     # Set temp_dir for PEAR
-    exec { "pear-${version}-temp_dir":
+    exec { "pear-${minor_version}-temp_dir":
       command => "${dest}/bin/pear config-set temp_dir ${php::config::datadir}/pear",
       unless  => "${dest}/bin/pear config-get temp_dir | grep -i ${php::config::datadir}/pear",
       require => [
-        Php_version[$version],
+        Php_version[$minor_version],
         File["${php::config::datadir}/pear"],
       ],
     }
diff --git a/spec/classes/fpm/php_fpm_5_3_10_spec.rb b/spec/classes/fpm/php_fpm_5_3_10_spec.rb
deleted file mode 100644
index 8f1ea07..0000000
--- a/spec/classes/fpm/php_fpm_5_3_10_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_10" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.10")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_11_spec.rb b/spec/classes/fpm/php_fpm_5_3_11_spec.rb
deleted file mode 100644
index e3d0a13..0000000
--- a/spec/classes/fpm/php_fpm_5_3_11_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_11" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.11")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_12_spec.rb b/spec/classes/fpm/php_fpm_5_3_12_spec.rb
deleted file mode 100644
index bb3b198..0000000
--- a/spec/classes/fpm/php_fpm_5_3_12_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_12" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.12")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_13_spec.rb b/spec/classes/fpm/php_fpm_5_3_13_spec.rb
deleted file mode 100644
index 4b3a5d6..0000000
--- a/spec/classes/fpm/php_fpm_5_3_13_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_13" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.13")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_14_spec.rb b/spec/classes/fpm/php_fpm_5_3_14_spec.rb
deleted file mode 100644
index eb2de76..0000000
--- a/spec/classes/fpm/php_fpm_5_3_14_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_14" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.14")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_15_spec.rb b/spec/classes/fpm/php_fpm_5_3_15_spec.rb
deleted file mode 100644
index 11ecafb..0000000
--- a/spec/classes/fpm/php_fpm_5_3_15_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_15" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.15")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_16_spec.rb b/spec/classes/fpm/php_fpm_5_3_16_spec.rb
deleted file mode 100644
index 1c3594d..0000000
--- a/spec/classes/fpm/php_fpm_5_3_16_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_16" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.16")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_17_spec.rb b/spec/classes/fpm/php_fpm_5_3_17_spec.rb
deleted file mode 100644
index 501d404..0000000
--- a/spec/classes/fpm/php_fpm_5_3_17_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_17" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.17")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_18_spec.rb b/spec/classes/fpm/php_fpm_5_3_18_spec.rb
deleted file mode 100644
index c098e94..0000000
--- a/spec/classes/fpm/php_fpm_5_3_18_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_18" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.18")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_19_spec.rb b/spec/classes/fpm/php_fpm_5_3_19_spec.rb
deleted file mode 100644
index 14e93a3..0000000
--- a/spec/classes/fpm/php_fpm_5_3_19_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_19" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.19")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_20_spec.rb b/spec/classes/fpm/php_fpm_5_3_20_spec.rb
deleted file mode 100644
index 1fc4c1a..0000000
--- a/spec/classes/fpm/php_fpm_5_3_20_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_20" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.20")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_21_spec.rb b/spec/classes/fpm/php_fpm_5_3_21_spec.rb
deleted file mode 100644
index ba9b61b..0000000
--- a/spec/classes/fpm/php_fpm_5_3_21_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_21" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.21")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_22_spec.rb b/spec/classes/fpm/php_fpm_5_3_22_spec.rb
deleted file mode 100644
index a2ea329..0000000
--- a/spec/classes/fpm/php_fpm_5_3_22_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_22" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.22")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_23_spec.rb b/spec/classes/fpm/php_fpm_5_3_23_spec.rb
deleted file mode 100644
index dc8e281..0000000
--- a/spec/classes/fpm/php_fpm_5_3_23_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_23" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.23")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_24_spec.rb b/spec/classes/fpm/php_fpm_5_3_24_spec.rb
deleted file mode 100644
index cbf2a92..0000000
--- a/spec/classes/fpm/php_fpm_5_3_24_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_24" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.24")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_25_spec.rb b/spec/classes/fpm/php_fpm_5_3_25_spec.rb
deleted file mode 100644
index 824145c..0000000
--- a/spec/classes/fpm/php_fpm_5_3_25_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_25" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.25")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_26_spec.rb b/spec/classes/fpm/php_fpm_5_3_26_spec.rb
deleted file mode 100644
index f2580e7..0000000
--- a/spec/classes/fpm/php_fpm_5_3_26_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_26" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.26")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_27_spec.rb b/spec/classes/fpm/php_fpm_5_3_27_spec.rb
deleted file mode 100644
index f52ed0e..0000000
--- a/spec/classes/fpm/php_fpm_5_3_27_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_27" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.27")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_28_spec.rb b/spec/classes/fpm/php_fpm_5_3_28_spec.rb
deleted file mode 100644
index af3af39..0000000
--- a/spec/classes/fpm/php_fpm_5_3_28_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_28" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.28")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_2_spec.rb b/spec/classes/fpm/php_fpm_5_3_2_spec.rb
deleted file mode 100644
index 5df366d..0000000
--- a/spec/classes/fpm/php_fpm_5_3_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.2")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_3_spec.rb b/spec/classes/fpm/php_fpm_5_3_3_spec.rb
deleted file mode 100644
index d84599e..0000000
--- a/spec/classes/fpm/php_fpm_5_3_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.3")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_4_spec.rb b/spec/classes/fpm/php_fpm_5_3_4_spec.rb
deleted file mode 100644
index 459ed26..0000000
--- a/spec/classes/fpm/php_fpm_5_3_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.4")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_5_spec.rb b/spec/classes/fpm/php_fpm_5_3_5_spec.rb
deleted file mode 100644
index d01a560..0000000
--- a/spec/classes/fpm/php_fpm_5_3_5_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.5")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_6_spec.rb b/spec/classes/fpm/php_fpm_5_3_6_spec.rb
deleted file mode 100644
index 9f6642a..0000000
--- a/spec/classes/fpm/php_fpm_5_3_6_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.6")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_7_spec.rb b/spec/classes/fpm/php_fpm_5_3_7_spec.rb
deleted file mode 100644
index f8ff362..0000000
--- a/spec/classes/fpm/php_fpm_5_3_7_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_7" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.7")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_8_spec.rb b/spec/classes/fpm/php_fpm_5_3_8_spec.rb
deleted file mode 100644
index 8c77321..0000000
--- a/spec/classes/fpm/php_fpm_5_3_8_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_8" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.8")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_3_9_spec.rb b/spec/classes/fpm/php_fpm_5_3_9_spec.rb
deleted file mode 100644
index dfa2f3e..0000000
--- a/spec/classes/fpm/php_fpm_5_3_9_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_3_9" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.3.9")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_10_spec.rb b/spec/classes/fpm/php_fpm_5_4_10_spec.rb
deleted file mode 100644
index eda0a57..0000000
--- a/spec/classes/fpm/php_fpm_5_4_10_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_10" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.10")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_11_spec.rb b/spec/classes/fpm/php_fpm_5_4_11_spec.rb
deleted file mode 100644
index c2ed1a0..0000000
--- a/spec/classes/fpm/php_fpm_5_4_11_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_11" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.11")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_12_spec.rb b/spec/classes/fpm/php_fpm_5_4_12_spec.rb
deleted file mode 100644
index fc581fa..0000000
--- a/spec/classes/fpm/php_fpm_5_4_12_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_12" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.12")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_13_spec.rb b/spec/classes/fpm/php_fpm_5_4_13_spec.rb
deleted file mode 100644
index 3692131..0000000
--- a/spec/classes/fpm/php_fpm_5_4_13_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_13" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.13")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_14_spec.rb b/spec/classes/fpm/php_fpm_5_4_14_spec.rb
deleted file mode 100644
index 3f13868..0000000
--- a/spec/classes/fpm/php_fpm_5_4_14_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_14" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.14")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_15_spec.rb b/spec/classes/fpm/php_fpm_5_4_15_spec.rb
deleted file mode 100644
index 9d0ceef..0000000
--- a/spec/classes/fpm/php_fpm_5_4_15_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_15" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.15")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_16_spec.rb b/spec/classes/fpm/php_fpm_5_4_16_spec.rb
deleted file mode 100644
index 32613d0..0000000
--- a/spec/classes/fpm/php_fpm_5_4_16_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_16" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.16")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_17_spec.rb b/spec/classes/fpm/php_fpm_5_4_17_spec.rb
deleted file mode 100644
index 0b10b2b..0000000
--- a/spec/classes/fpm/php_fpm_5_4_17_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_17" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.17")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_18_spec.rb b/spec/classes/fpm/php_fpm_5_4_18_spec.rb
deleted file mode 100644
index 59326e4..0000000
--- a/spec/classes/fpm/php_fpm_5_4_18_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_18" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.18")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_19_spec.rb b/spec/classes/fpm/php_fpm_5_4_19_spec.rb
deleted file mode 100644
index 06b7ee6..0000000
--- a/spec/classes/fpm/php_fpm_5_4_19_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_19" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.19")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_1_spec.rb b/spec/classes/fpm/php_fpm_5_4_1_spec.rb
deleted file mode 100644
index 2bcd04a..0000000
--- a/spec/classes/fpm/php_fpm_5_4_1_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_1" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.1")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_20_spec.rb b/spec/classes/fpm/php_fpm_5_4_20_spec.rb
deleted file mode 100644
index 5310d07..0000000
--- a/spec/classes/fpm/php_fpm_5_4_20_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_20" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.20")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_21_spec.rb b/spec/classes/fpm/php_fpm_5_4_21_spec.rb
deleted file mode 100644
index 2bbbe29..0000000
--- a/spec/classes/fpm/php_fpm_5_4_21_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_21" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.21")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_22_spec.rb b/spec/classes/fpm/php_fpm_5_4_22_spec.rb
deleted file mode 100644
index 37cb8bf..0000000
--- a/spec/classes/fpm/php_fpm_5_4_22_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_22" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.22")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_23_spec.rb b/spec/classes/fpm/php_fpm_5_4_23_spec.rb
deleted file mode 100644
index 04a52dc..0000000
--- a/spec/classes/fpm/php_fpm_5_4_23_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_23" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.23")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_24_spec.rb b/spec/classes/fpm/php_fpm_5_4_24_spec.rb
deleted file mode 100644
index 3721206..0000000
--- a/spec/classes/fpm/php_fpm_5_4_24_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_24" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.24")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_25_spec.rb b/spec/classes/fpm/php_fpm_5_4_25_spec.rb
deleted file mode 100644
index 87f1a58..0000000
--- a/spec/classes/fpm/php_fpm_5_4_25_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_25" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.25")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_26_spec.rb b/spec/classes/fpm/php_fpm_5_4_26_spec.rb
deleted file mode 100644
index 735ef02..0000000
--- a/spec/classes/fpm/php_fpm_5_4_26_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_26" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.26")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_2_spec.rb b/spec/classes/fpm/php_fpm_5_4_2_spec.rb
deleted file mode 100644
index 4857f5c..0000000
--- a/spec/classes/fpm/php_fpm_5_4_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.2")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_35_spec.rb b/spec/classes/fpm/php_fpm_5_4_35_spec.rb
deleted file mode 100644
index f2086d8..0000000
--- a/spec/classes/fpm/php_fpm_5_4_35_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_35" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.35")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_36_spec.rb b/spec/classes/fpm/php_fpm_5_4_36_spec.rb
deleted file mode 100644
index c9e83fa..0000000
--- a/spec/classes/fpm/php_fpm_5_4_36_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_36" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.36")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_3_spec.rb b/spec/classes/fpm/php_fpm_5_4_3_spec.rb
deleted file mode 100644
index f315ef9..0000000
--- a/spec/classes/fpm/php_fpm_5_4_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.3")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_4_spec.rb b/spec/classes/fpm/php_fpm_5_4_4_spec.rb
deleted file mode 100644
index 5869112..0000000
--- a/spec/classes/fpm/php_fpm_5_4_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.4")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_5_spec.rb b/spec/classes/fpm/php_fpm_5_4_5_spec.rb
deleted file mode 100644
index 40728f5..0000000
--- a/spec/classes/fpm/php_fpm_5_4_5_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.5")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_6_spec.rb b/spec/classes/fpm/php_fpm_5_4_6_spec.rb
deleted file mode 100644
index ce732c0..0000000
--- a/spec/classes/fpm/php_fpm_5_4_6_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.6")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_7_spec.rb b/spec/classes/fpm/php_fpm_5_4_7_spec.rb
deleted file mode 100644
index 5ff0dd4..0000000
--- a/spec/classes/fpm/php_fpm_5_4_7_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_7" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.7")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_8_spec.rb b/spec/classes/fpm/php_fpm_5_4_8_spec.rb
deleted file mode 100644
index 6201c4b..0000000
--- a/spec/classes/fpm/php_fpm_5_4_8_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_8" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.8")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_4_9_spec.rb b/spec/classes/fpm/php_fpm_5_4_9_spec.rb
deleted file mode 100644
index 7f19339..0000000
--- a/spec/classes/fpm/php_fpm_5_4_9_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_4_9" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.4.9")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_0_spec.rb b/spec/classes/fpm/php_fpm_5_5_0_spec.rb
deleted file mode 100644
index f2b2164..0000000
--- a/spec/classes/fpm/php_fpm_5_5_0_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_0" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.0")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_10_spec.rb b/spec/classes/fpm/php_fpm_5_5_10_spec.rb
deleted file mode 100644
index e1505da..0000000
--- a/spec/classes/fpm/php_fpm_5_5_10_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_10" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.10")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_11_spec.rb b/spec/classes/fpm/php_fpm_5_5_11_spec.rb
deleted file mode 100644
index 91c13d6..0000000
--- a/spec/classes/fpm/php_fpm_5_5_11_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_11" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.11")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_12_spec.rb b/spec/classes/fpm/php_fpm_5_5_12_spec.rb
deleted file mode 100644
index 794d3b2..0000000
--- a/spec/classes/fpm/php_fpm_5_5_12_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_12" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.12")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_13_spec.rb b/spec/classes/fpm/php_fpm_5_5_13_spec.rb
deleted file mode 100644
index c319412..0000000
--- a/spec/classes/fpm/php_fpm_5_5_13_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_13" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.13")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_18_spec.rb b/spec/classes/fpm/php_fpm_5_5_18_spec.rb
deleted file mode 100644
index bfbc605..0000000
--- a/spec/classes/fpm/php_fpm_5_5_18_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_18" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.18")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_19_spec.rb b/spec/classes/fpm/php_fpm_5_5_19_spec.rb
deleted file mode 100644
index 9887b1f..0000000
--- a/spec/classes/fpm/php_fpm_5_5_19_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_19" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.19")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_1_spec.rb b/spec/classes/fpm/php_fpm_5_5_1_spec.rb
deleted file mode 100644
index 8034a1a..0000000
--- a/spec/classes/fpm/php_fpm_5_5_1_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_1" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.1")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_20_spec.rb b/spec/classes/fpm/php_fpm_5_5_20_spec.rb
deleted file mode 100644
index 328d696..0000000
--- a/spec/classes/fpm/php_fpm_5_5_20_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_20" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.20")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_2_spec.rb b/spec/classes/fpm/php_fpm_5_5_2_spec.rb
deleted file mode 100644
index f346c7b..0000000
--- a/spec/classes/fpm/php_fpm_5_5_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.2")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_3_spec.rb b/spec/classes/fpm/php_fpm_5_5_3_spec.rb
deleted file mode 100644
index 8027cdf..0000000
--- a/spec/classes/fpm/php_fpm_5_5_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.3")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_4_spec.rb b/spec/classes/fpm/php_fpm_5_5_4_spec.rb
deleted file mode 100644
index f34590b..0000000
--- a/spec/classes/fpm/php_fpm_5_5_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.4")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_5_spec.rb b/spec/classes/fpm/php_fpm_5_5_5_spec.rb
deleted file mode 100644
index b3bd13a..0000000
--- a/spec/classes/fpm/php_fpm_5_5_5_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.5")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_6_spec.rb b/spec/classes/fpm/php_fpm_5_5_6_spec.rb
deleted file mode 100644
index 5f63323..0000000
--- a/spec/classes/fpm/php_fpm_5_5_6_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.6")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_7_spec.rb b/spec/classes/fpm/php_fpm_5_5_7_spec.rb
deleted file mode 100644
index afbbd12..0000000
--- a/spec/classes/fpm/php_fpm_5_5_7_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_7" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.7")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_8_spec.rb b/spec/classes/fpm/php_fpm_5_5_8_spec.rb
deleted file mode 100644
index a182da2..0000000
--- a/spec/classes/fpm/php_fpm_5_5_8_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_8" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.8")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_5_9_spec.rb b/spec/classes/fpm/php_fpm_5_5_9_spec.rb
deleted file mode 100644
index f0c5385..0000000
--- a/spec/classes/fpm/php_fpm_5_5_9_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_5_9" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.5.9")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_6_0_spec.rb b/spec/classes/fpm/php_fpm_5_6_0_spec.rb
deleted file mode 100644
index 99152ec..0000000
--- a/spec/classes/fpm/php_fpm_5_6_0_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_6_0" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.6.0")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_6_1_spec.rb b/spec/classes/fpm/php_fpm_5_6_1_spec.rb
deleted file mode 100644
index 98ce4d0..0000000
--- a/spec/classes/fpm/php_fpm_5_6_1_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_6_1" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.6.1")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_6_2_spec.rb b/spec/classes/fpm/php_fpm_5_6_2_spec.rb
deleted file mode 100644
index 51a22e8..0000000
--- a/spec/classes/fpm/php_fpm_5_6_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_6_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.6.2")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_6_3_spec.rb b/spec/classes/fpm/php_fpm_5_6_3_spec.rb
deleted file mode 100644
index 1908566..0000000
--- a/spec/classes/fpm/php_fpm_5_6_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_6_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.6.3")
-  end
-end
diff --git a/spec/classes/fpm/php_fpm_5_6_4_spec.rb b/spec/classes/fpm/php_fpm_5_6_4_spec.rb
deleted file mode 100644
index 9e6042f..0000000
--- a/spec/classes/fpm/php_fpm_5_6_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::fpm::5_6_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__fpm("5.6.4")
-  end
-end
diff --git a/spec/classes/php_5_3_10_spec.rb b/spec/classes/php_5_3_10_spec.rb
deleted file mode 100644
index d0cce59..0000000
--- a/spec/classes/php_5_3_10_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_10" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.10")
-  end
-end
diff --git a/spec/classes/php_5_3_11_spec.rb b/spec/classes/php_5_3_11_spec.rb
deleted file mode 100644
index d3b3bfa..0000000
--- a/spec/classes/php_5_3_11_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_11" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.11")
-  end
-end
diff --git a/spec/classes/php_5_3_12_spec.rb b/spec/classes/php_5_3_12_spec.rb
deleted file mode 100644
index 9790e71..0000000
--- a/spec/classes/php_5_3_12_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_12" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.12")
-  end
-end
diff --git a/spec/classes/php_5_3_13_spec.rb b/spec/classes/php_5_3_13_spec.rb
deleted file mode 100644
index f3d3946..0000000
--- a/spec/classes/php_5_3_13_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_13" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.13")
-  end
-end
diff --git a/spec/classes/php_5_3_14_spec.rb b/spec/classes/php_5_3_14_spec.rb
deleted file mode 100644
index f780be4..0000000
--- a/spec/classes/php_5_3_14_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_14" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.14")
-  end
-end
diff --git a/spec/classes/php_5_3_15_spec.rb b/spec/classes/php_5_3_15_spec.rb
deleted file mode 100644
index d95ff3d..0000000
--- a/spec/classes/php_5_3_15_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_15" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.15")
-  end
-end
diff --git a/spec/classes/php_5_3_16_spec.rb b/spec/classes/php_5_3_16_spec.rb
deleted file mode 100644
index 3a5ca56..0000000
--- a/spec/classes/php_5_3_16_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_16" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.16")
-  end
-end
diff --git a/spec/classes/php_5_3_17_spec.rb b/spec/classes/php_5_3_17_spec.rb
deleted file mode 100644
index c1c1065..0000000
--- a/spec/classes/php_5_3_17_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_17" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.17")
-  end
-end
diff --git a/spec/classes/php_5_3_18_spec.rb b/spec/classes/php_5_3_18_spec.rb
deleted file mode 100644
index 886a31d..0000000
--- a/spec/classes/php_5_3_18_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_18" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.18")
-  end
-end
diff --git a/spec/classes/php_5_3_19_spec.rb b/spec/classes/php_5_3_19_spec.rb
deleted file mode 100644
index ac048cd..0000000
--- a/spec/classes/php_5_3_19_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_19" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.19")
-  end
-end
diff --git a/spec/classes/php_5_3_20_spec.rb b/spec/classes/php_5_3_20_spec.rb
deleted file mode 100644
index f98628d..0000000
--- a/spec/classes/php_5_3_20_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_20" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.20")
-  end
-end
diff --git a/spec/classes/php_5_3_21_spec.rb b/spec/classes/php_5_3_21_spec.rb
deleted file mode 100644
index ad8517d..0000000
--- a/spec/classes/php_5_3_21_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_21" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.21")
-  end
-end
diff --git a/spec/classes/php_5_3_22_spec.rb b/spec/classes/php_5_3_22_spec.rb
deleted file mode 100644
index f07c71f..0000000
--- a/spec/classes/php_5_3_22_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_22" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.22")
-  end
-end
diff --git a/spec/classes/php_5_3_23_spec.rb b/spec/classes/php_5_3_23_spec.rb
deleted file mode 100644
index e6f3089..0000000
--- a/spec/classes/php_5_3_23_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_23" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.23")
-  end
-end
diff --git a/spec/classes/php_5_3_24_spec.rb b/spec/classes/php_5_3_24_spec.rb
deleted file mode 100644
index ec8fd51..0000000
--- a/spec/classes/php_5_3_24_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_24" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.24")
-  end
-end
diff --git a/spec/classes/php_5_3_25_spec.rb b/spec/classes/php_5_3_25_spec.rb
deleted file mode 100644
index a79faa6..0000000
--- a/spec/classes/php_5_3_25_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_25" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.25")
-  end
-end
diff --git a/spec/classes/php_5_3_26_spec.rb b/spec/classes/php_5_3_26_spec.rb
deleted file mode 100644
index 927d586..0000000
--- a/spec/classes/php_5_3_26_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_26" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.26")
-  end
-end
diff --git a/spec/classes/php_5_3_27_spec.rb b/spec/classes/php_5_3_27_spec.rb
deleted file mode 100644
index 9230fbb..0000000
--- a/spec/classes/php_5_3_27_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_27" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.27")
-  end
-end
diff --git a/spec/classes/php_5_3_28_spec.rb b/spec/classes/php_5_3_28_spec.rb
deleted file mode 100644
index 18ebc30..0000000
--- a/spec/classes/php_5_3_28_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_28" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.28")
-  end
-end
diff --git a/spec/classes/php_5_3_2_spec.rb b/spec/classes/php_5_3_2_spec.rb
deleted file mode 100644
index e865626..0000000
--- a/spec/classes/php_5_3_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.2")
-  end
-end
diff --git a/spec/classes/php_5_3_3_spec.rb b/spec/classes/php_5_3_3_spec.rb
deleted file mode 100644
index 4837a26..0000000
--- a/spec/classes/php_5_3_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.3")
-  end
-end
diff --git a/spec/classes/php_5_3_4_spec.rb b/spec/classes/php_5_3_4_spec.rb
deleted file mode 100644
index 790c388..0000000
--- a/spec/classes/php_5_3_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.4")
-  end
-end
diff --git a/spec/classes/php_5_3_5_spec.rb b/spec/classes/php_5_3_5_spec.rb
deleted file mode 100644
index ebad7cd..0000000
--- a/spec/classes/php_5_3_5_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.5")
-  end
-end
diff --git a/spec/classes/php_5_3_6_spec.rb b/spec/classes/php_5_3_6_spec.rb
deleted file mode 100644
index a950f7e..0000000
--- a/spec/classes/php_5_3_6_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.6")
-  end
-end
diff --git a/spec/classes/php_5_3_7_spec.rb b/spec/classes/php_5_3_7_spec.rb
deleted file mode 100644
index ef21ec0..0000000
--- a/spec/classes/php_5_3_7_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_7" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.7")
-  end
-end
diff --git a/spec/classes/php_5_3_8_spec.rb b/spec/classes/php_5_3_8_spec.rb
deleted file mode 100644
index 587d4af..0000000
--- a/spec/classes/php_5_3_8_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_8" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.8")
-  end
-end
diff --git a/spec/classes/php_5_3_9_spec.rb b/spec/classes/php_5_3_9_spec.rb
deleted file mode 100644
index 9b3a466..0000000
--- a/spec/classes/php_5_3_9_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3_9" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.3.9")
-  end
-end
diff --git a/spec/classes/php_5_3_spec.rb b/spec/classes/php_5_3_spec.rb
deleted file mode 100644
index 329ff93..0000000
--- a/spec/classes/php_5_3_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_class("php")
-    should contain_class("php::5_3_27")
-
-    should contain_file("/test/boxen/phpenv/versions/5.3").with({
-      :ensure => "symlink",
-      :force  => true,
-      :target => "/test/boxen/phpenv/versions/5.3.27"
-    })
-  end
-end
diff --git a/spec/classes/php_5_4_0_spec.rb b/spec/classes/php_5_4_0_spec.rb
deleted file mode 100644
index 406557f..0000000
--- a/spec/classes/php_5_4_0_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_0" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.0")
-  end
-end
diff --git a/spec/classes/php_5_4_10_spec.rb b/spec/classes/php_5_4_10_spec.rb
deleted file mode 100644
index f651aa1..0000000
--- a/spec/classes/php_5_4_10_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_10" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.10")
-  end
-end
diff --git a/spec/classes/php_5_4_11_spec.rb b/spec/classes/php_5_4_11_spec.rb
deleted file mode 100644
index a6c37e1..0000000
--- a/spec/classes/php_5_4_11_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_11" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.11")
-  end
-end
diff --git a/spec/classes/php_5_4_12_spec.rb b/spec/classes/php_5_4_12_spec.rb
deleted file mode 100644
index 42ee1a3..0000000
--- a/spec/classes/php_5_4_12_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_12" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.12")
-  end
-end
diff --git a/spec/classes/php_5_4_13_spec.rb b/spec/classes/php_5_4_13_spec.rb
deleted file mode 100644
index 0287cde..0000000
--- a/spec/classes/php_5_4_13_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_13" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.13")
-  end
-end
diff --git a/spec/classes/php_5_4_14_spec.rb b/spec/classes/php_5_4_14_spec.rb
deleted file mode 100644
index 40ddaf5..0000000
--- a/spec/classes/php_5_4_14_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_14" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.14")
-  end
-end
diff --git a/spec/classes/php_5_4_15_spec.rb b/spec/classes/php_5_4_15_spec.rb
deleted file mode 100644
index 653d367..0000000
--- a/spec/classes/php_5_4_15_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_15" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.15")
-  end
-end
diff --git a/spec/classes/php_5_4_16_spec.rb b/spec/classes/php_5_4_16_spec.rb
deleted file mode 100644
index 4d69728..0000000
--- a/spec/classes/php_5_4_16_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_16" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.16")
-  end
-end
diff --git a/spec/classes/php_5_4_17_spec.rb b/spec/classes/php_5_4_17_spec.rb
deleted file mode 100644
index 8cdf70f..0000000
--- a/spec/classes/php_5_4_17_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_17" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.17")
-  end
-end
diff --git a/spec/classes/php_5_4_18_spec.rb b/spec/classes/php_5_4_18_spec.rb
deleted file mode 100644
index 49fc71e..0000000
--- a/spec/classes/php_5_4_18_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_18" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.18")
-  end
-end
diff --git a/spec/classes/php_5_4_19_spec.rb b/spec/classes/php_5_4_19_spec.rb
deleted file mode 100644
index ea00af0..0000000
--- a/spec/classes/php_5_4_19_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_19" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.19")
-  end
-end
diff --git a/spec/classes/php_5_4_1_spec.rb b/spec/classes/php_5_4_1_spec.rb
deleted file mode 100644
index b54f40b..0000000
--- a/spec/classes/php_5_4_1_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_1" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.1")
-  end
-end
diff --git a/spec/classes/php_5_4_20_spec.rb b/spec/classes/php_5_4_20_spec.rb
deleted file mode 100644
index 92687c8..0000000
--- a/spec/classes/php_5_4_20_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_20" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.20")
-  end
-end
diff --git a/spec/classes/php_5_4_21_spec.rb b/spec/classes/php_5_4_21_spec.rb
deleted file mode 100644
index 69b4921..0000000
--- a/spec/classes/php_5_4_21_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_21" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.21")
-  end
-end
diff --git a/spec/classes/php_5_4_22_spec.rb b/spec/classes/php_5_4_22_spec.rb
deleted file mode 100644
index 4d25cbe..0000000
--- a/spec/classes/php_5_4_22_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_22" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.22")
-  end
-end
diff --git a/spec/classes/php_5_4_23_spec.rb b/spec/classes/php_5_4_23_spec.rb
deleted file mode 100644
index 6c19eb2..0000000
--- a/spec/classes/php_5_4_23_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_23" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.23")
-  end
-end
diff --git a/spec/classes/php_5_4_24_spec.rb b/spec/classes/php_5_4_24_spec.rb
deleted file mode 100644
index ddf19f1..0000000
--- a/spec/classes/php_5_4_24_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_24" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.24")
-  end
-end
diff --git a/spec/classes/php_5_4_25_spec.rb b/spec/classes/php_5_4_25_spec.rb
deleted file mode 100644
index 104e56e..0000000
--- a/spec/classes/php_5_4_25_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_25" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.25")
-  end
-end
diff --git a/spec/classes/php_5_4_26_spec.rb b/spec/classes/php_5_4_26_spec.rb
deleted file mode 100644
index 935c852..0000000
--- a/spec/classes/php_5_4_26_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_26" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.26")
-  end
-end
diff --git a/spec/classes/php_5_4_27_spec.rb b/spec/classes/php_5_4_27_spec.rb
deleted file mode 100644
index fc22ed8..0000000
--- a/spec/classes/php_5_4_27_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_27" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.27")
-  end
-end
diff --git a/spec/classes/php_5_4_28_spec.rb b/spec/classes/php_5_4_28_spec.rb
deleted file mode 100644
index 639b9df..0000000
--- a/spec/classes/php_5_4_28_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_28" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.28")
-  end
-end
diff --git a/spec/classes/php_5_4_29_spec.rb b/spec/classes/php_5_4_29_spec.rb
deleted file mode 100644
index 937d86f..0000000
--- a/spec/classes/php_5_4_29_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_29" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.29")
-  end
-end
diff --git a/spec/classes/php_5_4_2_spec.rb b/spec/classes/php_5_4_2_spec.rb
deleted file mode 100644
index 8998166..0000000
--- a/spec/classes/php_5_4_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.2")
-  end
-end
diff --git a/spec/classes/php_5_4_35_spec.rb b/spec/classes/php_5_4_35_spec.rb
deleted file mode 100644
index 38c39fd..0000000
--- a/spec/classes/php_5_4_35_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_35" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.35")
-  end
-end
diff --git a/spec/classes/php_5_4_36_spec.rb b/spec/classes/php_5_4_36_spec.rb
deleted file mode 100644
index df8aff9..0000000
--- a/spec/classes/php_5_4_36_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_36" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.36")
-  end
-end
diff --git a/spec/classes/php_5_4_3_spec.rb b/spec/classes/php_5_4_3_spec.rb
deleted file mode 100644
index 725a7b4..0000000
--- a/spec/classes/php_5_4_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.3")
-  end
-end
diff --git a/spec/classes/php_5_4_4_spec.rb b/spec/classes/php_5_4_4_spec.rb
deleted file mode 100644
index 4034ca8..0000000
--- a/spec/classes/php_5_4_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.4")
-  end
-end
diff --git a/spec/classes/php_5_4_5_spec.rb b/spec/classes/php_5_4_5_spec.rb
deleted file mode 100644
index a639a72..0000000
--- a/spec/classes/php_5_4_5_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.5")
-  end
-end
diff --git a/spec/classes/php_5_4_6_spec.rb b/spec/classes/php_5_4_6_spec.rb
deleted file mode 100644
index c39380e..0000000
--- a/spec/classes/php_5_4_6_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.6")
-  end
-end
diff --git a/spec/classes/php_5_4_7_spec.rb b/spec/classes/php_5_4_7_spec.rb
deleted file mode 100644
index 16ea96e..0000000
--- a/spec/classes/php_5_4_7_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_7" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.7")
-  end
-end
diff --git a/spec/classes/php_5_4_8_spec.rb b/spec/classes/php_5_4_8_spec.rb
deleted file mode 100644
index be884e7..0000000
--- a/spec/classes/php_5_4_8_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_8" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.8")
-  end
-end
diff --git a/spec/classes/php_5_4_9_spec.rb b/spec/classes/php_5_4_9_spec.rb
deleted file mode 100644
index 8e250d6..0000000
--- a/spec/classes/php_5_4_9_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4_9" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.4.9")
-  end
-end
diff --git a/spec/classes/php_5_4_spec.rb b/spec/classes/php_5_4_spec.rb
deleted file mode 100644
index ad52feb..0000000
--- a/spec/classes/php_5_4_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_class("php")
-    should contain_class("php::5_4_17")
-
-    should contain_file("/test/boxen/phpenv/versions/5.4").with({
-      :ensure => "symlink",
-      :force  => true,
-      :target => "/test/boxen/phpenv/versions/5.4.17"
-    })
-  end
-end
diff --git a/spec/classes/php_5_5_0_spec.rb b/spec/classes/php_5_5_0_spec.rb
deleted file mode 100644
index 12976d5..0000000
--- a/spec/classes/php_5_5_0_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_0" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.0")
-  end
-end
diff --git a/spec/classes/php_5_5_10_spec.rb b/spec/classes/php_5_5_10_spec.rb
deleted file mode 100644
index 0b94c07..0000000
--- a/spec/classes/php_5_5_10_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_10" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.10")
-  end
-end
diff --git a/spec/classes/php_5_5_11_spec.rb b/spec/classes/php_5_5_11_spec.rb
deleted file mode 100644
index 1288392..0000000
--- a/spec/classes/php_5_5_11_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_11" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.11")
-  end
-end
diff --git a/spec/classes/php_5_5_12_spec.rb b/spec/classes/php_5_5_12_spec.rb
deleted file mode 100644
index 43f806e..0000000
--- a/spec/classes/php_5_5_12_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_12" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.12")
-  end
-end
diff --git a/spec/classes/php_5_5_13_spec.rb b/spec/classes/php_5_5_13_spec.rb
deleted file mode 100644
index b7cecc3..0000000
--- a/spec/classes/php_5_5_13_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_13" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.13")
-  end
-end
diff --git a/spec/classes/php_5_5_18_spec.rb b/spec/classes/php_5_5_18_spec.rb
deleted file mode 100644
index f2f48ac..0000000
--- a/spec/classes/php_5_5_18_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_18" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.18")
-  end
-end
diff --git a/spec/classes/php_5_5_19_spec.rb b/spec/classes/php_5_5_19_spec.rb
deleted file mode 100644
index 75d76af..0000000
--- a/spec/classes/php_5_5_19_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_19" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.19")
-  end
-end
diff --git a/spec/classes/php_5_5_1_spec.rb b/spec/classes/php_5_5_1_spec.rb
deleted file mode 100644
index 7a21137..0000000
--- a/spec/classes/php_5_5_1_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_1" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.1")
-  end
-end
diff --git a/spec/classes/php_5_5_20_spec.rb b/spec/classes/php_5_5_20_spec.rb
deleted file mode 100644
index 26baf4e..0000000
--- a/spec/classes/php_5_5_20_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_20" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.20")
-  end
-end
diff --git a/spec/classes/php_5_5_2_spec.rb b/spec/classes/php_5_5_2_spec.rb
deleted file mode 100644
index ee2e333..0000000
--- a/spec/classes/php_5_5_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.2")
-  end
-end
diff --git a/spec/classes/php_5_5_3_spec.rb b/spec/classes/php_5_5_3_spec.rb
deleted file mode 100644
index 82460fb..0000000
--- a/spec/classes/php_5_5_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.3")
-  end
-end
diff --git a/spec/classes/php_5_5_4_spec.rb b/spec/classes/php_5_5_4_spec.rb
deleted file mode 100644
index 6d564b3..0000000
--- a/spec/classes/php_5_5_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.4")
-  end
-end
diff --git a/spec/classes/php_5_5_5_spec.rb b/spec/classes/php_5_5_5_spec.rb
deleted file mode 100644
index e86061b..0000000
--- a/spec/classes/php_5_5_5_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.5")
-  end
-end
diff --git a/spec/classes/php_5_5_6_spec.rb b/spec/classes/php_5_5_6_spec.rb
deleted file mode 100644
index e54a395..0000000
--- a/spec/classes/php_5_5_6_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.6")
-  end
-end
diff --git a/spec/classes/php_5_5_7_spec.rb b/spec/classes/php_5_5_7_spec.rb
deleted file mode 100644
index ca1d55c..0000000
--- a/spec/classes/php_5_5_7_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_7" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.7")
-  end
-end
diff --git a/spec/classes/php_5_5_8_spec.rb b/spec/classes/php_5_5_8_spec.rb
deleted file mode 100644
index 6bf9657..0000000
--- a/spec/classes/php_5_5_8_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_8" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.8")
-  end
-end
diff --git a/spec/classes/php_5_5_9_spec.rb b/spec/classes/php_5_5_9_spec.rb
deleted file mode 100644
index 4dde25f..0000000
--- a/spec/classes/php_5_5_9_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5_9" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.5.9")
-  end
-end
diff --git a/spec/classes/php_5_5_spec.rb b/spec/classes/php_5_5_spec.rb
deleted file mode 100644
index bef96f3..0000000
--- a/spec/classes/php_5_5_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_5" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_class("php")
-    should contain_class("php::5_5_0")
-
-    should contain_file("/test/boxen/phpenv/versions/5.5").with({
-      :ensure => "symlink",
-      :force  => true,
-      :target => "/test/boxen/phpenv/versions/5.5.0"
-    })
-  end
-end
diff --git a/spec/classes/php_5_6_0_spec.rb b/spec/classes/php_5_6_0_spec.rb
deleted file mode 100644
index 55ff16c..0000000
--- a/spec/classes/php_5_6_0_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_6_0" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.6.0")
-  end
-end
diff --git a/spec/classes/php_5_6_1_spec.rb b/spec/classes/php_5_6_1_spec.rb
deleted file mode 100644
index 590c432..0000000
--- a/spec/classes/php_5_6_1_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_6_1" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.6.1")
-  end
-end
diff --git a/spec/classes/php_5_6_2_spec.rb b/spec/classes/php_5_6_2_spec.rb
deleted file mode 100644
index 9a4cbe2..0000000
--- a/spec/classes/php_5_6_2_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_6_2" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.6.2")
-  end
-end
diff --git a/spec/classes/php_5_6_3_spec.rb b/spec/classes/php_5_6_3_spec.rb
deleted file mode 100644
index 0e47af2..0000000
--- a/spec/classes/php_5_6_3_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_6_3" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.6.3")
-  end
-end
diff --git a/spec/classes/php_5_6_4_spec.rb b/spec/classes/php_5_6_4_spec.rb
deleted file mode 100644
index 44a41ac..0000000
--- a/spec/classes/php_5_6_4_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_6_4" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_php__version("5.6.4")
-  end
-end
diff --git a/spec/classes/php_5_6_spec.rb b/spec/classes/php_5_6_spec.rb
deleted file mode 100644
index aded60e..0000000
--- a/spec/classes/php_5_6_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe "php::5_6" do
-  let(:facts) { default_test_facts }
-
-  it do
-    should contain_class("php")
-    should contain_class("php::5_6_0")
-
-    should contain_file("/test/boxen/phpenv/versions/5.6").with({
-      :ensure => "symlink",
-      :force  => true,
-      :target => "/test/boxen/phpenv/versions/5.6.0"
-    })
-  end
-end
diff --git a/spec/defines/fpm/php_fpm_pool_spec.rb b/spec/defines/fpm/php_fpm_pool_spec.rb
index d4c2289..9cc0b0c 100644
--- a/spec/defines/fpm/php_fpm_pool_spec.rb
+++ b/spec/defines/fpm/php_fpm_pool_spec.rb
@@ -15,7 +15,7 @@
 
     it do
       should contain_class("php::config")
-      should contain_class("php::fpm::5_4_17")
+      should contain_php__fpm("5.4.17")
 
       should contain_file("/test/boxen/config/php/5.4.17/pool.d/5_4_17_for_test.conf").with({
         :content => File.read("spec/fixtures/php-fpm-pool-custom.conf"),
diff --git a/spec/lib/puppet/parser/functions/php_fpm_require_spec.rb b/spec/lib/puppet/parser/functions/php_fpm_require_spec.rb
new file mode 100644
index 0000000..f861b8b
--- /dev/null
+++ b/spec/lib/puppet/parser/functions/php_fpm_require_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "the php_fpm_require function" do
+  before :all do
+    Puppet::Parser::Functions.autoloader.loadall
+  end
+
+  it "should exist" do
+    Puppet::Parser::Functions.function("php_fpm_require").should == "function_php_fpm_require"
+  end
+end

From ff55f33b731f28b4d6c7463de86ea1eef513ba58 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 13 Jan 2015 15:23:14 +1100
Subject: [PATCH 49/57] Patch version, not minor version.

---
 manifests/version.pp | 62 ++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index 837a9c5..127fb08 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -24,40 +24,40 @@
 
   # Specify secure version if no minor point specified
   if $version == '5' {
-    $minor_version = $secure_5_6
+    $patch_version = $secure_5_6
   } elsif $version == '5.6' {
-    $minor_version = $secure_5_6
+    $patch_version = $secure_5_6
   } elsif $version == '5.5' {
-    $minor_version = $secure_5_5
+    $patch_version = $secure_5_5
   } elsif $version == '5.4' {
-    $minor_version = $secure_5_4
+    $patch_version = $secure_5_4
   } else {
-    $minor_version = $version
+    $patch_version = $version
   }
 
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
-  if versioncmp($minor_version, '5.6') >= 0 and versioncmp($minor_version, $secure_5_6) < 0 {
-    warning("You are installing PHP ${minor_version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
+  if versioncmp($patch_version, '5.6') >= 0 and versioncmp($patch_version, $secure_5_6) < 0 {
+    warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
   }
 
   # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
-  if versioncmp($minor_version, '5.5') >= 0 and versioncmp($minor_version, $secure_5_5) < 0 {
-    warning("You are installing PHP ${minor_version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
+  if versioncmp($patch_version, '5.5') >= 0 and versioncmp($patch_version, $secure_5_5) < 0 {
+    warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
   }
 
   # Version is less than the minimum secure version
-  if versioncmp($minor_version, $secure_5_4) < 0 {
-    warning("You are installing PHP ${minor_version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
+  if versioncmp($patch_version, $secure_5_4) < 0 {
+    warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
   }
 
   # Install location
-  $dest = "${php::config::root}/versions/${minor_version}"
+  $dest = "${php::config::root}/versions/${patch_version}"
 
   # Log locations
-  $error_log = "${php::config::logdir}/${minor_version}.error.log"
+  $error_log = "${php::config::logdir}/${patch_version}.error.log"
 
   # Config locations
-  $version_config_root  = "${php::config::configdir}/${minor_version}"
+  $version_config_root  = "${php::config::configdir}/${patch_version}"
   $php_ini              = "${version_config_root}/php.ini"
   $conf_d               = "${version_config_root}/conf.d"
 
@@ -65,14 +65,14 @@
   $module_dir = "${dest}/modules"
 
   # Data directory for this version
-  $version_data_root = "${php::config::datadir}/${minor_version}"
+  $version_data_root = "${php::config::datadir}/${patch_version}"
 
   if $ensure == 'absent' {
 
     # If we're nuking a version of PHP also ensure we shut down
     # and get rid of the PHP FPM Service & config
 
-    php::fpm { $minor_version:
+    php::fpm { $patch_version:
       ensure => 'absent'
     }
 
@@ -108,7 +108,7 @@
     # Ensure module dir is created for extensions AFTER php is installed
     file { $module_dir:
       ensure  => directory,
-      require => Php_version[$minor_version],
+      require => Php_version[$patch_version],
     }
 
     # Set up config files
@@ -127,15 +127,15 @@
 
     # Get any additional configure params
     $test_params = $php::config::configure_params
-    if is_hash($test_params) and has_key($test_params, $minor_version) {
-      $configure_params = $test_params[$minor_version]
+    if is_hash($test_params) and has_key($test_params, $patch_version) {
+      $configure_params = $test_params[$patch_version]
     }
 
-    php_version { $minor_version:
+    php_version { $patch_version:
       user              => $::boxen_user,
       user_home         => "/Users/${::boxen_user}",
       phpenv_root       => $php::config::root,
-      version           => $minor_version,
+      version           => $patch_version,
       homebrew_path     => $boxen::config::homebrewdir,
       require           => [
         Repository["${php::config::root}/php-src"],
@@ -150,7 +150,7 @@
         Package['autoconf'],
         Package['boxen/brews/autoconf213'],
       ],
-      notify            => Exec["phpenv-rehash-post-install-${minor_version}"],
+      notify            => Exec["phpenv-rehash-post-install-${patch_version}"],
       configure_params  => $configure_params,
     }
 
@@ -160,13 +160,13 @@
       owner   => $::boxen_user,
       group   => 'staff',
       recurse => true,
-      require => Php_version[$minor_version],
+      require => Php_version[$patch_version],
     }
 
     # Rehash phpenv shims when a new version is installed
-    exec { "phpenv-rehash-post-install-${minor_version}":
+    exec { "phpenv-rehash-post-install-${patch_version}":
       command     => "/bin/rm -rf ${php::config::root}/shims && PHPENV_ROOT=${php::config::root} ${php::config::root}/bin/phpenv rehash",
-      require     => Php_version[$minor_version],
+      require     => Php_version[$patch_version],
       refreshonly => true,
     }
 
@@ -179,31 +179,31 @@
     }
 
     # Set cache_dir for PEAR
-    exec { "pear-${minor_version}-cache_dir":
+    exec { "pear-${patch_version}-cache_dir":
       command => "${dest}/bin/pear config-set cache_dir ${php::config::datadir}/pear",
       unless  => "${dest}/bin/pear config-get cache_dir | grep -i ${php::config::datadir}/pear",
       require => [
-        Php_version[$minor_version],
+        Php_version[$patch_version],
         File["${php::config::datadir}/pear"],
       ],
     }
 
     # Set download_dir for PEAR
-    exec { "pear-${minor_version}-download_dir":
+    exec { "pear-${patch_version}-download_dir":
       command => "${dest}/bin/pear config-set download_dir ${php::config::datadir}/pear",
       unless  => "${dest}/bin/pear config-get download_dir | grep -i ${php::config::datadir}/pear",
       require => [
-        Php_version[$minor_version],
+        Php_version[$patch_version],
         File["${php::config::datadir}/pear"],
       ],
     }
 
     # Set temp_dir for PEAR
-    exec { "pear-${minor_version}-temp_dir":
+    exec { "pear-${patch_version}-temp_dir":
       command => "${dest}/bin/pear config-set temp_dir ${php::config::datadir}/pear",
       unless  => "${dest}/bin/pear config-get temp_dir | grep -i ${php::config::datadir}/pear",
       require => [
-        Php_version[$minor_version],
+        Php_version[$patch_version],
         File["${php::config::datadir}/pear"],
       ],
     }

From 5de6327d57ee078ab5b8375d25daae4ef5f4e75c Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 13 Jan 2015 15:39:40 +1100
Subject: [PATCH 50/57] Add secure version support to PHP::FPM

---
 data/common.yaml              |  4 +++
 manifests/config.pp           |  2 ++
 manifests/fpm.pp              | 52 +++++++++++++++++++++--------------
 manifests/global.pp           |  4 +--
 manifests/version.pp          | 12 ++------
 spec/fixtures/hiera/test.yaml |  4 +++
 6 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 6db19f5..2f51698 100644
--- a/data/common.yaml
+++ b/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.4'
+  '5.5': '5.5.20'
+  '5.4': '5.4.36'
diff --git a/manifests/config.pp b/manifests/config.pp
index 36eda48..37e2cea 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -15,6 +15,7 @@
   $configure_params   = undef,
   $composer           = undef,
   $phpenv             = undef,
+  $secure_versions    = undef,
 ) {
   include boxen::config
 
@@ -32,5 +33,6 @@
     $configure_params,
     $composer,
     $phpenv,
+    $secure_versions,
   )
 }
diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index a827b70..6d5ae6d 100644
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -4,39 +4,51 @@
 #
 #     php::fpm { '5.4.10': }
 #
-# You'll probably be better off using a specific fpm class as this
-# will allow the class to be defined multiple times. For example if
-# you're defining it within a project. eg:
-#
-#     include php::fpm::5_4_10
-#
 define php::fpm(
   $ensure  = present,
   $version = $name,
 ){
   require php::config
 
+  # Current supported and secure versions
+  $secure_5_6 = $php::config::secure_versions['5.6']
+  $secure_5_5 = $php::config::secure_versions['5.5']
+  $secure_5_4 = $php::config::secure_versions['5.4']
+
+  # Specify secure version if no minor point specified
+  if $version == '5' {
+    $patch_version = $secure_5_6
+  } elsif $version == '5.6' {
+    $patch_version = $secure_5_6
+  } elsif $version == '5.5' {
+    $patch_version = $secure_5_5
+  } elsif $version == '5.4' {
+    $patch_version = $secure_5_4
+  } else {
+    $patch_version = $version
+  }
+
   # Config file locations
-  $version_config_root = "${php::config::configdir}/${version}"
+  $version_config_root = "${php::config::configdir}/${patch_version}"
   $fpm_config          = "${version_config_root}/php-fpm.conf"
   $fpm_pool_config_dir = "${version_config_root}/pool.d"
-  $pid_file            = "${php::config::datadir}/${version}.pid"
+  $pid_file            = "${php::config::datadir}/${patch_version}.pid"
 
   # Log files
-  $error_log = "${php::config::logdir}/${version}.fpm.error.log"
+  $error_log = "${php::config::logdir}/${patch_version}.fpm.error.log"
 
   if $ensure == present {
-    # Require php version eg. php::5_4_10
+    # Require php version eg. php::version { '5_4_10': }
     # This will compile, install and set up config dirs if not present
-    php_require($version)
+    php_require($patch_version)
 
     # FPM Binary
-    $bin = "${php::config::root}/versions/${version}/sbin/php-fpm"
+    $bin = "${php::config::root}/versions/${patch_version}/sbin/php-fpm"
 
     # Set up FPM config
     file { $fpm_config:
       content => template('php/php-fpm.conf.erb'),
-      notify  => Php::Fpm::Service[$version],
+      notify  => Php::Fpm::Service[$patch_version],
     }
 
     # Set up FPM Pool config directory
@@ -50,8 +62,8 @@
 
     # Create a default pool, as FPM won't start without one
     # Listen on a fake socket for now
-    $pool_name    = $version
-    $socket_path  = "${boxen::config::socketdir}/${version}"
+    $pool_name    = $patch_version
+    $socket_path  = "${boxen::config::socketdir}/${patch_version}"
     $pm           = 'static'
     $max_children = 1
 
@@ -60,15 +72,15 @@
     $min_spare_servers = 1
     $max_spare_servers = 1
 
-    file { "${fpm_pool_config_dir}/${version}.conf":
+    file { "${fpm_pool_config_dir}/${patch_version}.conf":
       content => template('php/php-fpm-pool.conf.erb'),
     }
 
     # Launch our FPM Service
 
-    php::fpm::service{ $version:
+    php::fpm::service{ $patch_version:
       ensure    => running,
-      subscribe => File["${fpm_pool_config_dir}/${version}.conf"],
+      subscribe => File["${fpm_pool_config_dir}/${patch_version}.conf"],
     }
 
   } else {
@@ -81,10 +93,10 @@
         $fpm_pool_config_dir,
       ]:
       ensure  => absent,
-      require => Php::Fpm::Service[$version],
+      require => Php::Fpm::Service[$patch_version],
     }
 
-    php::fpm::service{ $version:
+    php::fpm::service{ $patch_version:
       ensure => absent,
     }
   }
diff --git a/manifests/global.pp b/manifests/global.pp
index c417aac..32b9b31 100644
--- a/manifests/global.pp
+++ b/manifests/global.pp
@@ -7,9 +7,9 @@
 class php::global($version = undef) {
   include php::config
 
-  # Default to HEAD 5.4 version if not specified
+  # Default to latest version of PHP 5 if not specified
   $php_version = $version ? {
-    undef   => 5.4,
+    undef   => 5,
     default => $version
   }
 
diff --git a/manifests/version.pp b/manifests/version.pp
index 127fb08..ee7de47 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -4,12 +4,6 @@
 #
 #     php::version { '5.3.20': }
 #
-# There are a number of predefined classes which can be used rather than
-# using this class directly, which allows the class to be defined multiple
-# times - eg. if you define it within multiple projects. For example:
-#
-#     include php::5_3_20
-#
 define php::version(
   $ensure   = 'installed',
   $version  = $name
@@ -18,9 +12,9 @@
   include mysql::config
 
   # Current supported and secure versions
-  $secure_5_6 = '5.6.4'
-  $secure_5_5 = '5.5.20'
-  $secure_5_4 = '5.4.36'
+  $secure_5_6 = $php::config::secure_versions['5.6']
+  $secure_5_5 = $php::config::secure_versions['5.5']
+  $secure_5_4 = $php::config::secure_versions['5.4']
 
   # Specify secure version if no minor point specified
   if $version == '5' {
diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
index 5876257..47c2df3 100644
--- a/spec/fixtures/hiera/test.yaml
+++ b/spec/fixtures/hiera/test.yaml
@@ -12,3 +12,7 @@ php::config::composer:
   checksum: '05df355b5277c8c9012470e699fa5494'
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
+php::config::secure_versions:
+  '5.6': '5.6.4'
+  '5.5': '5.5.20'
+  '5.4': '5.4.36'

From 1839f5415d43672e7ca897c388b5bc04dc1aed26 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 23 Jan 2015 12:27:39 +1100
Subject: [PATCH 51/57] Bump secure version of 5.6 to 5.6.5

---
 data/common.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/common.yaml b/data/common.yaml
index 2f51698..ac74be0 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -13,6 +13,6 @@ php::config::composer:
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.4'
+  '5.6': '5.6.5'
   '5.5': '5.5.20'
   '5.4': '5.4.36'

From 3c203d48b257761bf2989af372b701b5ea96edca Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 27 Jan 2015 10:41:42 +1100
Subject: [PATCH 52/57] Update CHANGELOG, bump secure PHP versions.

---
 CHANGELOG.md     | 67 ++++++++++++++++++++++++++++++++++++++++++++++++
 data/common.yaml |  4 +--
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf6c39a..739f91b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,70 @@
+## 2.0.0 ##
+
+* Use Hiera for configs
+* Allow configure params on PHP builds
+* Add PThreads extension
+* Update cardboard to 2.1.0 and update tests
+* Add support for PHP 5.6+
+* Add insecure PHP version warnings
+* Make Composer version configurable
+* Remove version specific PHP classes
+
+## 1.2.6 ##
+
+* Fix autoconf 2.13 sandboxing
+
+## 1.2.5 ##
+
+* Sandbox autoconf213 to fix some installation conflicts
+* Set the PECL provider to default on darwin for PHP extensions (this can be overridden)
+* Increase `pm.max_children` to 10 for PHP-FPM pools (@gblair)
+
+## 1.2.4 ##
+
+* Fixes compilation of PHP versions > 5.4.17 due to a break in Bison compatibility (@webflo!)
+
+## 1.2.3 ##
+
+* Add xhprof extension (@webflo)
+* Add latest versions of PHP 5.4 and 5.5 (@webflo)
+
+## 1.2.2 ##
+
+* Change default .ini settings to increase timeouts, memory limits etc.
+
+## 1.2.1 ##
+
+* Bump Composer to latest 1.0.0-alpha8 (@webbj74)
+
+## 1.2.0 ##
+
+* Adds PHP 5.5 support! This requires a later version of Bison to compile, which is installed as a sandboxed package.
+* Adds additional minor versions of PHP for 5.3 and 5.4
+* Use ensure_packages from the stdlib to improve module compatibility (thanks @jameydeorio)
+* Fixes specs, and added Github API token to travis so builds actually work again
+
+## 1.1.5 ##
+
+* Add OAuth extension (@dbtlr)
+* Fix HTTP extension bug including zookeeper (@dbtlr)
+* Add Mongo extension (@eebs)
+* Fix compilation bug caused by Freetype and GD incompatibilities (@eebs!)
+
+## 1.1.4 ##
+
+* Add memcache PHP extension (@poppen)
+* Add pdo_pgsql PHP extension (@poppen)
+
+## 1.1.3 ##
+
+* Added support for Composer see the readme for usage.
+* Module now has test specs (hooray!), please run script/cibuild before making a pull request.
+* Fixes to bugs the specs caught
+
+## 1.1.2 ##
+
+* Increase xdebug `max_nesting_level`
+
 ## 1.1.1 ##
 
 * Remove `libpng` package, add dependency on `libpng` module
diff --git a/data/common.yaml b/data/common.yaml
index ac74be0..a384303 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -14,5 +14,5 @@ php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
   '5.6': '5.6.5'
-  '5.5': '5.5.20'
-  '5.4': '5.4.36'
+  '5.5': '5.5.21'
+  '5.4': '5.4.37'

From e05ad112e1189b24dbb25933bc84db17af97b6be Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 27 Jan 2015 11:04:00 +1100
Subject: [PATCH 53/57] Add toggle to PHP insecure version warnings, add
 upgrade instructions

---
 CHANGELOG.md         |  2 +-
 README.md            | 14 ++++++++++++--
 data/common.yaml     |  1 +
 manifests/config.pp  |  5 +++++
 manifests/version.pp |  6 +++---
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 739f91b..7df4f2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 * Add support for PHP 5.6+
 * Add insecure PHP version warnings
 * Make Composer version configurable
-* Remove version specific PHP classes
+* Remove version specific PHP classes allowing arbitrary PHP versions
 
 ## 1.2.6 ##
 
diff --git a/README.md b/README.md
index 5246735..7b055fd 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ A sample PHP project manifest is provided in `manifests/project.pp` which will r
 
 A simple project manifest example:
 
-````puppet
+```puppet
 # your-boxen/modules/projects/manifests/trollin.pp
 
 class projects::trollin {
@@ -93,10 +93,20 @@ class projects::trollin {
     php           => '5.3.23',
   }
 }
-````
+```
 
 With the above, as long as our app is configured to listen to requests at `www/index.php` we can visit [http://trollin.dev/](http://trollin.dev/) to access the app.
 
 In the background this is installing PHP 5.3.23, creating a PHP-FPM service for 5.3.23, and a FPM pool for this project which runs within the FPM service. This then listens on an nginx socket at "#{ENV['BOXEN_SOCKET_DIR']}"/trollin.
 
 The example nginx host template at `templates/nginx/nginx.conf.erb` is also a sample configuration which can be copied to your main boxen module and the nginx template path above altered to match this. This is set up with a basic PHP structure, and Fastcgi params to pass the expected variables from Nginx to PHP-FPM.
+
+## Upgrading to version 2.X.X from version 1.X.X
+
+The old PHP version classes are removed completely in version 2.
+
+You will need to change any code in your manifests like `include PHP::5_X_X` to the version 2 equivalent `php::version { 5.X.X: }`
+
+All other classes remain unchanged in syntax, and should "just work".
+
+This module will now warn you if you are running an insecure version of PHP when you run Boxen.
diff --git a/data/common.yaml b/data/common.yaml
index a384303..0934a50 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -16,3 +16,4 @@ php::config::secure_versions:
   '5.6': '5.6.5'
   '5.5': '5.5.21'
   '5.4': '5.4.37'
+php::config::secure_warning:    true
diff --git a/manifests/config.pp b/manifests/config.pp
index 37e2cea..c55a6a2 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -16,6 +16,7 @@
   $composer           = undef,
   $phpenv             = undef,
   $secure_versions    = undef,
+  $secure_warning     = undef,
 ) {
   include boxen::config
 
@@ -35,4 +36,8 @@
     $phpenv,
     $secure_versions,
   )
+
+  validate_bool(
+    $secure_warning,
+  )
 }
diff --git a/manifests/version.pp b/manifests/version.pp
index ee7de47..1eff4dc 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -30,17 +30,17 @@
   }
 
   # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version
-  if versioncmp($patch_version, '5.6') >= 0 and versioncmp($patch_version, $secure_5_6) < 0 {
+  if $php::config::secure_warning and versioncmp($patch_version, '5.6') >= 0 and versioncmp($patch_version, $secure_5_6) < 0 {
     warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}")
   }
 
   # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version
-  if versioncmp($patch_version, '5.5') >= 0 and versioncmp($patch_version, $secure_5_5) < 0 {
+  if $php::config::secure_warning and versioncmp($patch_version, '5.5') >= 0 and versioncmp($patch_version, $secure_5_5) < 0 {
     warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}")
   }
 
   # Version is less than the minimum secure version
-  if versioncmp($patch_version, $secure_5_4) < 0 {
+  if $php::config::secure_warning and versioncmp($patch_version, $secure_5_4) < 0 {
     warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}")
   }
 

From 823afb927494567ef5a5aab808070c480cf09ca2 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Tue, 27 Jan 2015 11:06:15 +1100
Subject: [PATCH 54/57] Update test hiera config

---
 spec/fixtures/hiera/test.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
index 47c2df3..eee8565 100644
--- a/spec/fixtures/hiera/test.yaml
+++ b/spec/fixtures/hiera/test.yaml
@@ -13,6 +13,7 @@ php::config::composer:
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.4'
-  '5.5': '5.5.20'
-  '5.4': '5.4.36'
+  '5.6': '5.6.5'
+  '5.5': '5.5.21'
+  '5.4': '5.4.37'
+php::config::secure_warning: true

From 1c2ed619db17bc5036575a42bd1d5f6ca892c14a Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Fri, 20 Feb 2015 21:53:50 +1100
Subject: [PATCH 55/57] Bump safe PHP versions.

---
 data/common.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 0934a50..3e59103 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -13,7 +13,7 @@ php::config::composer:
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.5'
-  '5.5': '5.5.21'
-  '5.4': '5.4.37'
+  '5.6': '5.6.6'
+  '5.5': '5.5.22'
+  '5.4': '5.4.38'
 php::config::secure_warning:    true

From f6a8d6e8e60d01d80f67e9e9e12986670491dfad Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Sat, 21 Mar 2015 11:42:02 +1100
Subject: [PATCH 56/57] Bump secure PHP versions

---
 data/common.yaml              |  6 +++---
 spec/fixtures/hiera/test.yaml | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 3e59103..0d2d5ae 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -13,7 +13,7 @@ php::config::composer:
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.6'
-  '5.5': '5.5.22'
-  '5.4': '5.4.38'
+  '5.6': '5.6.7'
+  '5.5': '5.5.23'
+  '5.4': '5.4.39'
 php::config::secure_warning:    true
diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml
index eee8565..4084a6e 100644
--- a/spec/fixtures/hiera/test.yaml
+++ b/spec/fixtures/hiera/test.yaml
@@ -1,19 +1,19 @@
 ---
-php::config::root: "/test/boxen/phpenv"
-php::config::logdir: "/test/boxen/log/php"
-php::config::configdir: "/test/boxen/config/php"
-php::config::datadir: "/test/boxen/data/php"
-php::config::pluginsdir: "/test/boxen/phpenv/plugins"
-php::config::cachedir: "/test/boxen/data/php/cache"
+php::config::root:              "/test/boxen/phpenv"
+php::config::logdir:            "/test/boxen/log/php"
+php::config::configdir:         "/test/boxen/config/php"
+php::config::datadir:           "/test/boxen/data/php"
+php::config::pluginsdir:        "/test/boxen/phpenv/plugins"
+php::config::cachedir:          "/test/boxen/data/php/cache"
 php::config::extensioncachedir: "/test/boxen/data/php/cache/extensions"
-php::config::configure_params: {}
+php::config::configure_params:  {}
 php::config::composer:
   version:  '1.0.0-alpha9'
   checksum: '05df355b5277c8c9012470e699fa5494'
 php::config::phpenv:
   revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
 php::config::secure_versions:
-  '5.6': '5.6.5'
-  '5.5': '5.5.21'
-  '5.4': '5.4.37'
-php::config::secure_warning: true
+  '5.6': '5.6.7'
+  '5.5': '5.5.23'
+  '5.4': '5.4.39'
+php::config::secure_warning:    true

From a071083def6e73c67e56c8916c6eae0407eb63e5 Mon Sep 17 00:00:00 2001
From: Sam Bauers <sam@redant.com.au>
Date: Wed, 22 Apr 2015 14:49:50 +1000
Subject: [PATCH 57/57] Bump secure PHP version numbers.

---
 data/common.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 0d2d5ae..7b5984b 100644
--- a/data/common.yaml
+++ b/data/common.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.8'
+  '5.5': '5.5.24'
+  '5.4': '5.4.40'
 php::config::secure_warning:    true