Merge pull request #447 from bastelfreak/fail

mark private classes with assert_private()
voxpupuli · May 5, 2018 · 1bba491 · 1bba491
2 parents 6d7b898 + a31906a
commit 1bba491
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 42 deletions.
diff --git a/manifests/apache_config.pp b/manifests/apache_config.pp
@@ -13,9 +13,7 @@
   Hash $settings                = {}
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::apache_config is private')
-  }
+  assert_private()
 
   $real_settings = deep_merge($settings, hiera_hash('php::apache::settings', {}))
 

diff --git a/manifests/cli.pp b/manifests/cli.pp
@@ -13,9 +13,7 @@
   Hash $settings                = {}
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::cli is private')
-  }
+  assert_private()
 
   $real_settings = deep_merge($settings, hiera_hash('php::cli::settings', {}))
 

diff --git a/manifests/composer.pp b/manifests/composer.pp
@@ -33,9 +33,7 @@
   Variant[Integer, String] $root_group = $php::params::root_group,
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::composer is private')
-  }
+  assert_private()
 
   archive { 'download composer':
     path         => $path,

diff --git a/manifests/composer/auto_update.pp b/manifests/composer/auto_update.pp
@@ -33,9 +33,8 @@
   $proxy_server = undef,
 ) {
 
-  if $caller_module_name != $module_name {
-    warning('php::composer::auto_update is private')
-  }
+  assert_private()
+
 
   if $proxy_type and $proxy_server {
     $env = [ 'HOME=/root', "${proxy_type}_proxy=${proxy_server}" ]

diff --git a/manifests/config/setting.pp b/manifests/config/setting.pp
@@ -24,9 +24,8 @@
   Stdlib::Absolutepath $file,
 ) {
 
-  if $caller_module_name != $module_name {
-    warning('php::config::setting is private')
-  }
+
+  assert_private()
 
   $split_name = split($key, '/')
   if count($split_name) == 1 {

diff --git a/manifests/dev.pp b/manifests/dev.pp
@@ -14,9 +14,7 @@
   Boolean $manage_repos = $php::manage_repos,
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::dev is private')
-  }
+  assert_private()
 
   # On FreeBSD there is no 'devel' package.
   $real_package = $facts['os']['family'] ? {

diff --git a/manifests/embedded.pp b/manifests/embedded.pp
@@ -21,9 +21,7 @@
   Hash $settings                = {},
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::embedded is private')
-  }
+  assert_private()
 
   $real_settings = deep_merge(
     $settings,

diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp
@@ -95,9 +95,7 @@
   String $syslog_ident                                                  = 'php-fpm',
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::fpm::config is private')
-  }
+  assert_private()
 
   # Hack-ish to default to user for group too
   $log_group_final = $log_group ? {

diff --git a/manifests/global.pp b/manifests/global.pp
@@ -16,9 +16,7 @@
   Hash $settings                = {}
 ) inherits ::php {
 
-  if $caller_module_name != $module_name {
-    warning('php::global is private')
-  }
+  assert_private()
 
   # No deep merging required since the settings we have are the global settings.
   $real_settings = $settings

diff --git a/manifests/packages.pp b/manifests/packages.pp
@@ -19,9 +19,7 @@
   Array $names           = $php::params::common_package_names,
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::packages is private')
-  }
+  assert_private()
 
   $real_names = union($names, $names_to_prefix)
   if $facts['os']['family'] == 'debian' {

diff --git a/manifests/pear.pp b/manifests/pear.pp
@@ -14,9 +14,7 @@
   Boolean $manage_repos     = $php::manage_repos,
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::pear is private')
-  }
+  assert_private()
 
   # Defaults for the pear package name
   if $package {

diff --git a/manifests/phpunit.pp b/manifests/phpunit.pp
@@ -21,9 +21,7 @@
   Integer $max_age           = $php::params::phpunit_max_age,
 ) inherits php::params {
 
-  if $caller_module_name != $module_name {
-    warning('php::phpunit is private')
-  }
+  assert_private()
 
   ensure_packages(['wget'])
 

diff --git a/manifests/phpunit/auto_update.pp b/manifests/phpunit/auto_update.pp
@@ -17,9 +17,7 @@
   $path,
 ) {
 
-  if $caller_module_name != $module_name {
-    warning('php::phpunit::auto_update is private')
-  }
+  assert_private()
 
   exec { 'update phpunit':
     command => "wget ${source} -O ${path}",

diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
@@ -36,9 +36,7 @@
   $sury         = true,
 ) {
 
-  if $caller_module_name != $module_name {
-    warning('php::repo::debian is private')
-  }
+  assert_private()
 
   include '::apt'