From 03100b8c5972539ac680400f837b571b6205bf52 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:10:12 +0100
Subject: [PATCH] doc/lib: Move all renderer classes to the renderer namespace

refs #6630
---
 modules/doc/application/controllers/SearchController.php     | 2 +-
 modules/doc/library/Doc/DocController.php                    | 2 ++
 modules/doc/library/Doc/{ => Renderer}/DocRenderer.php       | 2 +-
 .../library/Doc/{Search => Renderer}/DocSearchRenderer.php   | 5 +++--
 .../doc/library/Doc/{ => Renderer}/DocSectionRenderer.php    | 3 ++-
 modules/doc/library/Doc/{ => Renderer}/DocTocRenderer.php    | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)
 rename modules/doc/library/Doc/{ => Renderer}/DocRenderer.php (98%)
 rename modules/doc/library/Doc/{Search => Renderer}/DocSearchRenderer.php (96%)
 rename modules/doc/library/Doc/{ => Renderer}/DocSectionRenderer.php (98%)
 rename modules/doc/library/Doc/{ => Renderer}/DocTocRenderer.php (98%)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index 2cfb04483..a2e90cd59 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -8,7 +8,7 @@ use Icinga\Module\Doc\DocParser;
 use Icinga\Module\Doc\Exception\DocException;
 use Icinga\Module\Doc\Search\DocSearch;
 use Icinga\Module\Doc\Search\DocSearchIterator;
-use Icinga\Module\Doc\Search\DocSearchRenderer;
+use Icinga\Module\Doc\Renderer\DocSearchRenderer;
 
 class Doc_SearchController extends DocController
 {
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 5c9ebcfec..f555c2442 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Doc;
 
+use Icinga\Module\Doc\Renderer\DocSectionRenderer;
+use Icinga\Module\Doc\Renderer\DocTocRenderer;
 use Icinga\Web\Controller\ModuleActionController;
 
 class DocController extends ModuleActionController
diff --git a/modules/doc/library/Doc/DocRenderer.php b/modules/doc/library/Doc/Renderer/DocRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/DocRenderer.php
rename to modules/doc/library/Doc/Renderer/DocRenderer.php
index bebf06465..4d7ddd0ed 100644
--- a/modules/doc/library/Doc/DocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc;
+namespace Icinga\Module\Doc\Renderer;
 
 use Exception;
 use RecursiveIteratorIterator;
diff --git a/modules/doc/library/Doc/Search/DocSearchRenderer.php b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
similarity index 96%
rename from modules/doc/library/Doc/Search/DocSearchRenderer.php
rename to modules/doc/library/Doc/Renderer/DocSearchRenderer.php
index 05fc04bfc..aa5a9f892 100644
--- a/modules/doc/library/Doc/Search/DocSearchRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
@@ -1,10 +1,11 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc\Search;
+namespace Icinga\Module\Doc\Renderer;
 
 use RecursiveIteratorIterator;
-use Icinga\Module\Doc\DocRenderer;
+use Icinga\Module\Doc\Search\DocSearchIterator;
+use Icinga\Module\Doc\Search\DocSearchMatch;
 
 /**
  * Renderer for doc searches
diff --git a/modules/doc/library/Doc/DocSectionRenderer.php b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/DocSectionRenderer.php
rename to modules/doc/library/Doc/Renderer/DocSectionRenderer.php
index f03474b4a..668e2fb56 100644
--- a/modules/doc/library/Doc/DocSectionRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc;
+namespace Icinga\Module\Doc\Renderer;
 
 require_once 'Parsedown/Parsedown.php';
 
@@ -11,6 +11,7 @@ use Parsedown;
 use RecursiveIteratorIterator;
 use Icinga\Data\Tree\SimpleTree;
 use Icinga\Module\Doc\Exception\ChapterNotFoundException;
+use Icinga\Module\Doc\DocSectionFilterIterator;
 use Icinga\Module\Doc\Search\DocSearch;
 use Icinga\Module\Doc\Search\DocSearchMatch;
 use Icinga\Web\Dom\DomNodeIterator;
diff --git a/modules/doc/library/Doc/DocTocRenderer.php b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/DocTocRenderer.php
rename to modules/doc/library/Doc/Renderer/DocTocRenderer.php
index 0c4bda6da..ed65a1e0b 100644
--- a/modules/doc/library/Doc/DocTocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc;
+namespace Icinga\Module\Doc\Renderer;
 
 use Icinga\Web\View;
 use Icinga\Data\Tree\TreeNodeIterator;