Adding upstream version 1.10.2.upstream/1.10.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 58 insertions, 0 deletions

diff --git a/library/Director/Web/Widget/IcingaConfigDiff.php b/library/Director/Web/Widget/IcingaConfigDiff.php
new file mode 100644
index 0000000..800f1d9
--- /dev/null
+++ b/library/Director/Web/Widget/IcingaConfigDiff.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Icinga\Module\Director\Web\Widget;
+
+use gipfl\Diff\HtmlRenderer\SideBySideDiff;
+use gipfl\Diff\PhpDiff;
+use Icinga\Module\Director\IcingaConfig\IcingaConfig;
+use ipl\Html\Html;
+use ipl\Html\HtmlDocument;
+use ipl\Html\ValidHtml;
+
+class IcingaConfigDiff extends HtmlDocument
+{
+    public function __construct(IcingaConfig $left, IcingaConfig $right)
+    {
+        foreach (static::getDiffs($left, $right) as $filename => $diff) {
+            $this->add([
+                Html::tag('h3', $filename),
+                $diff
+            ]);
+        }
+    }
+
+    /**
+     * @param IcingaConfig $oldConfig
+     * @param IcingaConfig $newConfig
+     * @return ValidHtml[]
+     */
+    public static function getDiffs(IcingaConfig $oldConfig, IcingaConfig $newConfig)
+    {
+        $oldFileNames = $oldConfig->getFileNames();
+        $newFileNames = $newConfig->getFileNames();
+
+        $fileNames = array_merge($oldFileNames, $newFileNames);
+
+        $diffs = [];
+        foreach ($fileNames as $filename) {
+            if (in_array($filename, $oldFileNames)) {
+                $left = $oldConfig->getFile($filename)->getContent();
+            } else {
+                $left = '';
+            }
+
+            if (in_array($filename, $newFileNames)) {
+                $right = $newConfig->getFile($filename)->getContent();
+            } else {
+                $right = '';
+            }
+            if ($left === $right) {
+                continue;
+            }
+
+            $diffs[$filename] = new SideBySideDiff(new PhpDiff($left, $right));
+        }
+
+        return $diffs;
+    }
+}