From 74fee83f4e45703ed001202e61ce8ec7f1f260af Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sat, 23 May 2020 22:26:47 +0900
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=8E=A8=E5=A5=A8=E3=81=AE=E3=83=98?=
 =?UTF-8?q?=E3=83=AB=E3=83=91=E9=96=A2=E6=95=B0=E3=81=AE=E5=88=A9=E7=94=A8?=
 =?UTF-8?q?=E3=82=92=E3=82=84=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exceptions/CsvImportException.php  | 3 ++-
 app/MetadataResolver/NijieResolver.php | 5 +++--
 app/Utilities/Formatter.php            | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Exceptions/CsvImportException.php b/app/Exceptions/CsvImportException.php
index 5571dc6..0682513 100644
--- a/app/Exceptions/CsvImportException.php
+++ b/app/Exceptions/CsvImportException.php
@@ -2,6 +2,7 @@
 
 namespace App\Exceptions;
 
+use Illuminate\Support\Arr;
 use Throwable;
 
 class CsvImportException extends \RuntimeException
@@ -15,7 +16,7 @@ class CsvImportException extends \RuntimeException
      */
     public function __construct(...$errors)
     {
-        parent::__construct(array_first($errors));
+        parent::__construct(Arr::first($errors));
         $this->errors = $errors;
     }
 
diff --git a/app/MetadataResolver/NijieResolver.php b/app/MetadataResolver/NijieResolver.php
index 4bbe5ca..879fdaf 100644
--- a/app/MetadataResolver/NijieResolver.php
+++ b/app/MetadataResolver/NijieResolver.php
@@ -3,6 +3,7 @@
 namespace App\MetadataResolver;
 
 use GuzzleHttp\Client;
+use Illuminate\Support\Str;
 use Symfony\Component\DomCrawler\Crawler;
 
 class NijieResolver implements Resolver
@@ -50,8 +51,8 @@ class NijieResolver implements Resolver
         $metadata->description = '投稿者: ' . $data['author']['name'] . PHP_EOL . $data['description'];
         if (
             isset($data['thumbnailUrl']) &&
-            !ends_with($data['thumbnailUrl'], '.gif') &&
-            !ends_with($data['thumbnailUrl'], '.mp4')
+            !Str::endsWith($data['thumbnailUrl'], '.gif') &&
+            !Str::endsWith($data['thumbnailUrl'], '.mp4')
         ) {
             // サムネイルからメイン画像に
             $metadata->image = str_replace('__rs_l160x160/', '', $data['thumbnailUrl']);
diff --git a/app/Utilities/Formatter.php b/app/Utilities/Formatter.php
index c0401c9..7ac108b 100644
--- a/app/Utilities/Formatter.php
+++ b/app/Utilities/Formatter.php
@@ -2,6 +2,7 @@
 
 namespace App\Utilities;
 
+use Illuminate\Support\Str;
 use Misd\Linkify\Linkify;
 
 class Formatter
@@ -55,10 +56,10 @@ class Formatter
         $parts = parse_url($url);
         if (!empty($parts['query'])) {
             // Remove query parameters
-            $url = str_replace_last('?' . $parts['query'], '', $url);
+            $url = Str::replaceFirst('?' . $parts['query'], '', $url);
             if (!empty($parts['fragment'])) {
                 // Remove fragment identifier
-                $url = str_replace_last('#' . $parts['fragment'], '', $url);
+                $url = Str::replaceFirst('#' . $parts['fragment'], '', $url);
             } else {
                 // "http://example.com/?query#" の場合 $parts['fragment'] は unset になるので、個別に判定して除去する必要がある
                 $url = preg_replace('/#\z/u', '', $url);