From 22eb5911f0e9913641a349caf006304f5730d03b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sun, 25 Feb 2018 17:58:11 +0100
Subject: [PATCH] CustomVariables: readability, IDE hints

---
 application/forms/DirectorDatafieldForm.php         |  2 +-
 library/Director/CustomVariable/CustomVariable.php  |  4 ++++
 library/Director/CustomVariable/CustomVariables.php | 11 ++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/application/forms/DirectorDatafieldForm.php b/application/forms/DirectorDatafieldForm.php
index 333c6a58..25410026 100644
--- a/application/forms/DirectorDatafieldForm.php
+++ b/application/forms/DirectorDatafieldForm.php
@@ -33,7 +33,7 @@ class DirectorDatafieldForm extends DirectorObjectForm
             }
         }
 
-        return parent::onRequest();
+        parent::onRequest();
     }
 
     protected function askForVariableDeletion($varname, $cnt)
diff --git a/library/Director/CustomVariable/CustomVariable.php b/library/Director/CustomVariable/CustomVariable.php
index 8468374f..24c910b3 100644
--- a/library/Director/CustomVariable/CustomVariable.php
+++ b/library/Director/CustomVariable/CustomVariable.php
@@ -87,6 +87,10 @@ abstract class CustomVariable implements IcingaConfigRenderer
         return $this->key;
     }
 
+    /**
+     * @param $value
+     * @return $this
+     */
     abstract public function setValue($value);
 
     abstract public function getValue();
diff --git a/library/Director/CustomVariable/CustomVariables.php b/library/Director/CustomVariable/CustomVariables.php
index bb94d951..68325a24 100644
--- a/library/Director/CustomVariable/CustomVariables.php
+++ b/library/Director/CustomVariable/CustomVariables.php
@@ -42,15 +42,12 @@ class CustomVariables implements Iterator, Countable, IcingaConfigRenderer
         $parts = array();
         $where = $db->quoteInto('varname = ?', $varname);
         foreach (static::$allTables as $table) {
-            $parts[] = sprintf(
-                'SELECT COUNT(*) as cnt FROM ' . $table . ' WHERE %s',
-                $where
-            );
+            $parts[] = "SELECT COUNT(*) as cnt FROM $table WHERE $where";
         }
 
-        $query = 'SELECT SUM(cnt) AS cnt FROM ('
-            . implode(' UNION ALL ', $parts)
-            . ') sub';
+        $sub = implode(' UNION ALL ', $parts);
+        $query = "SELECT SUM(sub.cnt) AS cnt FROM ($sub) sub";
+
         return (int) $db->fetchOne($query);
     }