CS

AydinHassan · AydinHassan · commit 67e331623007 · 2020-10-24T12:29:22.000+01:00
diff --git a/src/CliRendererFactory.php b/src/CliRendererFactory.php
@@ -48,30 +48,30 @@ public function __invoke()
     {
 
         $codeRender = new FencedCodeRenderer();
-        $keyLighter = new KeyLighter;
+        $keyLighter = new KeyLighter();
         $keyLighter->init();
         $codeRender->addSyntaxHighlighter('php', new PhpHighlighter($keyLighter));
 
         $blockRenderers = [
-            Document::class         => new DocumentRenderer,
-            Heading::class          => new HeaderRenderer,
-            ThematicBreak::class    => new HorizontalRuleRenderer,
-            Paragraph::class        => new ParagraphRenderer,
+            Document::class         => new DocumentRenderer(),
+            Heading::class          => new HeaderRenderer(),
+            ThematicBreak::class    => new HorizontalRuleRenderer(),
+            Paragraph::class        => new ParagraphRenderer(),
             FencedCode::class       => $codeRender,
-            ListBlock::class        => new ListBlockRenderer,
-            ListItem::class         => new ListItemRenderer,
+            ListBlock::class        => new ListBlockRenderer(),
+            ListItem::class         => new ListItemRenderer(),
         ];
 
         $inlineBlockRenderers = [
-            Text::class             => new TextRenderer,
-            Code::class             => new CodeRenderer,
-            Emphasis::class         => new EmphasisRenderer,
-            Strong::class           => new StrongRenderer,
-            Newline::class          => new NewlineRenderer,
-            Link::class             => new LinkRenderer,
+            Text::class             => new TextRenderer(),
+            Code::class             => new CodeRenderer(),
+            Emphasis::class         => new EmphasisRenderer(),
+            Strong::class           => new StrongRenderer(),
+            Newline::class          => new NewlineRenderer(),
+            Link::class             => new LinkRenderer(),
         ];
 
-        $colors = new Color;
+        $colors = new Color();
         $colors->setForceStyle(true);
 
         return new CliRenderer($blockRenderers, $inlineBlockRenderers, $colors);
diff --git a/src/Highlighter/PhpHighlighter.php b/src/Highlighter/PhpHighlighter.php
@@ -32,6 +32,6 @@ public function __construct(KeyLighter $keyLighter)
      */
     public function highlight($code)
     {
-        return $this->keyLighter->highlight($code, new Php, new CliFormatter);
+        return $this->keyLighter->highlight($code, new Php(), new CliFormatter());
     }
 }
diff --git a/src/Renderer/DocumentRenderer.php b/src/Renderer/DocumentRenderer.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace AydinHassan\CliMdRenderer\Renderer;
 
 use League\CommonMark\Block\Element\AbstractBlock;
diff --git a/src/SyntaxHighlighterInterface.php b/src/SyntaxHighlighterInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace AydinHassan\CliMdRenderer;
 
 /**
diff --git a/test/CliRendererFactoryTest.php b/test/CliRendererFactoryTest.php
@@ -10,7 +10,7 @@ class CliRendererFactoryTest extends TestCase
 {
     public function testFactoryReturnsInstance()
     {
-        $factory = new CliRendererFactory;
+        $factory = new CliRendererFactory();
         $this->assertInstanceOf(CliRenderer::class, $factory->__invoke());
     }
 }
diff --git a/test/CliRendererTest.php b/test/CliRendererTest.php
@@ -22,7 +22,7 @@ public function testRenderBlockThrowsExceptionIfNoRenderer()
             sprintf('Unable to find corresponding renderer for block type: "%s"', get_class($block))
         );
 
-        $renderer = new CliRenderer([], [], new Color);
+        $renderer = new CliRenderer([], [], new Color());
         $renderer->renderBlock($block);
     }
 
@@ -33,7 +33,7 @@ public function testRenderBlock()
         $blockRenderer = $this->createMock(CliBlockRendererInterface::class);
         $renderer = new CliRenderer([
             $class => $blockRenderer
-        ], [], new Color);
+        ], [], new Color());
 
         $blockRenderer
             ->expects($this->once())
@@ -52,7 +52,7 @@ public function testRenderBlocks()
         $renderer = new CliRenderer([
             get_class($block1) => $blockRenderer,
             get_class($block2) => $blockRenderer,
-        ], [], new Color);
+        ], [], new Color());
 
         $blockRenderer
             ->expects($this->exactly(2))
@@ -75,7 +75,7 @@ public function testRenderInlineBlocksThrowsExceptionIfNoRenderer()
             sprintf('Unable to find corresponding renderer for inline type: "%s"', get_class($block))
         );
 
-        $renderer = new CliRenderer([], [], new Color);
+        $renderer = new CliRenderer([], [], new Color());
         $renderer->renderInlines([$block]);
     }
 
@@ -88,7 +88,7 @@ public function testRenderInlineBlocks()
         $renderer = new CliRenderer([], [
             get_class($block1) => $inlineRenderer,
             get_class($block2) => $inlineRenderer,
-        ], new Color);
+        ], new Color());
 
         $inlineRenderer
             ->expects($this->exactly(2))
diff --git a/test/E2ETest.php b/test/E2ETest.php
@@ -16,7 +16,7 @@ class E2ETest extends TestCase
      */
     public function testFullRender($markdown, $expected)
     {
-        $factory    = new CliRendererFactory;
+        $factory    = new CliRendererFactory();
         $renderer   = $factory->__invoke();
         $parser     = new DocParser(Environment::createCommonMarkEnvironment());
 
diff --git a/test/InlineRenderer/AbstractInlineRendererTest.php b/test/InlineRenderer/AbstractInlineRendererTest.php
@@ -26,6 +26,6 @@ public function testExceptionIsThrownIfNotCorrectBlock()
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(sprintf('Incompatible inline type: "%s"', get_class($block)));
 
-        (new $class)->render($block, $cliRenderer);
+        (new $class())->render($block, $cliRenderer);
     }
 }
diff --git a/test/InlineRenderer/CodeRendererTest.php b/test/InlineRenderer/CodeRendererTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace AydinHassan\CliMdRendererTest\InlineRenderer;
 
 use AydinHassan\CliMdRenderer\CliRenderer;
@@ -23,9 +22,9 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $code           = new Code('SOME CODE');
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [], $color);
 
diff --git a/test/InlineRenderer/EmphasisRendererTest.php b/test/InlineRenderer/EmphasisRendererTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace AydinHassan\CliMdRendererTest\InlineRenderer;
 
 use AydinHassan\CliMdRenderer\CliRenderer;
@@ -25,14 +24,14 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $emphasis       = new Emphasis();
         $emphasis->appendChild(new Text('Some Text'));
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [
-            Text::class => new TextRenderer
+            Text::class => new TextRenderer()
         ], $color);
 
         $this->assertEquals(
diff --git a/test/InlineRenderer/LinkRendererTest.php b/test/InlineRenderer/LinkRendererTest.php
@@ -23,14 +23,14 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $link           = new Link('http://www.google.com');
         $link->appendChild(new Text('http://www.google.com'));
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [
-            Text::class => new TextRenderer
+            Text::class => new TextRenderer()
         ], $color);
 
         $this->assertSame(
diff --git a/test/InlineRenderer/NewlineRendererTest.php b/test/InlineRenderer/NewlineRendererTest.php
@@ -21,10 +21,10 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
-        $emphasis       = new Newline;
+        $renderer       = new $class();
+        $emphasis       = new Newline();
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [], $color);
 
diff --git a/test/InlineRenderer/StrongRendererTest.php b/test/InlineRenderer/StrongRendererTest.php
@@ -23,14 +23,14 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $emphasis       = new Strong();
         $emphasis->appendChild(new Text('Some Text'));
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [
-            Text::class => new TextRenderer
+            Text::class => new TextRenderer()
         ], $color);
 
         $this->assertEquals(
diff --git a/test/InlineRenderer/TextRendererTest.php b/test/InlineRenderer/TextRendererTest.php
@@ -21,10 +21,10 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $text           = new Text('HEY');
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [], $color);
 
diff --git a/test/Renderer/AbstractRendererTest.php b/test/Renderer/AbstractRendererTest.php
@@ -25,6 +25,6 @@ public function testExceptionIsThrownIfNotCorrectBlock()
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(sprintf('Incompatible block type: "%s"', get_class($block)));
-        (new $class)->render($block, $cliRenderer);
+        (new $class())->render($block, $cliRenderer);
     }
 }
diff --git a/test/Renderer/DocumentRendererTest.php b/test/Renderer/DocumentRendererTest.php
@@ -23,14 +23,14 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
-        $doc            = new Document;
-        $doc->appendChild(new Paragraph);
+        $renderer       = new $class();
+        $doc            = new Document();
+        $doc->appendChild(new Paragraph());
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([
-            Paragraph::class => new ParagraphRenderer
+            Paragraph::class => new ParagraphRenderer()
         ], [], $color);
 
         $this->assertEquals(
diff --git a/test/Renderer/FencedCodeRendererTest.php b/test/Renderer/FencedCodeRendererTest.php
@@ -28,14 +28,16 @@ public function getRendererClass()
 
     public function testAddSyntaxHighlighterViaConstructor()
     {
-        $renderer = new FencedCodeRenderer(['php' => $highlighter = $this->createMock(SyntaxHighlighterInterface::class)]);
+        $renderer = new FencedCodeRenderer(
+            ['php' => $highlighter = $this->createMock(SyntaxHighlighterInterface::class)]
+        );
 
         $this->assertSame($renderer->getSyntaxHighlighters(), ['php' => $highlighter]);
     }
 
     public function testAddSyntaxHighlighter()
     {
-        $renderer = new FencedCodeRenderer;
+        $renderer = new FencedCodeRenderer();
         $renderer->addSyntaxHighlighter('php', $highlighter = $this->createMock(SyntaxHighlighterInterface::class));
 
         $this->assertSame($renderer->getSyntaxHighlighters(), ['php' => $highlighter]);
@@ -57,7 +59,7 @@ public function testRenderPhpCode()
             ->method('getInfoWords')
             ->will($this->returnValue(['php']));
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [], $color);
 
@@ -84,7 +86,7 @@ public function testRenderNonePhpCodeIsRendererYellow()
             ->method('getInfoWords')
             ->will($this->returnValue(['js']));
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [], $color);
 
@@ -114,10 +116,10 @@ public function testExceptionIsThrownIfNotCorrectBlock()
     private function getRenderer()
     {
         $class = $this->getRendererClass();
-        $renderer = new $class;
+        $renderer = new $class();
         $renderer->addSyntaxHighlighter(
             'php',
-            new PhpHighlighter(new KeyLighter)
+            new PhpHighlighter(new KeyLighter())
         );
 
         return $renderer;
diff --git a/test/Renderer/HeaderRendererTest.php b/test/Renderer/HeaderRendererTest.php
@@ -23,15 +23,15 @@ public function getRendererClass()
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $header         = new Heading(2, 'HEADING!!');
         $header->appendChild(new Text('HEADING!!'));
 
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [
-            Text::class => new TextRenderer
+            Text::class => new TextRenderer()
         ], $color);
 
         $this->assertEquals(
diff --git a/test/Renderer/HorizontalRuleRendererTest.php b/test/Renderer/HorizontalRuleRendererTest.php
@@ -25,16 +25,16 @@ public function testExceptionIsThrownIfWidthNotInteger()
         $this->expectExceptionMessage('Width should be an integer. Got: "stdClass"');
 
         $class = $this->getRendererClass();
-        new $class(new \stdClass);
+        new $class(new \stdClass());
     }
 
     public function testRender()
     {
         $class          = $this->getRendererClass();
-        $renderer       = new $class;
+        $renderer       = new $class();
         $rule           = new ThematicBreak();
 
-        $color          = new Color;
+        $color          = new Color();
         $color->setForceStyle(true);
         $cliRenderer    = new CliRenderer([], [], $color);
 
diff --git a/test/Renderer/ListBlockRendererTest.php b/test/Renderer/ListBlockRendererTest.php
diff --git a/test/Renderer/ListItemRendererTest.php b/test/Renderer/ListItemRendererTest.php
diff --git a/test/Renderer/ParagraphRendererTest.php b/test/Renderer/ParagraphRendererTest.php

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ public function __construct(KeyLighter $keyLighter)`
`32`	`32`	`*/`
`33`	`33`	`public function highlight($code)`
`34`	`34`	`{`
`35`		`- return $this->keyLighter->highlight($code, new Php, new CliFormatter);`
	`35`	`+ return $this->keyLighter->highlight($code, new Php(), new CliFormatter());`
`36`	`36`	`}`
`37`	`37`	`}`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 <?php
+-
 namespace AydinHassan\CliMdRenderer\Renderer;
 use League\CommonMark\Block\Element\AbstractBlock;
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class CliRendererFactoryTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`public function testFactoryReturnsInstance()`
`12`	`12`	`{`
`13`		`- $factory = new CliRendererFactory;`
	`13`	`+ $factory = new CliRendererFactory();`
`14`	`14`	`$this->assertInstanceOf(CliRenderer::class, $factory->__invoke());`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class E2ETest extends TestCase`
`16`	`16`	`*/`
`17`	`17`	`public function testFullRender($markdown, $expected)`
`18`	`18`	`{`
`19`		`- $factory = new CliRendererFactory;`
	`19`	`+ $factory = new CliRendererFactory();`
`20`	`20`	`$renderer = $factory->__invoke();`
`21`	`21`	`$parser = new DocParser(Environment::createCommonMarkEnvironment());`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public function testExceptionIsThrownIfNotCorrectBlock()`
`26`	`26`	`$this->expectException(InvalidArgumentException::class);`
`27`	`27`	`$this->expectExceptionMessage(sprintf('Incompatible inline type: "%s"', get_class($block)));`
`28`	`28`
`29`		`- (new $class)->render($block, $cliRenderer);`
	`29`	`+ (new $class())->render($block, $cliRenderer);`
`30`	`30`	`}`
`31`	`31`	`}`