From e543a107b1315c9f2aa819734036a3c842fc88fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= <onigoetz@onigoetz.ch>
Date: Wed, 29 Jul 2015 22:31:41 +0200
Subject: [PATCH] Extract ContentType from format

---
 libs/{Format/Base => }/ContentTypes/ContentType.php          | 2 +-
 libs/{Format/Base => }/ContentTypes/ContentTypeHandler.php   | 2 +-
 .../Base => }/ContentTypes/Markdown/CommonMarkConverter.php  | 2 +-
 libs/{Format/Base => }/ContentTypes/Markdown/ContentType.php | 4 ++--
 .../{Format/Base => }/ContentTypes/Markdown/LinkRenderer.php | 2 +-
 libs/Daux.php                                                | 4 ++--
 libs/Format/Base/ContentPage.php                             | 2 +-
 libs/Format/Base/Generator.php                               | 1 -
 .../Confluence/ContentTypes/Markdown/CommonMarkConverter.php | 2 +-
 libs/Format/Confluence/ContentTypes/Markdown/ContentType.php | 2 +-
 .../Format/Confluence/ContentTypes/Markdown/LinkRenderer.php | 2 +-
 libs/Format/Confluence/Generator.php                         | 2 --
 libs/Format/HTML/Generator.php                               | 5 ++---
 13 files changed, 14 insertions(+), 18 deletions(-)
 rename libs/{Format/Base => }/ContentTypes/ContentType.php (83%)
 rename libs/{Format/Base => }/ContentTypes/ContentTypeHandler.php (95%)
 rename libs/{Format/Base => }/ContentTypes/Markdown/CommonMarkConverter.php (94%)
 rename libs/{Format/Base => }/ContentTypes/Markdown/ContentType.php (78%)
 rename libs/{Format/Base => }/ContentTypes/Markdown/LinkRenderer.php (96%)

diff --git a/libs/Format/Base/ContentTypes/ContentType.php b/libs/ContentTypes/ContentType.php
similarity index 83%
rename from libs/Format/Base/ContentTypes/ContentType.php
rename to libs/ContentTypes/ContentType.php
index 29d243a..d0c4fb4 100644
--- a/libs/Format/Base/ContentTypes/ContentType.php
+++ b/libs/ContentTypes/ContentType.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Format\Base\ContentTypes;
+<?php namespace Todaymade\Daux\ContentTypes;
 
 use Todaymade\Daux\Config;
 
diff --git a/libs/Format/Base/ContentTypes/ContentTypeHandler.php b/libs/ContentTypes/ContentTypeHandler.php
similarity index 95%
rename from libs/Format/Base/ContentTypes/ContentTypeHandler.php
rename to libs/ContentTypes/ContentTypeHandler.php
index 644dc21..c86f62f 100644
--- a/libs/Format/Base/ContentTypes/ContentTypeHandler.php
+++ b/libs/ContentTypes/ContentTypeHandler.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Format\Base\ContentTypes;
+<?php namespace Todaymade\Daux\ContentTypes;
 
 use Todaymade\Daux\Tree\Content;
 
diff --git a/libs/Format/Base/ContentTypes/Markdown/CommonMarkConverter.php b/libs/ContentTypes/Markdown/CommonMarkConverter.php
similarity index 94%
rename from libs/Format/Base/ContentTypes/Markdown/CommonMarkConverter.php
rename to libs/ContentTypes/Markdown/CommonMarkConverter.php
index deb1330..56e385e 100644
--- a/libs/Format/Base/ContentTypes/Markdown/CommonMarkConverter.php
+++ b/libs/ContentTypes/Markdown/CommonMarkConverter.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Format\Base\ContentTypes\Markdown;
+<?php namespace Todaymade\Daux\ContentTypes\Markdown;
 
 use League\CommonMark\DocParser;
 use League\CommonMark\Environment;
diff --git a/libs/Format/Base/ContentTypes/Markdown/ContentType.php b/libs/ContentTypes/Markdown/ContentType.php
similarity index 78%
rename from libs/Format/Base/ContentTypes/Markdown/ContentType.php
rename to libs/ContentTypes/Markdown/ContentType.php
index 2e76093..39e1ed5 100644
--- a/libs/Format/Base/ContentTypes/Markdown/ContentType.php
+++ b/libs/ContentTypes/Markdown/ContentType.php
@@ -1,8 +1,8 @@
-<?php namespace Todaymade\Daux\Format\Base\ContentTypes\Markdown;
+<?php namespace Todaymade\Daux\ContentTypes\Markdown;
 
 use Todaymade\Daux\Config;
 
-class ContentType implements \Todaymade\Daux\Format\Base\ContentTypes\ContentType
+class ContentType implements \Todaymade\Daux\ContentTypes\ContentType
 {
     /** @var Config */
     protected $config;
diff --git a/libs/Format/Base/ContentTypes/Markdown/LinkRenderer.php b/libs/ContentTypes/Markdown/LinkRenderer.php
similarity index 96%
rename from libs/Format/Base/ContentTypes/Markdown/LinkRenderer.php
rename to libs/ContentTypes/Markdown/LinkRenderer.php
index 562e534..bc66d50 100644
--- a/libs/Format/Base/ContentTypes/Markdown/LinkRenderer.php
+++ b/libs/ContentTypes/Markdown/LinkRenderer.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Format\Base\ContentTypes\Markdown;
+<?php namespace Todaymade\Daux\ContentTypes\Markdown;
 
 use League\CommonMark\HtmlElement;
 use League\CommonMark\HtmlRendererInterface;
diff --git a/libs/Daux.php b/libs/Daux.php
index c55c37c..a29eb07 100644
--- a/libs/Daux.php
+++ b/libs/Daux.php
@@ -1,7 +1,7 @@
 <?php namespace Todaymade\Daux;
 
 use Symfony\Component\Console\Output\NullOutput;
-use Todaymade\Daux\Format\Base\ContentTypes\ContentTypeHandler;
+use Todaymade\Daux\ContentTypes\ContentTypeHandler;
 use Todaymade\Daux\Tree\Builder;
 use Todaymade\Daux\Tree\Root;
 
@@ -19,7 +19,7 @@ class Daux
     /** @var \Todaymade\Daux\Format\Base\Generator */
     protected $generator;
 
-    /** @var \Todaymade\Daux\Format\Base\ContentTypes\ContentTypeHandler */
+    /** @var ContentTypeHandler */
     protected $typeHandler;
 
     /**
diff --git a/libs/Format/Base/ContentPage.php b/libs/Format/Base/ContentPage.php
index 4276580..3a57a10 100644
--- a/libs/Format/Base/ContentPage.php
+++ b/libs/Format/Base/ContentPage.php
@@ -1,7 +1,7 @@
 <?php namespace Todaymade\Daux\Format\Base;
 
 use Todaymade\Daux\Config;
-use Todaymade\Daux\Format\Base\ContentTypes\ContentType;
+use Todaymade\Daux\ContentTypes\ContentType;
 use Todaymade\Daux\Tree\Content;
 
 abstract class ContentPage extends SimplePage
diff --git a/libs/Format/Base/Generator.php b/libs/Format/Base/Generator.php
index a11051a..28383e9 100644
--- a/libs/Format/Base/Generator.php
+++ b/libs/Format/Base/Generator.php
@@ -3,7 +3,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Todaymade\Daux\Daux;
-use Todaymade\Daux\Format\Base\ContentTypes\ContentTypeHandler;
 
 interface Generator
 {
diff --git a/libs/Format/Confluence/ContentTypes/Markdown/CommonMarkConverter.php b/libs/Format/Confluence/ContentTypes/Markdown/CommonMarkConverter.php
index cb119f4..6c48c67 100644
--- a/libs/Format/Confluence/ContentTypes/Markdown/CommonMarkConverter.php
+++ b/libs/Format/Confluence/ContentTypes/Markdown/CommonMarkConverter.php
@@ -2,7 +2,7 @@
 
 use League\CommonMark\Environment;
 
-class CommonMarkConverter extends \Todaymade\Daux\Format\Base\ContentTypes\Markdown\CommonMarkConverter
+class CommonMarkConverter extends \Todaymade\Daux\ContentTypes\Markdown\CommonMarkConverter
 {
     protected function getLinkRenderer(Environment $environment)
     {
diff --git a/libs/Format/Confluence/ContentTypes/Markdown/ContentType.php b/libs/Format/Confluence/ContentTypes/Markdown/ContentType.php
index dccae44..e1f2410 100644
--- a/libs/Format/Confluence/ContentTypes/Markdown/ContentType.php
+++ b/libs/Format/Confluence/ContentTypes/Markdown/ContentType.php
@@ -2,7 +2,7 @@
 
 use Todaymade\Daux\Config;
 
-class ContentType extends \Todaymade\Daux\Format\Base\ContentTypes\Markdown\ContentType
+class ContentType extends \Todaymade\Daux\ContentTypes\Markdown\ContentType
 {
     public function __construct(Config $config)
     {
diff --git a/libs/Format/Confluence/ContentTypes/Markdown/LinkRenderer.php b/libs/Format/Confluence/ContentTypes/Markdown/LinkRenderer.php
index 9e91c3b..3ebca4a 100644
--- a/libs/Format/Confluence/ContentTypes/Markdown/LinkRenderer.php
+++ b/libs/Format/Confluence/ContentTypes/Markdown/LinkRenderer.php
@@ -5,7 +5,7 @@ use League\CommonMark\HtmlRendererInterface;
 use League\CommonMark\Inline\Element\AbstractInline;
 use League\CommonMark\Inline\Element\Link;
 
-class LinkRenderer extends \Todaymade\Daux\Format\Base\ContentTypes\Markdown\LinkRenderer
+class LinkRenderer extends \Todaymade\Daux\ContentTypes\Markdown\LinkRenderer
 {
     /**
      * @param Link $inline
diff --git a/libs/Format/Confluence/Generator.php b/libs/Format/Confluence/Generator.php
index 38f053c..e079f7f 100644
--- a/libs/Format/Confluence/Generator.php
+++ b/libs/Format/Confluence/Generator.php
@@ -5,8 +5,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Todaymade\Daux\Config;
 use Todaymade\Daux\Console\RunAction;
 use Todaymade\Daux\Daux;
-use Todaymade\Daux\Format\Base\ContentTypes\ContentTypeHandler;
-use Todaymade\Daux\Format\Confluence\CommonMark\CommonMarkConverter;
 use Todaymade\Daux\Tree\Content;
 use Todaymade\Daux\Tree\Directory;
 
diff --git a/libs/Format/HTML/Generator.php b/libs/Format/HTML/Generator.php
index 38abaad..d024e6e 100644
--- a/libs/Format/HTML/Generator.php
+++ b/libs/Format/HTML/Generator.php
@@ -4,10 +4,9 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Todaymade\Daux\Config;
 use Todaymade\Daux\Console\RunAction;
+use Todaymade\Daux\ContentTypes\Markdown\ContentType;
 use Todaymade\Daux\Daux;
 use Todaymade\Daux\DauxHelper;
-use Todaymade\Daux\Format\Base\CommonMark\CommonMarkConverter;
-use Todaymade\Daux\Format\Base\ContentTypes\ContentTypeHandler;
 use Todaymade\Daux\Format\Base\LiveGenerator;
 use Todaymade\Daux\GeneratorHelper;
 use Todaymade\Daux\Tree\Content;
@@ -36,7 +35,7 @@ class Generator implements \Todaymade\Daux\Format\Base\Generator, LiveGenerator
     public function getContentTypes()
     {
         return [
-            new \Todaymade\Daux\Format\Base\ContentTypes\Markdown\ContentType($this->daux->getParams())
+            'markdown' => new ContentType($this->daux->getParams())
         ];
     }