D3Public
/
daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Extract ContentType from format

This commit is contained in:
Stéphane Goetz 2015-07-29 22:31:41 +02:00
parent 386f323dd0
commit e543a107b1
13 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/Format/Base/ContentTypes/ContentType.php → libs/ContentTypes/ContentType.php
View File

@ -1,4 +1,4 @@
<?php namespace Todaymade\Daux\Format\Base\ContentTypes;
<?php namespace Todaymade\Daux\ContentTypes;
use Todaymade\Daux\Config;

2
libs/Format/Base/ContentTypes/ContentTypeHandler.php → libs/ContentTypes/ContentTypeHandler.php
View File

@ -1,4 +1,4 @@
<?php namespace Todaymade\Daux\Format\Base\ContentTypes;
<?php namespace Todaymade\Daux\ContentTypes;
use Todaymade\Daux\Tree\Content;

2
libs/Format/Base/ContentTypes/Markdown/CommonMarkConverter.php → libs/ContentTypes/Markdown/CommonMarkConverter.php
View File

@ -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;

4
libs/Format/Base/ContentTypes/Markdown/ContentType.php → libs/ContentTypes/Markdown/ContentType.php
View File

@ -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;

2
libs/Format/Base/ContentTypes/Markdown/LinkRenderer.php → libs/ContentTypes/Markdown/LinkRenderer.php
View File

@ -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;

4
libs/Daux.php
View File

@ -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;
/**

2
libs/Format/Base/ContentPage.php
View File

@ -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

1
libs/Format/Base/Generator.php
View File

@ -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
{

2
libs/Format/Confluence/ContentTypes/Markdown/CommonMarkConverter.php
View File

@ -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)
{

2
libs/Format/Confluence/ContentTypes/Markdown/ContentType.php
View File

@ -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)
{

2
libs/Format/Confluence/ContentTypes/Markdown/LinkRenderer.php
View File

@ -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

2
libs/Format/Confluence/Generator.php
View File

@ -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;

5
libs/Format/HTML/Generator.php
View File

@ -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())
];
}