Merge branch 'develop'

This commit is contained in:
shibafu 2018-12-14 00:36:58 +09:00
commit b9e29cc283
3 changed files with 810 additions and 494 deletions

View File

@ -3,7 +3,9 @@
namespace App\Providers; namespace App\Providers;
use App\MetadataResolver\MetadataResolver; use App\MetadataResolver\MetadataResolver;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Parsedown;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
{ {
@ -14,7 +16,9 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
// Blade::directive('parsedown', function ($expression) {
return "<?php echo app('parsedown')->text($expression); ?>";
});
} }
/** /**
@ -27,5 +31,8 @@ class AppServiceProvider extends ServiceProvider
$this->app->singleton(MetadataResolver::class, function ($app) { $this->app->singleton(MetadataResolver::class, function ($app) {
return new MetadataResolver(); return new MetadataResolver();
}); });
$this->app->singleton('parsedown', function () {
return Parsedown::instance();
});
} }
} }

View File

@ -6,18 +6,19 @@
"type": "project", "type": "project",
"require": { "require": {
"php": ">=7.0.0", "php": ">=7.0.0",
"fideloper/proxy": "~3.3",
"guzzlehttp/guzzle": "^6.3", "guzzlehttp/guzzle": "^6.3",
"laravel/framework": "5.5.*", "laravel/framework": "5.5.*",
"laravel/tinker": "~1.0", "laravel/tinker": "~1.0",
"misd/linkify": "^1.1", "misd/linkify": "^1.1"
"parsedown/laravel": "~1.0"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.1", "barryvdh/laravel-debugbar": "^3.1",
"filp/whoops": "~2.0", "filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"mockery/mockery": "~1.0", "mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0" "phpunit/phpunit": "~6.0",
"symfony/thanks": "^1.0"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [

1288
composer.lock generated

File diff suppressed because it is too large Load Diff