Skip to content

Commit dcf6a87

Browse files
johnnyhuyjohnnyhuy
committed
Removed Laravel related stuff
1 parent e67a485 commit dcf6a87

File tree

14 files changed

+215
-203
lines changed

14 files changed

+215
-203
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean tincidunt urna m
177177

178178
## Contribution
179179

180-
- Project derived from [Graham Campbell](https://github.com/GrahamCampbell)'s [emoji parser](https://github.com/AltThree/Emoji) for Laravel 5.
180+
- Project derived from [Graham Campbell](https://github.com/GrahamCampbell)'s [emoji parser](https://github.com/AltThree/Emoji) for Laravel
181181
- **Johnny Huynh** - Initial changes
182182

183183
## License

‎composer.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "johnnyhuy/laravel-useful-commonmark-extension",
33
"type": "library",
4-
"description": "Laravel useful CommonMark extension for Laravel 5",
4+
"description": "Laravel useful CommonMark extension for Laravel 5, 6 & 7",
55
"keywords": ["youtube", "php", "laravel", "markdown", "commonmark", "phpleague", "laravel-package"],
66
"license": "MIT",
77
"authors": [
@@ -21,15 +21,11 @@
2121
"require": {
2222
"php": "^7.1.3",
2323
"ext-json": "*",
24-
"laravel/framework": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
2524
"league/commonmark": "^1.1.0",
2625
"spatie/commonmark-highlighter": "^2.1"
2726
},
2827
"require-dev": {
2928
"mockery/mockery": "^1.2",
30-
"graham-campbell/analyzer": "^2.0",
31-
"graham-campbell/markdown": "^11.1.0",
32-
"graham-campbell/testbench": "^5.0",
3329
"phpunit/phpunit": "^7.0"
3430
},
3531
"autoload": {
@@ -48,11 +44,6 @@
4844
"extra": {
4945
"branch-alias": {
5046
"dev-master": "2.0.x-dev"
51-
},
52-
"laravel": {
53-
"providers": [
54-
"JohnnyHuy\\Laravel\\UsefulCommonMarkExtensionServiceProvider"
55-
]
5647
}
5748
},
5849
"minimum-stability": "stable"

‎src/Inline/Renderer/CodepenRenderer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public function render(AbstractInline $inline, ElementRendererInterface $htmlRen
3333

3434
// Use a oEmbed route to get codepen details
3535
$apiUrl = "https://codepen.io/api/oembed?url={$inline->getUrl()}&format=json";
36-
3736
$apiResponse = $this->getContent($apiUrl);
3837

3938
//seems that the used codepen url is invalid

‎src/UsefulCommonMarkExtensionServiceProvider.php‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎tests/BaseTestCase.php‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,8 @@
44

55
namespace JohnnyHuy\Laravel\Markdown\Tests;
66

7-
use GrahamCampbell\Markdown\MarkdownServiceProvider;
8-
use GrahamCampbell\TestBench\AbstractPackageTestCase;
9-
use Illuminate\Contracts\Foundation\Application;
10-
use JohnnyHuy\Laravel\UsefulCommonMarkExtension;
11-
use JohnnyHuy\Laravel\UsefulCommonMarkExtensionServiceProvider;
7+
use PHPUnit\Framework\TestCase;
128

13-
class BaseTestCase extends AbstractPackageTestCase
9+
class BaseTestCase extends TestCase
1410
{
15-
/**
16-
* Setup the application environment.
17-
*
18-
* @param Application $app
19-
*
20-
* @return void
21-
*/
22-
protected function getEnvironmentSetUp($app)
23-
{
24-
parent::getEnvironmentSetUp($app);
25-
$app->config->set('markdown.extensions', [UsefulCommonMarkExtension::class]);
26-
}
27-
28-
/**
29-
* Get the required service providers.
30-
*
31-
* @param Application $app
32-
*
33-
* @return string[]
34-
*/
35-
protected function getRequiredServiceProviders($app)
36-
{
37-
return [MarkdownServiceProvider::class];
38-
}
39-
40-
/**
41-
* Get the service provider class.
42-
*
43-
* @param string $app
44-
* @return string
45-
*/
46-
protected function getServiceProviderClass($app)
47-
{
48-
return UsefulCommonMarkExtensionServiceProvider::class;
49-
}
5011
}

‎tests/Elements/Block/ColorTest.php‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44

55
namespace JohnnyHuy\Laravel\Markdown\Tests\Elements\Block;
66

7-
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
7+
use JohnnyHuy\Laravel\Block\Element\BlockColor;
8+
use JohnnyHuy\Laravel\Block\Parser\ColorParser;
9+
use JohnnyHuy\Laravel\Block\Renderer\ColorBlockRenderer;
10+
use League\CommonMark\DocParser;
11+
use League\CommonMark\Environment;
12+
use League\CommonMark\HtmlRenderer;
813
use PHPUnit\Framework\ExpectationFailedException;
14+
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
915
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1016

1117
/**
@@ -51,7 +57,18 @@ public function failedStrings()
5157
*/
5258
public function testShouldRender($input, $output)
5359
{
54-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
60+
// Arrange
61+
$environment = Environment::createCommonMarkEnvironment();
62+
$parser = new DocParser($environment);
63+
$htmlRenderer = new HtmlRenderer($environment);
64+
$environment->addBlockParser(new ColorParser());
65+
$environment->addBlockRenderer(BlockColor::class, new ColorBlockRenderer());
66+
67+
// Act
68+
$html = $htmlRenderer->renderBlock($parser->parse($input));
69+
70+
// Arrange
71+
$this->assertSame("$output\n", $html);
5572
}
5673

5774
/**
@@ -63,6 +80,17 @@ public function testShouldRender($input, $output)
6380
*/
6481
public function testShouldNotRender($input, $output)
6582
{
66-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
83+
// Arrange
84+
$environment = Environment::createCommonMarkEnvironment();
85+
$parser = new DocParser($environment);
86+
$htmlRenderer = new HtmlRenderer($environment);
87+
$environment->addBlockParser(new ColorParser());
88+
$environment->addBlockRenderer(BlockColor::class, new ColorBlockRenderer());
89+
90+
// Act
91+
$html = $htmlRenderer->renderBlock($parser->parse($input));
92+
93+
// Arrange
94+
$this->assertSame("$output\n", $html);
6795
}
6896
}

‎tests/Elements/Block/TextAlignmentTest.php‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44

55
namespace JohnnyHuy\Laravel\Markdown\Tests\Elements\Block;
66

7-
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
7+
use JohnnyHuy\Laravel\Block\Element\TextAlignment;
8+
use JohnnyHuy\Laravel\Block\Parser\TextAlignmentParser;
9+
use JohnnyHuy\Laravel\Block\Renderer\TextAlignmentRenderer;
10+
use League\CommonMark\DocParser;
11+
use League\CommonMark\Environment;
12+
use League\CommonMark\HtmlRenderer;
813
use PHPUnit\Framework\ExpectationFailedException;
14+
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
915
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1016

1117
/**
@@ -48,7 +54,18 @@ public function failedStrings()
4854
*/
4955
public function testShouldRender($input, $output)
5056
{
51-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
57+
// Arrange
58+
$environment = Environment::createCommonMarkEnvironment();
59+
$parser = new DocParser($environment);
60+
$htmlRenderer = new HtmlRenderer($environment);
61+
$environment->addBlockParser(new TextAlignmentParser());
62+
$environment->addBlockRenderer(TextAlignment::class, new TextAlignmentRenderer());
63+
64+
// Act
65+
$html = $htmlRenderer->renderBlock($parser->parse($input));
66+
67+
// Arrange
68+
$this->assertSame("$output\n", $html);
5269
}
5370

5471
/**
@@ -60,6 +77,17 @@ public function testShouldRender($input, $output)
6077
*/
6178
public function testShouldNotRender($input, $output)
6279
{
63-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
80+
// Arrange
81+
$environment = Environment::createCommonMarkEnvironment();
82+
$parser = new DocParser($environment);
83+
$htmlRenderer = new HtmlRenderer($environment);
84+
$environment->addBlockParser(new TextAlignmentParser());
85+
$environment->addBlockRenderer(TextAlignment::class, new TextAlignmentRenderer());
86+
87+
// Act
88+
$html = $htmlRenderer->renderBlock($parser->parse($input));
89+
90+
// Arrange
91+
$this->assertSame("$output\n", $html);
6492
}
6593
}

‎tests/Elements/Inline/CodepenTest.php‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44

55
namespace JohnnyHuy\Laravel\Markdown\Tests\Elements\Inline;
66

7-
use JohnnyHuy\Laravel\Inline\Renderer\CodepenRenderer;
8-
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
97
use Mockery;
8+
use League\CommonMark\DocParser;
9+
use League\CommonMark\Environment;
10+
use League\CommonMark\HtmlRenderer;
11+
use JohnnyHuy\Laravel\Inline\Element\Codepen;
1012
use PHPUnit\Framework\ExpectationFailedException;
13+
use JohnnyHuy\Laravel\Inline\Parser\CodepenParser;
14+
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
15+
use JohnnyHuy\Laravel\Inline\Renderer\CodepenRenderer;
16+
use League\CommonMark\Inline\Renderer\InlineRendererInterface;
1117
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1218

1319
/**
@@ -50,16 +56,20 @@ public function failedStrings()
5056
public function testShouldRender($input, $output)
5157
{
5258
// Arrange
53-
$mock = Mockery::mock(CodepenRenderer::class)
59+
$rendererMock = Mockery::mock(CodepenRenderer::class)
5460
->makePartial()
5561
->shouldReceive('getContent')
5662
->withAnyArgs()
5763
->once()
5864
->andReturn(file_get_contents(__DIR__ . '/../../Fakes/CodePen.json'));
59-
$this->app->instance(CodepenRenderer::class, $mock->getMock());
65+
$environment = Environment::createCommonMarkEnvironment();
66+
$parser = new DocParser($environment);
67+
$htmlRenderer = new HtmlRenderer($environment);
68+
$environment->addInlineParser(new CodepenParser());
69+
$environment->addInlineRenderer(Codepen::class, $rendererMock->getMock());
6070

6171
// Act
62-
$html = $this->app->markdown->convertToHtml($input);
72+
$html = $htmlRenderer->renderBlock($parser->parse($input));
6373

6474
// Arrange
6575
$this->assertSame("$output\n", $html);
@@ -74,6 +84,16 @@ public function testShouldRender($input, $output)
7484
*/
7585
public function testShouldNotRender($input, $output)
7686
{
77-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
87+
$environment = Environment::createCommonMarkEnvironment();
88+
$parser = new DocParser($environment);
89+
$htmlRenderer = new HtmlRenderer($environment);
90+
$environment->addInlineParser(new CodepenParser());
91+
$environment->addInlineRenderer(Codepen::class, new CodepenRenderer());
92+
93+
// Act
94+
$html = $htmlRenderer->renderBlock($parser->parse($input));
95+
96+
// Assert
97+
$this->assertSame("$output\n", $html);
7898
}
7999
}

‎tests/Elements/Inline/ColorTest.php‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
44

55
namespace JohnnyHuy\Laravel\Markdown\Tests\Elements\Inline;
66

7-
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
7+
use League\CommonMark\DocParser;
8+
use League\CommonMark\Environment;
9+
use League\CommonMark\HtmlRenderer;
10+
use JohnnyHuy\Laravel\Block\Parser\ColorParser;
11+
use JohnnyHuy\Laravel\Inline\Element\InlineColor;
12+
use JohnnyHuy\Laravel\Inline\Parser\CloseColorParser;
13+
use JohnnyHuy\Laravel\Inline\Parser\OpenColorParser;
14+
use JohnnyHuy\Laravel\Inline\Renderer\ColorInlineRenderer;
815
use PHPUnit\Framework\ExpectationFailedException;
16+
use JohnnyHuy\Laravel\Markdown\Tests\BaseTestCase;
917
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1018

1119
/**
@@ -46,7 +54,19 @@ public static function failedStrings(): array
4654
*/
4755
public function testShouldRender($input, $output)
4856
{
49-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
57+
// Arrange
58+
$environment = Environment::createCommonMarkEnvironment();
59+
$parser = new DocParser($environment);
60+
$htmlRenderer = new HtmlRenderer($environment);
61+
$environment->addInlineParser(new CloseColorParser());
62+
$environment->addInlineParser(new OpenColorParser());
63+
$environment->addInlineRenderer(InlineColor::class, new ColorInlineRenderer());
64+
65+
// Act
66+
$html = $htmlRenderer->renderBlock($parser->parse($input));
67+
68+
// Arrange
69+
$this->assertSame("$output\n", $html);
5070
}
5171

5272
/**
@@ -58,6 +78,18 @@ public function testShouldRender($input, $output)
5878
*/
5979
public function testShouldNotRender($input, $output)
6080
{
61-
$this->assertSame("$output\n", $this->app->markdown->convertToHtml($input));
81+
// Arrange
82+
$environment = Environment::createCommonMarkEnvironment();
83+
$parser = new DocParser($environment);
84+
$htmlRenderer = new HtmlRenderer($environment);
85+
$environment->addInlineParser(new CloseColorParser());
86+
$environment->addInlineParser(new OpenColorParser());
87+
$environment->addInlineRenderer(InlineColor::class, new ColorInlineRenderer());
88+
89+
// Act
90+
$html = $htmlRenderer->renderBlock($parser->parse($input));
91+
92+
// Arrange
93+
$this->assertSame("$output\n", $html);
6294
}
6395
}

0 commit comments

Comments
 (0)