Revert f0ca67c

Author: jippi

examples/init.pp

@@ -1,5 +1,10 @@
 include php
 
+class {
+  'php::pear':
+    ensure => installed;
+}
+
 package { 'pear.phpunit.de/PHPUnit':
   ensure   => present,
   provider => pear,

manifests/apache.pp

@@ -45,22 +45,21 @@
   $provider = $php::apache::params::provider,
   $inifile  = $php::apache::params::inifile,
   $settings = $php::apache::params::settings
-) {
-  include php::apache::params
+) inherits php::apache::params {
 
   php::contrib::base_package { 'apache':
-    ensure    => $ensure,
-    provider  => $provider;
+    ensure   => $ensure,
+    provider => $provider;
   }
 
   package { $package:
-    ensure    => $ensure,
-    provider  => $provider;
+    ensure   => $ensure,
+    provider => $provider;
   }
 
   php::config { 'php-apache':
-    inifile   => $inifile,
-    settings  => $settings
+    inifile  => $inifile,
+    settings => $settings
   }
 
 }

manifests/cli.pp

@@ -44,22 +44,21 @@
   $provider = $php::cli::params::provider,
   $inifile  = $php::cli::params::inifile,
   $settings = $php::cli::params::settings
-) {
-  include php::cli::params
+) inherits php::cli::params {
 
   php::contrib::base_package { 'cli':
-    ensure    => $ensure,
-    provider  => $provider;
+  	ensure   => $ensure,
+  	provider => $provider;
   }
 
   package { $package:
-    ensure    => $ensure,
-    provider  => $provider;
+    ensure	 => $ensure,
+    provider => $provider;
   }
 
   php::config { 'php-cli':
-    inifile   => $inifile,
-    settings  => $settings
+    inifile  => $inifile,
+    settings => $settings
   }
 
 }

manifests/contrib/base_package.pp

@@ -31,11 +31,11 @@
   $provider
 ) {
 
-  if !defined(Package['php5']) {
-    package { 'php5':
-      ensure    => $ensure,
-      provider  => $provider
-    }
-  }
+	if !defined(Package['php5']) {
+		package { 'php5':
+			ensure 	 => $ensure,
+			provider => $provider
+		}
+	}
 
 }

manifests/dev.pp

@@ -37,17 +37,16 @@
   $ensure   = $php::dev::params::ensure,
   $package  = $php::dev::params::package,
   $provider = $php::dev::params::provider
-) {
-  include php::dev::params
+) inherits php::dev::params {
 
   php::contrib::base_package { 'dev':
-    ensure    => $ensure,
-    provider  => $provider;
+    ensure  => $ensure,
+    provider => $provider;
   }
 
   package { $package:
-    ensure    => $ensure,
-    provider  => $provider;
+    ensure	 => $ensure,
+    provider => $provider;
   }
 
 }

manifests/dev/params.pp

@@ -35,6 +35,6 @@
 
   $ensure   = $php::params::ensure
   $package  = 'php5-dev'
-  $provider = undef
+  $provider	= undef
 
 }

manifests/extension/apc.pp

@@ -44,8 +44,7 @@
   $provider = $php::extension::apc::params::provider,
   $inifile  = $php::extension::apc::params::inifile,
   $settings = $php::extension::apc::params::settings
-) {
-  include php::extension::apc::params
+) inherits php::extension::apc::params {
 
   php::extension { 'apc':
     ensure   => $ensure,

manifests/extension/curl.pp

@@ -44,8 +44,7 @@
   $provider = $php::extension::curl::params::provider,
   $inifile  = $php::extension::curl::params::inifile,
   $settings = $php::extension::curl::params::settings
-) {
-  include php::extension::curl::params
+) inherits php::extension::curl::params {
 
   php::extension { 'curl':
     ensure   => $ensure,

manifests/extension/gd.pp

@@ -44,8 +44,7 @@
   $provider = $php::extension::gd::params::provider,
   $inifile  = $php::extension::gd::params::inifile,
   $settings = $php::extension::gd::params::settings
-) {
-  include php::extension::gd::params
+) inherits php::extension::gd::params {
 
   php::extension { 'gd':
     ensure   => $ensure,

manifests/extension/gearman.pp

@@ -39,15 +39,14 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::gearman(
-  $ensure   = $php::extension::gearman::params::ensure,
+	$ensure   = $php::extension::gearman::params::ensure,
   $package  = $php::extension::gearman::params::package,
   $provider = $php::extension::gearman::params::provider,
   $inifile  = $php::extension::gearman::params::inifile,
   $settings = $php::extension::gearman::params::settings
-) {
-  include php::extension::gearman::params
+) inherits php::extension::gearman::params {
 
-  php::extension { 'gearman':
+	php::extension { 'gearman':
     ensure   => $ensure,
     package  => $package,
     provider => $provider

manifests/extension/http.pp

@@ -39,21 +39,20 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::http(
-  $ensure   = $php::extension::http::params::ensure,
+	$ensure  	= $php::extension::http::params::ensure,
   $package  = $php::extension::http::params::package,
   $provider = $php::extension::http::params::provider,
   $inifile  = $php::extension::http::params::inifile,
   $settings = $php::extension::http::params::settings
-) {
-  include php::extension::http::params
+) inherits php::extension::http::params {
 
   php::extension { 'http':
     ensure   => $ensure,
     package  => $package,
     provider => $provider;
   }
 
-  php::config { 'php-extension-http':
+ php::config { 'php-extension-http':
     inifile  => $inifile,
     settings => $settings;
   }

manifests/extension/igbinary.pp

@@ -39,18 +39,17 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::igbinary(
-  $ensure   = $php::extension::igbinary::params::ensure,
-  $package  = $php::extension::igbinary::params::package,
+	$ensure   = $php::extension::igbinary::params::ensure,
+  $package 	= $php::extension::igbinary::params::package,
   $provider = $php::extension::igbinary::params::provider,
   $inifile  = $php::extension::igbinary::params::inifile,
   $settings = $php::extension::igbinary::params::settings
-)  {
-  include php::extension::igbinary::params
+) inherits php::extension::igbinary::params {
 
   php::extension { 'igbinary':
-    ensure    => $ensure,
-    package   => $package,
-    provider  => $provider
+    ensure  => $ensure,
+    package  => $package,
+    provider => $provider
   }
 
   php::config { 'php-extension-igbinary':

manifests/extension/imagick.pp

@@ -39,13 +39,12 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::imagick(
-  $ensure   = $php::extension::imagick::params::ensure,
+  $ensure  	= $php::extension::imagick::params::ensure,
   $package  = $php::extension::imagick::params::package,
   $provider = $php::extension::imagick::params::provider,
   $inifile  = $php::extension::imagick::params::inifile,
   $settings = $php::extension::imagick::params::settings
-) {
-  include php::extension::imagick::params
+) inherits php::extension::imagick::params {
 
   php::extension { 'imagick':
     ensure   => $ensure,

manifests/extension/mcrypt.pp

@@ -39,22 +39,21 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::mcrypt(
-  $ensure   = $php::extension::mcrypt::params::ensure,
-  $package  = $php::extension::mcrypt::params::package,
+  $ensure  	= $php::extension::mcrypt::params::ensure,
+  $package 	= $php::extension::mcrypt::params::package,
   $provider = $php::extension::mcrypt::params::provider,
   $inifile  = $php::extension::mcrypt::params::inifile,
   $settings = $php::extension::mcrypt::params::settings
-) {
-  include php::extension::mcrypt::params
+) inherits php::extension::mcrypt::params {
 
   php::extension { 'mcrypt':
-    ensure    => $ensure,
-    package   => $package,
-    provider  => $provider
+    ensure  => $ensure,
+    package  => $package,
+    provider => $provider
   }
 
   php::config { 'php-extension-mcrypt':
-    inifile   => $inifile,
+    inifile     => $inifile,
     settings  => $settings
   }
 

manifests/extension/mysql.pp

@@ -39,13 +39,12 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::mysql(
-  $ensure   = $php::extension::mysql::params::ensure,
-  $package  = $php::extension::mysql::params::package,
-  $provider = $php::extension::mysql::params::provider,
+  $ensure  	= $php::extension::mysql::params::ensure,
+  $package 	= $php::extension::mysql::params::package,
+  $provider	= $php::extension::mysql::params::provider,
   $inifile  = $php::extension::mysql::params::inifile,
   $settings = $php::extension::mysql::params::settings,
-) {
-  include php::extension::mysql::params
+) inherits php::extension::mysql::params {
 
   php::extension { 'mysql':
     ensure   => $ensure,

manifests/extension/redis.pp

@@ -33,14 +33,13 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::redis(
-  $ensure   = 'master',
-  $inifile  = $php::extension::redis::params::inifile,
+	$ensure 	= 'master',
+	$inifile  = $php::extension::redis::params::inifile,
   $settings = $php::extension::redis::params::settings
-) {
-  include php::extension::redis::params
+) inherits php::extension::redis::params {
 
   class { 'php::extension::redis::package':
-    ensure => $ensure
+  	ensure => $ensure
   }
 
   php::config { 'php-extension-redis':

manifests/extension/redis/package.pp

@@ -24,11 +24,10 @@
 #
 class php::extension::redis::package(
   $ensure  = $php::extension::redis::params::ensure,
-  $tmp_dir  = $php::extension::redis::params::tmp_dir
-) {
-  include php::extension::redis::params
+  $tmp_dir = $php::extension::redis::params::tmp_dir
+) inherits php::extension::redis::params {
 
-  file { php::extension::redis::params::tmp_dir :
+  file { "${tmp_dir}":
       ensure   => directory,
       recurse  => true;
   }
@@ -37,14 +36,14 @@
     'redis_fetch':
       command => "wget https://github.com/nicolasff/phpredis/archive/${ensure}.tar.gz",
       creates => "${tmp_dir}/${ensure}.tar.gz",
-      cwd     => php::extension::redis::params::tmp_dir,
-      path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ];
+      path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
+      cwd     => "${tmp_dir}";
 
     'redis_extract':
       command => "tar zxf ${ensure}.tar.gz",
       creates => "${tmp_dir}/phpredis-${ensure}",
-      cwd     => php::extension::redis::params::tmp_dir,
-      path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ];
+      path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
+      cwd     => "${tmp_dir}";
 
     'redis_phpize':
       command => 'phpize',
@@ -71,7 +70,7 @@
       path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ];
   }
 
-  File[tmp_dir]
+  File["${tmp_dir}"]
     -> Class['php::dev']
     -> Exec['redis_fetch']
     -> Exec['redis_extract']

manifests/extension/redis/params.pp

@@ -40,11 +40,11 @@
 #
 class php::extension::redis::params {
 
-  $ensure       = 'master'
-  $tmp_dir      = '/opt/phpredis'
-  $install_dir  = '/usr/lib/php5/20100525'
-  $inifile      = '/etc/php5/conf.d/redis.ini'
-  $settings     = {
+  $ensure      = 'master'
+  $tmp_dir		 = '/opt/phpredis'
+  $install_dir = '/usr/lib/php5/20100525'
+  $inifile     = '/etc/php5/conf.d/redis.ini'
+  $settings = {
     set => {
       '.anon/extension' => 'redis.so'
     }

manifests/extension/ssh2.pp

@@ -39,13 +39,12 @@
 # Copyright 2012-2013 Nodes, unless otherwise noted.
 #
 class php::extension::ssh2(
-  $ensure   = $php::extension::ssh2::params::ensure,
+  $ensure  	= $php::extension::ssh2::params::ensure,
   $package  = $php::extension::ssh2::params::package,
   $provider = $php::extension::ssh2::params::provider,
   $inifile  = $php::extension::ssh2::params::inifile,
   $settings = $php::extension::ssh2::params::settings
-) {
-  include php::extension::ssh2::params
+) inherits php::extension::ssh2::params {
 
   php::extension { 'ssh2':
     ensure   => $ensure,

manifests/extension/ssh2/params.pp

@@ -45,9 +45,9 @@
   $provider = undef
   $inifile  = '/etc/php5/conf.d/20-ssh2.ini'
   $settings = {
-    set => {
+		set => {
 
-    }
-  }
+		}
+	}
 
 }