Merge pull request #242 from shikorism/develop

Release 20190725.2018
2019-07-25 20:19:19 +09:00
parent bcf78df2fc fb84a1d416
commit dabae9f251
15 changed files with 96 additions and 83 deletions
--- a/resources/assets/js/components/MetadataPreview.vue
+++ b/resources/assets/js/components/MetadataPreview.vue
@@ -11,7 +11,7 @@
                </div>
                <div v-else-if="state === MetadataLoadState.Success" class="row no-gutters">
                    <div v-if="hasImage" class="col-4 justify-content-center align-items-center">
-                        <img :src="metadata.image" alt="Thumbnail" class="card-img-top-to-left bg-secondary">
+                        <img :src="metadata.image" alt="Thumbnail" class="w-100 bg-secondary">
                    </div>
                    <div :class="descClasses">
                        <div class="card-body">
@@ -20,8 +20,8 @@
                                <p class="card-text mb-2" style="font-size: small;">タグ候補<br><span class="text-secondary">(クリックするとタグ入力欄にコピーできます)</span></p>
                                <ul class="list-inline d-inline">
                                    <li v-for="tag in suggestions"
-                                        class="list-inline-item badge badge-primary metadata-tag-item"
-                                        @click="addTag(tag)"><span class="oi oi-tag"></span> {{ tag }}</li>
+                                        :class="tagClasses(tag)"
+                                        @click="addTag(tag.name)"><span class="oi oi-tag"></span> {{ tag.name }}</li>
                                </ul>
                            </template>
                        </div>
@@ -54,6 +54,11 @@
        }[],
    };

+    type Suggestion = {
+        name: string,
+        used: boolean,
+    }
+
    @Component
    export default class MetadataPreview extends Vue {
        @Prop() readonly state!: MetadataLoadState;
@@ -62,16 +67,38 @@
        // for use in v-if
        private readonly MetadataLoadState = MetadataLoadState;

+        tags: string[] = [];
+
+        created() {
+            bus.$on("change-tag", (tags: string[]) => this.tags = tags);
+            bus.$emit("resend-tag");
+        }
+
        addTag(tag: string) {
            bus.$emit("add-tag", tag);
        }

-        get suggestions() {
+        tagClasses(s: Suggestion) {
+            return {
+                "list-inline-item": true,
+                "badge": true,
+                "badge-primary": !s.used,
+                "badge-secondary": s.used,
+                "metadata-tag-item": true,
+            };
+        }
+
+        get suggestions(): Suggestion[] {
            if (this.metadata === null) {
                return [];
            }

-            return this.metadata.tags.map(t => t.name);
+            return this.metadata.tags.map(t => {
+                return {
+                    name: t.name,
+                    used: this.tags.indexOf(t.name) !== -1
+                };
+            });
        }

        get hasImage() {
@@ -90,10 +117,7 @@
 <style lang="scss" scoped>
    .link-card-mini {
        $height: 150px;
-
-        .row > div {
-            overflow: hidden;
-        }
+        overflow: hidden;

        .row > div:first-child {
            display: flex;
--- a/resources/assets/js/components/TagInput.vue
+++ b/resources/assets/js/components/TagInput.vue
@@ -16,7 +16,7 @@
 </template>

 <script lang="ts">
-    import {Vue, Component, Prop} from "vue-property-decorator";
+    import {Vue, Component, Prop, Watch} from "vue-property-decorator";
    import {bus} from "../checkin";

    @Component
@@ -31,6 +31,7 @@

        created() {
            bus.$on("add-tag", (tag: string) => this.tags.indexOf(tag) === -1 && this.tags.push(tag));
+            bus.$on("resend-tag", () => bus.$emit("change-tag", this.tags));
        }

        onKeyDown(event: KeyboardEvent) {
@@ -56,6 +57,11 @@
            this.tags.splice(index, 1);
        }

+        @Watch("tags")
+        onTagsChanged() {
+            bus.$emit("change-tag", this.tags);
+        }
+
        get containerClass(): object {
            return {
                "form-control": true,
--- a/resources/assets/sass/_bootstrap-custom.scss
+++ b/resources/assets/sass/_bootstrap-custom.scss
@@ -1,19 +0,0 @@
-.card-img-left {
-    width: 100%;
-    @include border-left-radius($card-inner-border-radius);
-}
-
-.card-img-right {
-    width: 100%;
-    @include border-right-radius($card-inner-border-radius);
-}
-
-.card-img-top-to-left {
-    width: 100%;
-    @include media-breakpoint-down(md) {
-        @include border-top-radius($card-inner-border-radius);
-    }
-    @include media-breakpoint-up(lg) {
-        @include border-left-radius($card-inner-border-radius);
-    }
-}
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -3,7 +3,6 @@ $primary: #e53fb1;

 // Bootstrap
@import "~bootstrap/scss/bootstrap";
-@import "bootstrap-custom";

 // Open Iconic
@import "~open-iconic/font/css/open-iconic-bootstrap";
--- a/resources/assets/sass/components/_link-card.scss
+++ b/resources/assets/sass/components/_link-card.scss
@@ -1,4 +1,6 @@
 .link-card {
+  overflow: hidden;
+
  .row > div {
    max-height: 400px;
    overflow: hidden;
--- a/resources/assets/sass/tissue.css
+++ b/resources/assets/sass/tissue.css
@@ -76,4 +76,5 @@

 #navbarAccountDropdownSp {
    max-width: calc(100vw - 5em);
-}
+}
+
--- a/resources/views/components/link-card.blade.php
+++ b/resources/views/components/link-card.blade.php
@@ -2,7 +2,7 @@
    <a class="text-dark card-link" href="{{ $link }}" target="_blank" rel="noopener">
        <div class="row no-gutters">
            <div class="col-12 col-md-6 justify-content-center align-items-center">
-                <img src="" alt="Thumbnail" class="card-img-top-to-left bg-secondary">
+                <img src="" alt="Thumbnail" class="w-100 bg-secondary">
            </div>
            <div class="col-12 col-md-6">
                <div class="card-body">
--- a/tests/Unit/MetadataResolver/CreateMockedResolver.php
+++ b/tests/Unit/MetadataResolver/CreateMockedResolver.php
@@ -49,6 +49,6 @@ trait CreateMockedResolver

    protected function shouldUseMock(): bool
    {
-        return (bool)env('TEST_USE_HTTP_MOCK', true);
+        return (bool) env('TEST_USE_HTTP_MOCK', true);
    }
 }
--- a/tests/Unit/MetadataResolver/DLsiteResolverTest.php
+++ b/tests/Unit/MetadataResolver/DLsiteResolverTest.php
@@ -20,7 +20,7 @@ class DLsiteResolverTest extends TestCase

    public function testHome()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testHome.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -28,7 +28,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し','バイノーラル/ダミヘ','日常/生活','ほのぼの','恋人同士'], $metadata->tags);
+        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -36,7 +36,7 @@ class DLsiteResolverTest extends TestCase

    public function testSoft()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testSoft.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testSoft.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -44,7 +44,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('ことのはアムリラート', $metadata->title);
        $this->assertEquals('メーカー名: SukeraSparo' . PHP_EOL . '異世界へと迷い込んだ凜に救いの手を差し伸べるルカ――。これは、ふたりが手探りの意思疎通（ことのは）で織りなす、もどかしくも純粋な……女の子同士の物語。', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/professional/VJ012000/VJ011276_img_main.jpg', $metadata->image);
-        $this->assertEquals(['少女','日常/生活','純愛','百合'], $metadata->tags);
+        $this->assertEquals(['少女', '日常/生活', '純愛', '百合'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/soft/work/=/product_id/VJ011276.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -52,7 +52,7 @@ class DLsiteResolverTest extends TestCase

    public function testComic()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testComic.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testComic.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -60,7 +60,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('快楽ヒストリエ', $metadata->title);
        $this->assertEquals('著者: 火鳥' . PHP_EOL . '天地創造と原初の人類を描いた「創世編」をはじめ、英雄たちの偉業を大真面目に考証した正真正銘の学術コミック全15編。', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ139000/BJ138581_img_main.jpg', $metadata->image);
-        $this->assertEquals(['おっぱい','ロリ','ショタ','妹','男性/おやじ','女王様/お姫様','王子様/王子系','戦士','セーラー服','着物/和服','青年コミック','ギャグ','コメディ','歴史/時代物','褐色/日焼け','爺'], $metadata->tags);
+        $this->assertEquals(['おっぱい', 'ロリ', 'ショタ', '妹', '男性/おやじ', '女王様/お姫様', '王子様/王子系', '戦士', 'セーラー服', '着物/和服', '青年コミック', 'ギャグ', 'コメディ', '歴史/時代物', '褐色/日焼け', '爺'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/comic/work/=/product_id/BJ138581.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -68,7 +68,7 @@ class DLsiteResolverTest extends TestCase

    public function testManiax()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testManiax.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testManiax.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -76,7 +76,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('催眠術で新婚人妻マナカさんとエッチしよう', $metadata->title);
        $this->assertEquals('サークル名: デルタブレード' . PHP_EOL . '催眠術で新婚人妻マナカさんの愛する夫にすり替わって子作りラブラブエッチをするCG集です。', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ206000/RJ205445_img_main.jpg', $metadata->image);
-        $this->assertEquals(['断面図','人妻','中出し','妊娠/孕ませ','催眠','口内射精'], $metadata->tags);
+        $this->assertEquals(['断面図', '人妻', '中出し', '妊娠/孕ませ', '催眠', '口内射精'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/maniax/work/=/product_id/RJ205445.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -84,7 +84,7 @@ class DLsiteResolverTest extends TestCase

    public function testPro()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testPro.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testPro.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -92,7 +92,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('euphoria （HDリマスター） Best Price版', $metadata->title);
        $this->assertEquals('ブランド名: CLOCK UP' . PHP_EOL . 'インモラルハードコアADV「euphoria」が高解像度（1024×768）版、「euphoria HDリマスター」となって登場！', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/professional/VJ009000/VJ008455_img_main.jpg', $metadata->image);
-        $this->assertEquals(['アブノーマル','幼なじみ','女教師','退廃/背徳/インモラル','拘束','強制/無理矢理','スカトロ','アヘ顔','拷問','血液/流血','狂気'], $metadata->tags);
+        $this->assertEquals(['アブノーマル', '幼なじみ', '女教師', '退廃/背徳/インモラル', '拘束', '強制/無理矢理', 'スカトロ', 'アヘ顔', '拷問', '血液/流血', '狂気'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/pro/work/=/product_id/VJ008455.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -100,7 +100,7 @@ class DLsiteResolverTest extends TestCase

    public function testBooks()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testBooks.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testBooks.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -108,7 +108,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('永遠娘 vol.6', $metadata->title);
        $this->assertEquals('著者: あまがえる / 玉之けだま / びんせん / 甘露アメ / 源五郎 / すみやお / 宇宙烏賊 / 毒茸人 / あやね / ガロウド / ハードボイルドよし子 / 夜歌 / 黒青郎君' . PHP_EOL . '君の命はどんな味なのだろうな?', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ192000/BJ191317_img_main.jpg', $metadata->image);
-        $this->assertEquals(['ツンデレ','ロリ','妖怪','人外娘/モンスター娘','セーラー服','メイド','ストッキング','ファンタジー','ぶっかけ','中出し','近親相姦','アヘ顔','口内射精'], $metadata->tags);
+        $this->assertEquals(['ツンデレ', 'ロリ', '妖怪', '人外娘/モンスター娘', 'セーラー服', 'メイド', 'ストッキング', 'ファンタジー', 'ぶっかけ', '中出し', '近親相姦', 'アヘ顔', '口内射精'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/books/work/=/product_id/BJ191317.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -116,7 +116,7 @@ class DLsiteResolverTest extends TestCase

    public function testGirls()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testGirls.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testGirls.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -124,7 +124,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('体イク教師', $metadata->title);
        $this->assertEquals('サークル名: Dusk' . PHP_EOL . '思い込みの激しい体育教師に執着されるお話', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ218000/RJ217995_img_main.jpg', $metadata->image);
-        $this->assertEquals(['教師','中出し','陵辱','変態','強制/無理矢理','レイプ'], $metadata->tags);
+        $this->assertEquals(['教師', '中出し', '陵辱', '変態', '強制/無理矢理', 'レイプ'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/girls/work/=/product_id/RJ217995.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -132,7 +132,7 @@ class DLsiteResolverTest extends TestCase

    public function testGirlsPro()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testGirlsPro.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testGirlsPro.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -140,7 +140,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('×××レクチャー', $metadata->title);
        $this->assertEquals('著者: 江口尋' . PHP_EOL . '昔、告白してくれた地味な同級生・瀬尾は超人気セクシー男優になっていて!?', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ171000/BJ170641_img_main.jpg', $metadata->image);
-        $this->assertEquals(['メガネ','芸能人/アイドル/モデル','俺様','ラブコメ','ラブラブ/あまあま','ティーンズラブ','調教','褐色/日焼け'], $metadata->tags);
+        $this->assertEquals(['メガネ', '芸能人/アイドル/モデル', '俺様', 'ラブコメ', 'ラブラブ/あまあま', 'ティーンズラブ', '調教', '褐色/日焼け'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/girls-pro/work/=/product_id/BJ170641.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -148,7 +148,7 @@ class DLsiteResolverTest extends TestCase

    public function testBL()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testBL.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testBL.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -156,7 +156,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('秘密に堕つ', $metadata->title);
        $this->assertEquals('サークル名: ナゲットぶん投げ屋さん' . PHP_EOL . 'とある村に越してきた新婚夫婦。村の集会所で行われた歓迎会で犯される花婿。村の男達に犯され続けた花婿にある変化が…?', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ245000/RJ244977_img_main.jpg', $metadata->image);
-        $this->assertEquals(['既婚者','中出し','強制/無理矢理','レイプ','モブ姦'], $metadata->tags);
+        $this->assertEquals(['既婚者', '中出し', '強制/無理矢理', 'レイプ', 'モブ姦'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/bl/work/=/product_id/RJ244977.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -164,7 +164,7 @@ class DLsiteResolverTest extends TestCase

    public function testEng()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testEng.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testEng.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -172,7 +172,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]', $metadata->title);
        $this->assertEquals('Circle: Triangle!' . PHP_EOL . 'You go with a girl of your first love and enjoy going to haunted places and her massage, ear cleaning, sleep sharing etc. (CV: Yui Asami)', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ229000/RJ228866_img_main.jpg', $metadata->image);
-        $this->assertEquals(['Healing','Binaural','ASMR','Childhood Friend','Ear Cleaning','Romance'], $metadata->tags);
+        $this->assertEquals(['Healing', 'Binaural', 'ASMR', 'Childhood Friend', 'Ear Cleaning', 'Romance'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/eng/work/=/product_id/RE228866.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -180,7 +180,7 @@ class DLsiteResolverTest extends TestCase

    public function testEcchiEng()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testEcchiEng.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testEcchiEng.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -188,7 +188,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('NEKOPARA vol.1', $metadata->title);
        $this->assertEquals('Circle: NEKO WORKs' . PHP_EOL . 'Chocolat and Vanilla star in a rich adult eroge series with E-mote system and animated H scenes', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ145000/RJ144678_img_main.jpg', $metadata->image);
-        $this->assertEquals(['Moe','Master and Servant','Funny Love Story','Nekomimi (Cat Ears)'], $metadata->tags);
+        $this->assertEquals(['Moe', 'Master and Servant', 'Funny Love Story', 'Nekomimi (Cat Ears)'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/ecchi-eng/work/=/product_id/RE144678.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -196,7 +196,7 @@ class DLsiteResolverTest extends TestCase

    public function testSPLink()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testHome.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
        // SP版（touch）のURLのテストだがリゾルバ側でURLから-touchを削除してPC版を取得するので、PC版の内容を使用する

        $this->createResolver(DLsiteResolver::class, $responseText);
@@ -205,7 +205,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し','バイノーラル/ダミヘ','日常/生活','ほのぼの','恋人同士'], $metadata->tags);
+        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -213,7 +213,7 @@ class DLsiteResolverTest extends TestCase

    public function testShortLink()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testHome.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');

        $this->createResolver(DLsiteResolver::class, $responseText);

@@ -221,7 +221,7 @@ class DLsiteResolverTest extends TestCase
        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し','バイノーラル/ダミヘ','日常/生活','ほのぼの','恋人同士'], $metadata->tags);
+        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://dlsite.jp/howtw/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
        }
--- a/tests/Unit/MetadataResolver/FC2ContentsResolverTest.php
+++ b/tests/Unit/MetadataResolver/FC2ContentsResolverTest.php
@@ -20,7 +20,7 @@ class FC2ContentsResolverTest extends TestCase

    public function testAdult()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/FC2Contents/adult.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/FC2Contents/adult.html');

        $this->createResolver(FC2ContentsResolver::class, $responseText);

@@ -35,7 +35,7 @@ class FC2ContentsResolverTest extends TestCase

    public function testGeneral()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/FC2Contents/general.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/FC2Contents/general.html');

        $this->createResolver(FC2ContentsResolver::class, $responseText);

--- a/tests/Unit/MetadataResolver/KomifloResolverTest.php
+++ b/tests/Unit/MetadataResolver/KomifloResolverTest.php
@@ -20,7 +20,7 @@ class KomifloResolverTest extends TestCase

    public function testComic()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/Komiflo/comic.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Komiflo/comic.json');

        $this->createResolver(KomifloResolver::class, $responseText);

@@ -28,7 +28,7 @@ class KomifloResolverTest extends TestCase
        $this->assertEquals('魔法少女とえっち物語', $metadata->title);
        $this->assertEquals('薙派 - メガストアα 19.07', $metadata->description);
        $this->assertEquals('https://t.komiflo.com/564_mobile_large_3x/contents/23a4cd530060b8607aa434f4b299b249e71a4d5c.jpg', $metadata->image);
-        $this->assertEquals(['薙派','お姉さん','ショタ','ファンタジー','巨乳','野外・露出','羞恥'], $metadata->tags);
+        $this->assertEquals(['薙派', 'お姉さん', 'ショタ', 'ファンタジー', '巨乳', '野外・露出', '羞恥'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://api.komiflo.com/content/id/5490', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -36,7 +36,7 @@ class KomifloResolverTest extends TestCase

    public function testComicWithNoParents()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/Komiflo/comicWithNoParents.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Komiflo/comicWithNoParents.json');

        $this->createResolver(KomifloResolver::class, $responseText);

@@ -44,7 +44,7 @@ class KomifloResolverTest extends TestCase
        $this->assertEquals('生まれなおしプログラム', $metadata->title);
        $this->assertEquals('EROKI - ?', $metadata->description);
        $this->assertEquals('https://t.komiflo.com/564_mobile_large_3x/contents/71cfb83640aead3cdd35e4329c4e2f427606a11d.jpg', $metadata->image);
-        $this->assertEquals(['EROKI','お姉さん','しつけ','オリジナル','ショートカット','逆転','巨乳'], $metadata->tags);
+        $this->assertEquals(['EROKI', 'お姉さん', 'しつけ', 'オリジナル', 'ショートカット', '逆転', '巨乳'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://api.komiflo.com/content/id/3414', (string) $this->handler->getLastRequest()->getUri());
        }
--- a/tests/Unit/MetadataResolver/NijieResolverTest.php
+++ b/tests/Unit/MetadataResolver/NijieResolverTest.php
@@ -30,7 +30,7 @@ class NijieResolverTest extends TestCase
        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=66384', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=66384', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -46,7 +46,7 @@ class NijieResolverTest extends TestCase
        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=202707', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=202707', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -61,7 +61,7 @@ class NijieResolverTest extends TestCase
        $this->assertEquals('アニメgifとか専門外なのでよくわかりませんでした', $metadata->description);
        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=9537', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=9537', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -76,7 +76,7 @@ class NijieResolverTest extends TestCase
        $this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description);
        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=256283', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=256283', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -92,7 +92,7 @@ class NijieResolverTest extends TestCase
        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=66384', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=66384', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -108,7 +108,7 @@ class NijieResolverTest extends TestCase
        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=202707', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=202707', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -124,7 +124,7 @@ class NijieResolverTest extends TestCase
        $this->assertEquals('アニメgifとか専門外なのでよくわかりませんでした', $metadata->description);
        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=9537', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=9537', (string) $this->handler->getLastRequest()->getUri());
        }
    }

@@ -139,7 +139,7 @@ class NijieResolverTest extends TestCase
        $this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description);
        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=256283', (string)$this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=256283', (string) $this->handler->getLastRequest()->getUri());
        }
    }
 }
--- a/tests/Unit/MetadataResolver/PixivResolverTest.php
+++ b/tests/Unit/MetadataResolver/PixivResolverTest.php
@@ -20,7 +20,7 @@ class PixivResolverTest extends TestCase

    public function testIllust()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/Pixiv/illust.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/illust.json');

        $this->createResolver(PixivResolver::class, $responseText);

@@ -28,7 +28,7 @@ class PixivResolverTest extends TestCase
        $this->assertEquals('coffee break', $metadata->title);
        $this->assertEquals('投稿者: 裕' . PHP_EOL, $metadata->description);
        $this->assertEquals('https://i.pixiv.cat/img-master/img/2018/04/12/00/01/28/68188073_p0_master1200.jpg', $metadata->image);
-        $this->assertEquals(['オリジナル','カフェ','眼鏡','イヤホン','ぱっつん','艶ぼくろ','眼鏡っ娘','オリジナル5000users入り'], $metadata->tags);
+        $this->assertEquals(['オリジナル', 'カフェ', '眼鏡', 'イヤホン', 'ぱっつん', '艶ぼくろ', '眼鏡っ娘', 'オリジナル5000users入り'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.pixiv.net/ajax/illust/68188073', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -36,7 +36,7 @@ class PixivResolverTest extends TestCase

    public function testIllustMultiPages()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/Pixiv/illustMultiPages.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/illustMultiPages.json');

        $this->createResolver(PixivResolver::class, $responseText);

@@ -44,7 +44,7 @@ class PixivResolverTest extends TestCase
        $this->assertEquals('T-20S', $metadata->title);
        $this->assertEquals('投稿者: amssc' . PHP_EOL . 'JUST FOR FUN' . PHP_EOL . '现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。', $metadata->description);
        $this->assertEquals('https://i.pixiv.cat/img-master/img/2019/05/28/01/16/24/74939802_p0_master1200.jpg', $metadata->image);
-        $this->assertEquals(['巨乳','母乳','lastorigin','Last_Origin','T-20S','おっぱい','라스트오리진','노움'], $metadata->tags);
+        $this->assertEquals(['巨乳', '母乳', 'lastorigin', 'Last_Origin', 'T-20S', 'おっぱい', '라스트오리진', '노움'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.pixiv.net/ajax/illust/74939802', (string) $this->handler->getLastRequest()->getUri());
        }
@@ -52,7 +52,7 @@ class PixivResolverTest extends TestCase

    public function testManga()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/Pixiv/manga.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/manga.json');

        $this->createResolver(PixivResolver::class, $responseText);

@@ -60,7 +60,7 @@ class PixivResolverTest extends TestCase
        $this->assertEquals('冬の日ラブラブ', $metadata->title);
        $this->assertEquals('投稿者: Aza' . PHP_EOL . 'ラブラブエッチのらくがき' . PHP_EOL . PHP_EOL . '三万フォロワー感謝します～' . PHP_EOL . PHP_EOL . '最近忙しいので、自分の時間が少ない・・・', $metadata->description);
        $this->assertEquals('https://i.pixiv.cat/img-master/img/2014/10/25/00/06/58/46713544_p0_master1200.jpg', $metadata->image);
-        $this->assertEquals(['落書き','おっぱい','オリジナル','パイズリ','中出し','だいしゅきホールド','愛のあるセックス','黒髪ロング','オリジナル10000users入り'], $metadata->tags);
+        $this->assertEquals(['落書き', 'おっぱい', 'オリジナル', 'パイズリ', '中出し', 'だいしゅきホールド', '愛のあるセックス', '黒髪ロング', 'オリジナル10000users入り'], $metadata->tags);
        if ($this->shouldUseMock()) {
            $this->assertSame('https://www.pixiv.net/ajax/illust/46713544', (string) $this->handler->getLastRequest()->getUri());
        }
--- a/tests/Unit/MetadataResolver/PlurkResolverTest.php
+++ b/tests/Unit/MetadataResolver/PlurkResolverTest.php
@@ -20,7 +20,7 @@ class PlurkResolverTest extends TestCase

    public function test()
    {
-        $responseText = file_get_contents(__DIR__.'/../../fixture/Plurk/test.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Plurk/test.html');

        $this->createResolver(PlurkResolver::class, $responseText);

--- a/yarn.lock
+++ b/yarn.lock
@@ -4607,9 +4607,9 @@ lodash.uniq@^4.5.0:
  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=

 lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==

 log-symbols@^1.0.2:
  version "1.0.2"