死んだテストを交換

tests/Unit/MetadataResolver/PixivResolverTest.php

@@ -40,13 +40,13 @@ class PixivResolverTest extends TestCase
 
         $this->createResolver(PixivResolver::class, $responseText);
 
-        $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=74939802');
+        $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=47220843');
-        $this->assertEquals('T-20S', $metadata->title);
+        $this->assertEquals('がぶ飲みミルクティー', $metadata->title);
-        $this->assertEquals('投稿者: amssc' . PHP_EOL . 'JUST FOR FUN' . PHP_EOL . '现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。', $metadata->description);
+        $this->assertEquals('投稿者: きっぷる' . PHP_EOL . '劇中で度々お見かけするお姿がたまらなく愛おしいのです' . 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('https://i.pixiv.cat/img-master/img/2014/11/23/15/52/00/47220843_p0_master1200.jpg', $metadata->image);
-        $this->assertEquals(['巨乳', '母乳', 'lastorigin', 'Last_Origin', 'T-20S', 'おっぱい', '라스트오리진', '노움'], $metadata->tags);
+        $this->assertEquals(['SHIROBAKO', '小笠原綸子', 'ゴスロリ様', '中出し', 'SHIRUPAKO', 'くわえたくしあげ', 'ずらし挿入', 'SHIROBAKO1000users入り', '破れストッキング'], $metadata->tags);
         if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.pixiv.net/ajax/illust/74939802', (string) $this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://www.pixiv.net/ajax/illust/47220843', (string) $this->handler->getLastRequest()->getUri());
         }
     }
 

tests/fixture/Pixiv/illustMultiPages.json

@@ -2,162 +2,252 @@
     "error": false,
     "message": "",
     "body": {
-        "illustId": "74939802",
+        "illustId": "47220843",
-        "illustTitle": "T-20S",
+        "illustTitle": "がぶ飲みミルクティー",
-        "illustComment": "JUST FOR FUN<br />现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。",
+        "illustComment": "劇中で度々お見かけするお姿がたまらなく愛おしいのです<br />チラリズムでしょうか",
-        "id": "74939802",
+        "id": "47220843",
-        "title": "T-20S",
+        "title": "がぶ飲みミルクティー",
-        "description": "JUST FOR FUN<br />现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。",
+        "description": "劇中で度々お見かけするお姿がたまらなく愛おしいのです<br />チラリズムでしょうか",
         "illustType": 0,
-        "createDate": "2019-05-27T16:16:24+00:00",
+        "createDate": "2014-11-23T06:52:00+00:00",
-        "uploadDate": "2019-05-27T16:16:24+00:00",
+        "uploadDate": "2014-11-23T06:52:00+00:00",
         "restrict": 0,
         "xRestrict": 1,
         "sl": 6,
         "urls": {
-            "mini": "https://i.pximg.net/c/48x48/img-master/img/2019/05/28/01/16/24/74939802_p0_square1200.jpg",
+            "mini": "https://i.pximg.net/c/48x48/img-master/img/2014/11/23/15/52/00/47220843_p0_square1200.jpg",
-            "thumb": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2019/05/28/01/16/24/74939802_p0_square1200.jpg",
+            "thumb": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/11/23/15/52/00/47220843_p0_square1200.jpg",
-            "small": "https://i.pximg.net/c/540x540_70/img-master/img/2019/05/28/01/16/24/74939802_p0_master1200.jpg",
+            "small": "https://i.pximg.net/c/540x540_70/img-master/img/2014/11/23/15/52/00/47220843_p0_master1200.jpg",
-            "regular": "https://i.pximg.net/img-master/img/2019/05/28/01/16/24/74939802_p0_master1200.jpg",
+            "regular": "https://i.pximg.net/img-master/img/2014/11/23/15/52/00/47220843_p0_master1200.jpg",
-            "original": "https://i.pximg.net/img-original/img/2019/05/28/01/16/24/74939802_p0.jpg"
+            "original": "https://i.pximg.net/img-original/img/2014/11/23/15/52/00/47220843_p0.jpg"
         },
         "tags": {
-            "authorId": "17702579",
+            "authorId": "10589144",
             "isLocked": false,
             "tags": [
                 {
                     "tag": "R-18",
                     "locked": true,
                     "deletable": false,
-                    "userId": "17702579",
+                    "userId": "10589144",
                     "romaji": null,
-                    "userName": "amssc"
+                    "userName": "きっぷる"
                 },
                 {
-                    "tag": "巨乳",
+                    "tag": "SHIROBAKO",
                     "locked": true,
                     "deletable": false,
-                    "userId": "17702579",
+                    "userId": "10589144",
-                    "romaji": "kyonyuu",
+                    "romaji": null,
+                    "userName": "きっぷる"
+                },
+                {
+                    "tag": "小笠原綸子",
+                    "locked": true,
+                    "deletable": false,
+                    "userId": "10589144",
+                    "romaji": "ogasawararinnko",
+                    "userName": "きっぷる"
+                },
+                {
+                    "tag": "ゴスロリ様",
+                    "locked": true,
+                    "deletable": false,
+                    "userId": "10589144",
+                    "romaji": "gosurorisama",
+                    "userName": "きっぷる"
+                },
+                {
+                    "tag": "中出し",
+                    "locked": true,
+                    "deletable": false,
+                    "userId": "10589144",
+                    "romaji": "nakadashi",
                     "translation": {
-                        "en": "large breasts"
+                        "en": "creampie"
                     },
-                    "userName": "amssc"
+                    "userName": "きっぷる"
                 },
                 {
-                    "tag": "母乳",
+                    "tag": "SHIRUPAKO",
-                    "locked": true,
-                    "deletable": false,
-                    "userId": "17702579",
-                    "romaji": "bonyuu",
-                    "translation": {
-                        "en": "breast milk"
-                    },
-                    "userName": "amssc"
-                },
-                {
-                    "tag": "lastorigin",
-                    "locked": true,
-                    "deletable": false,
-                    "userId": "17702579",
-                    "romaji": null,
-                    "userName": "amssc"
-                },
-                {
-                    "tag": "Last_Origin",
-                    "locked": true,
-                    "deletable": false,
-                    "userId": "17702579",
-                    "romaji": null,
-                    "userName": "amssc"
-                },
-                {
-                    "tag": "T-20S",
-                    "locked": true,
-                    "deletable": false,
-                    "userId": "17702579",
-                    "romaji": null,
-                    "userName": "amssc"
-                },
-                {
-                    "tag": "おっぱい",
                     "locked": false,
                     "deletable": false,
-                    "romaji": "oppai",
+                    "romaji": null
+                },
+                {
+                    "tag": "くわえたくしあげ",
+                    "locked": false,
+                    "deletable": false,
+                    "romaji": "kuwaetakushiage",
                     "translation": {
-                        "en": "breasts"
+                        "en": "shirt held up with the mouth"
                     }
                 },
                 {
-                    "tag": "라스트오리진",
+                    "tag": "ずらし挿入",
                     "locked": false,
                     "deletable": false,
-                    "romaji": null
+                    "romaji": "zurashisounyuu",
+                    "translation": {
+                        "en": "clothed penetration"
+                    }
                 },
                 {
-                    "tag": "노움",
+                    "tag": "SHIROBAKO1000users入り",
                     "locked": false,
                     "deletable": false,
-                    "romaji": null
+                    "romaji": "shirobakoissennyu-za-zuiri"
+                },
+                {
+                    "tag": "破れストッキング",
+                    "locked": false,
+                    "deletable": false,
+                    "romaji": "yaburesutokkinngu",
+                    "translation": {
+                        "en": "torn stockings"
+                    }
                 }
             ],
             "writable": false
         },
         "storableTags": [
             "0xsDLqCEW6",
-            "5oPIfUbtd6",
+            "OFfMrDY0Rx",
-            "zZZn32I7eS",
+            "LUdsS_06nd",
-            "NLCPvW6hqg",
+            "jOuNGy1xGb",
-            "uMloBPsM69",
+            "MM6RXH_rlN",
-            "4HYAnF33v5",
+            "8MSz4vqmhj",
-            "Ie2c51_4Sp",
+            "G3Q8bNP7Gg",
-            "I8DVKb4T8n",
+            "B_OtVkMSZT",
-            "HAtQGc-2dA"
+            "0HPK64uuTz",
+            "jEfylbrgQX"
         ],
-        "userId": "17702579",
+        "userId": "10589144",
-        "userName": "amssc",
+        "userName": "きっぷる",
-        "userAccount": "amsscggy",
+        "userAccount": "kipples",
         "userIllusts": {
-            "74939802": {
+            "43288863": {
-                "illustId": "74939802",
+                "illustId": "43288863",
-                "illustTitle": "T-20S",
+                "illustTitle": "だべの人",
-                "id": "74939802",
+                "id": "43288863",
-                "title": "T-20S",
+                "title": "だべの人",
+                "illustType": 0,
+                "xRestrict": 0,
+                "restrict": 0,
+                "sl": 2,
+                "url": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/05/04/13/05/50/43288863_p0_square1200.jpg",
+                "description": "",
+                "tags": [
+                    "バトルスピリッツ",
+                    "最強銀河究極ゼロ",
+                    "マレーネ",
+                    "CLIPSTUDIOPAINT"
+                ],
+                "userId": "10589144",
+                "userName": "きっぷる",
+                "width": 648,
+                "height": 906,
+                "pageCount": 1,
+                "isBookmarkable": null,
+                "bookmarkData": null
+            },
+            "46440938": {
+                "illustId": "46440938",
+                "illustTitle": "二期で会おうぜ、ベイビー",
+                "id": "46440938",
+                "title": "二期で会おうぜ、ベイビー",
+                "illustType": 0,
+                "xRestrict": 0,
+                "restrict": 0,
+                "sl": 2,
+                "url": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/10/09/10/14/37/46440938_p0_square1200.jpg",
+                "description": "",
+                "tags": [
+                    "さばげぶっ!",
+                    "カニ",
+                    "ゲスかわ☆ガールズ",
+                    "CLIPSTUDIOPAINT"
+                ],
+                "userId": "10589144",
+                "userName": "きっぷる",
+                "width": 784,
+                "height": 1015,
+                "pageCount": 2,
+                "isBookmarkable": null,
+                "bookmarkData": null
+            },
+            "47220843": {
+                "illustId": "47220843",
+                "illustTitle": "がぶ飲みミルクティー",
+                "id": "47220843",
+                "title": "がぶ飲みミルクティー",
                 "illustType": 0,
                 "xRestrict": 1,
                 "restrict": 0,
                 "sl": 6,
-                "url": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2019/05/28/01/16/24/74939802_p0_square1200.jpg",
+                "url": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/11/23/15/52/00/47220843_p0_square1200.jpg",
-                "description": "JUST FOR FUN<br />现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。",
+                "description": "劇中で度々お見かけするお姿がたまらなく愛おしいのです<br />チラリズムでしょうか",
                 "tags": [
                     "R-18",
-                    "巨乳",
+                    "SHIROBAKO",
-                    "母乳",
+                    "小笠原綸子",
-                    "lastorigin",
+                    "ゴスロリ様",
-                    "Last_Origin",
+                    "中出し",
-                    "T-20S",
+                    "SHIRUPAKO",
-                    "おっぱい",
+                    "くわえたくしあげ",
-                    "라스트오리진",
+                    "ずらし挿入",
-                    "노움"
+                    "SHIROBAKO1000users入り",
+                    "破れストッキング"
                 ],
-                "userId": "17702579",
+                "userId": "10589144",
-                "userName": "amssc",
+                "userName": "きっぷる",
-                "width": 1842,
+                "width": 777,
-                "height": 3461,
+                "height": 1087,
                 "pageCount": 2,
                 "isBookmarkable": true,
                 "bookmarkData": null
+            },
+            "65079114": {
+                "illustId": "65079114",
+                "illustTitle": "あってます",
+                "id": "65079114",
+                "title": "あってます",
+                "illustType": 0,
+                "xRestrict": 0,
+                "restrict": 0,
+                "sl": 2,
+                "url": "https://i.pximg.net/c/250x250_80_a2/img-master/img/2017/09/22/10/40/35/65079114_p0_square1200.jpg",
+                "description": "",
+                "tags": [
+                    "ニーアオートマタ",
+                    "2B",
+                    "9S",
+                    "尻",
+                    "尻神様",
+                    "人類に栄光あれ",
+                    "NieR:Automata",
+                    "2B9S",
+                    "ヨルハ二号B型",
+                    "NieR1000users入り"
+                ],
+                "userId": "10589144",
+                "userName": "きっぷる",
+                "width": 1171,
+                "height": 1447,
+                "pageCount": 5,
+                "isBookmarkable": null,
+                "bookmarkData": null
             }
         },
         "likeData": false,
-        "width": 1842,
+        "width": 777,
-        "height": 3461,
+        "height": 1087,
         "pageCount": 2,
-        "bookmarkCount": 1874,
+        "bookmarkCount": 2242,
-        "likeCount": 843,
+        "likeCount": 1718,
-        "commentCount": 18,
+        "commentCount": 12,
         "responseCount": 0,
-        "viewCount": 15890,
+        "viewCount": 85669,
         "isHowto": false,
         "isOriginal": false,
         "imageResponseOutData": [],
@@ -178,33 +268,45 @@
         "contestData": null,
         "zoneConfig": {
             "responsive": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=illust_responsive&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1bldte0zwn&num=5d124549863"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=illust_responsive&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebkzsfhdvlrs&num=5d1af27028"
             },
             "300x250": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=illust_rectangle&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1bolgkimxn&num=5d124549198"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=illust_rectangle&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebkzvh1ugg9e&num=5d1af270873"
             },
             "500x500": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=bigbanner&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1br3q3ejn9&num=5d124549470"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=bigbanner&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebkzxw1ynubq&num=5d1af270762"
             },
             "header": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=header&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1bthomvkhj&num=5d124549448"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=header&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebl00lfis546&num=5d1af270915"
             },
             "footer": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=footer&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1bvuhatw9l&num=5d124549678"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=footer&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebl02yvrd3wn&num=5d1af270474"
             },
             "expandedFooter": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=multiple_illust_viewer&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1by6cv5o74&num=5d124549963"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=multiple_illust_viewer&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebl05avijuu5&num=5d1af270637"
             },
             "logo": {
-                "url": "https://pixon.ads-pixiv.net/show?zone_id=logo_side&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4duho1c0k739zyq&num=5d124549322"
+                "url": "https://pixon.ads-pixiv.net/show?zone_id=logo_side&format=js&s=0&up=0&ng=g&l=ja&uri=%2Fajax%2Fillust%2F_PARAM_&is_spa=1&ab_test_digits_first=5&ab_test_digits_second=5&Yuid=MjgDVlY&suid=Pg4lgebl07ypkz6k2&num=5d1af270788"
             }
         },
         "extraData": {
             "meta": {
-                "title": "[R-18] 【巨乳】「T-20S」/「amssc」のイラスト [pixiv]",
+                "title": "[R-18] 【SHIROBAKO】「がぶ飲みミルクティー」/「きっぷる」のイラスト [pixiv]",
-                "description": "この作品 「T-20S」 は 「R-18」「巨乳」 等のタグがつけられた「amssc」さんのイラストです。 「JUST FOR FUN现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。」",
+                "description": "この作品 「がぶ飲みミルクティー」 は 「R-18」「SHIROBAKO」 等のタグがつけられた「きっぷる」さんのイラストです。 「劇中で度々お見かけするお姿がたまらなく愛おしいのですチラリズムでしょうか」",
-                "keywords": "R-18,巨乳,母乳,lastorigin,Last_Origin,T-20S,おっぱい,라스트오리진,노움,イラスト,pixiv,ピクシブ",
+                "keywords": "R-18,SHIROBAKO,小笠原綸子,ゴスロリ様,中出し,SHIRUPAKO,くわえたくしあげ,ずらし挿入,SHIROBAKO1000users入り,破れストッキング,イラスト,pixiv,ピクシブ",
-                "canonical": "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=74939802"
+                "canonical": "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=47220843",
+                "ogp": {
+                    "description": "劇中で度々お見かけするお姿がたまらなく愛おしいのですチラリズムでしょうか",
+                    "image": "https://s.pximg.net/www/images/pixiv_logo.gif?2",
+                    "title": "「がぶ飲みミルクティー」/「きっぷる」[pixiv]",
+                    "type": "article"
+                },
+                "twitter": {
+                    "description": "劇中で度々お見かけするお姿がたまらなく愛おしいのです\r\nチラリズムでしょうか",
+                    "image": "https://s.pximg.net/www/images/pixiv_logo.gif?2",
+                    "title": "[R-18]がぶ飲みミルクティー",
+                    "card": "summary"
+                }
             }
         },
         "noLoginData": {
@@ -214,12 +316,12 @@
             ],
             "zengoIdWorks": {
                 "prev": {
-                    "id": "74939801",
+                    "id": "47220842",
-                    "title": "秋めいてるようで春にも見える"
+                    "title": "優しく 終わりを告げ て"
                 },
                 "next": {
-                    "id": "74939803",
+                    "id": "47220846",
-                    "title": "愛言葉lll"
+                    "title": "今泉受けまとめ3"
                 }
             }
         }