From 3544b41073e27b4a974c0a2f8d81077fe755daac Mon Sep 17 00:00:00 2001 From: Shunsuke Mori Date: Mon, 1 May 2023 22:34:59 +0900 Subject: [PATCH] Fix phpcs --- .../Flex/FlexSampleRestaurant.php | 2 +- .../MessageHandler/TextMessageHandler.php | 7 +++-- phpcs.xml | 25 +++++++++++++++++ src/Laravel/lib/LINEBotServiceProvider.php | 21 +++++++++----- src/parser/lib/EventRequestParser.php | 6 ++-- src/parser/lib/Source/UnknownSource.php | 1 + .../ThingsContent/UnknownThingsContent.php | 1 + src/parser/test/EventRequestParserTest.php | 28 +++++++++---------- 8 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 phpcs.xml diff --git a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleRestaurant.php b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleRestaurant.php index e0afeee8..7576c589 100644 --- a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleRestaurant.php +++ b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleRestaurant.php @@ -202,7 +202,7 @@ private static function createBodyInfoBlock(): FlexBox ]), ], ]); - + return new FlexBox([ 'type' => ComponentType::BOX, 'layout' => ComponentLayout::VERTICAL, diff --git a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/TextMessageHandler.php b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/TextMessageHandler.php index 4e86d68c..925987e5 100644 --- a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/TextMessageHandler.php +++ b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/TextMessageHandler.php @@ -227,7 +227,7 @@ public function handle() $this->replyMessage($replyToken, $templateMessage); break; case 'imagemap': - $richMessageUrl = UrlBuilder::buildUrl($this->req, ['static', 'rich']); + $richMessageUrl = UrlBuilder::buildUrl($this->req, ['static', 'rich']); $imagemapMessage = new ImagemapMessage([ 'type' => MessageType::IMAGEMAP, 'baseUrl' => $richMessageUrl, @@ -353,7 +353,7 @@ public function handle() $this->replyMessage($replyToken, $imagemapMessage); break; case 'restaurant': - $this->replyMessage($replyToken, FlexSampleRestaurant::get()); + $this->replyMessage($replyToken, FlexSampleRestaurant::get()); break; case 'shopping': $this->replyMessage($replyToken, FlexSampleShopping::get()); @@ -472,7 +472,8 @@ private function sendProfile($replyToken, $userId) ); } - private function replyText(string $replyToken, string $text) { + private function replyText(string $replyToken, string $text) + { $textMessage = (new TextMessage(['text' => $text, 'type' => MessageType::TEXT])); return $this->replyMessage($replyToken, $textMessage); } diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 00000000..be1ef2b6 --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,25 @@ + + + The coding standard for line-bot-sdk-php. + + src/constants + src/laravel + src/parser + examples/EchoBot/src + examples/EchoBot/public + examples/KitchenSink/src + examples/KitchenSink/public + + + + + + + + + + + + diff --git a/src/Laravel/lib/LINEBotServiceProvider.php b/src/Laravel/lib/LINEBotServiceProvider.php index ee26402f..ca009944 100644 --- a/src/Laravel/lib/LINEBotServiceProvider.php +++ b/src/Laravel/lib/LINEBotServiceProvider.php @@ -59,7 +59,8 @@ public function register() $this->bindMessagingBlobApi(); } - private function bindChannelAccessTokenApi() { + private function bindChannelAccessTokenApi() + { $this->app->bind('line-bot-channel-access-token-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new ChannelAccessTokenConfiguration(); @@ -70,7 +71,8 @@ private function bindChannelAccessTokenApi() { }); } - private function bindInsightApi() { + private function bindInsightApi() + { $this->app->bind('line-bot-insight-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new InsightConfiguration(); @@ -82,7 +84,8 @@ private function bindInsightApi() { }); } - private function bindLiffApi() { + private function bindLiffApi() + { $this->app->bind('line-bot-liff-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new LiffConfiguration(); @@ -94,7 +97,8 @@ private function bindLiffApi() { }); } - private function bindManageAudienceApi() { + private function bindManageAudienceApi() + { $this->app->bind('line-bot-manage-audience-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new ManageAudienceConfiguration(); @@ -106,7 +110,8 @@ private function bindManageAudienceApi() { }); } - private function bindManageAudienceBlobApi() { + private function bindManageAudienceBlobApi() + { $this->app->bind('line-bot-manage-audience-blob-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new ManageAudienceConfiguration(); @@ -118,7 +123,8 @@ private function bindManageAudienceBlobApi() { }); } - private function bindMessagingApi() { + private function bindMessagingApi() + { $this->app->bind('line-bot-messaging-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new MessagingApiConfiguration(); @@ -130,7 +136,8 @@ private function bindMessagingApi() { }); } - private function bindMessagingBlobApi() { + private function bindMessagingBlobApi() + { $this->app->bind('line-bot-messaging-blob-api', function ($app) { $httpClient = $app->make('line-bot-http-client'); $config = new MessagingApiConfiguration(); diff --git a/src/parser/lib/EventRequestParser.php b/src/parser/lib/EventRequestParser.php index cdac4640..a9074f9a 100644 --- a/src/parser/lib/EventRequestParser.php +++ b/src/parser/lib/EventRequestParser.php @@ -92,7 +92,7 @@ class EventRequestParser 'group' => 'LINE\Webhook\Model\GroupSource', 'room' => 'LINE\Webhook\Model\RoomSource', ]; - + private static $thingsContentType2class = [ 'link' => '\LINE\Webhook\Model\LinkThingsContent', 'unlink' => '\LINE\Webhook\Model\UnlinkThingsContent', @@ -218,7 +218,7 @@ private static function parseMessageContent($eventData): MessageContent $contentProvider = new ContentProvider($eventData['message']['contentProvider']); $message->setContentProvider($contentProvider); } - + if ($message instanceof TextMessageContent) { $emojis = array_map(function ($emoji) { return new Emoji($emoji); @@ -265,7 +265,7 @@ private static function parseSource($eventData): Source $sourceClass = self::$sourceType2class[$sourceType]; return new $sourceClass($eventData['source']); } - + /** * @param array $eventData * @return ThingsContent diff --git a/src/parser/lib/Source/UnknownSource.php b/src/parser/lib/Source/UnknownSource.php index 571af11c..6803ca78 100644 --- a/src/parser/lib/Source/UnknownSource.php +++ b/src/parser/lib/Source/UnknownSource.php @@ -17,6 +17,7 @@ */ namespace LINE\Parser\Source; + use LINE\Webhook\Model\Source; /** diff --git a/src/parser/lib/ThingsContent/UnknownThingsContent.php b/src/parser/lib/ThingsContent/UnknownThingsContent.php index a95eadef..55e2107f 100644 --- a/src/parser/lib/ThingsContent/UnknownThingsContent.php +++ b/src/parser/lib/ThingsContent/UnknownThingsContent.php @@ -17,6 +17,7 @@ */ namespace LINE\Parser\Source; + use LINE\Webhook\Model\Source; use LINE\Webhook\Model\ThingsContent; diff --git a/src/parser/test/EventRequestParserTest.php b/src/parser/test/EventRequestParserTest.php index 00c59ae0..e1bd0e4c 100644 --- a/src/parser/test/EventRequestParserTest.php +++ b/src/parser/test/EventRequestParserTest.php @@ -889,7 +889,7 @@ public function testParseEventRequest() $source = $event->getSource(); $this->assertEquals(12345678901234, $event->getTimestamp()); $this->assertEquals('active', $event->getMode()); - $this->assertTrue($source instanceOf UserSource); + $this->assertTrue($source instanceof UserSource); $this->assertEquals('userid', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -912,7 +912,7 @@ public function testParseEventRequest() // image $event = $events[1]; $source = $event->getSource(); - $this->assertTrue($source instanceOf GroupSource); + $this->assertTrue($source instanceof GroupSource); $this->assertEquals('groupid', $source->getGroupId()); $this->assertEquals(null, $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); @@ -944,7 +944,7 @@ public function testParseEventRequest() // audio (group event & it has user ID) $event = $events[2]; $source = $event->getSource(); - $this->assertTrue($source instanceOf GroupSource); + $this->assertTrue($source instanceof GroupSource); $this->assertEquals('groupid', $source->getGroupId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -967,7 +967,7 @@ public function testParseEventRequest() // video $event = $events[3]; $source = $event->getSource(); - $this->assertTrue($source instanceOf RoomSource); + $this->assertTrue($source instanceof RoomSource); $this->assertEquals('roomid', $source->getRoomId()); $this->assertEquals(null, $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); @@ -993,7 +993,7 @@ public function testParseEventRequest() // audio $event = $events[4]; $source = $event->getSource(); - $this->assertTrue($source instanceOf RoomSource); + $this->assertTrue($source instanceof RoomSource); $this->assertEquals('userid', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -1153,7 +1153,7 @@ public function testParseEventRequest() $this->assertEquals('bid', $event->getBeacon()->getHwid()); $this->assertEquals('enter', $event->getBeacon()->getType()); $this->assertEquals( - "1234567890abcdef", + "1234567890abcdef", $event->getBeacon()->getDm() ); } @@ -1171,7 +1171,7 @@ public function testParseEventRequest() $this->assertEquals('userid', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); - $this->assertEquals(true, $source instanceOf UserSource); + $this->assertEquals(true, $source instanceof UserSource); } { @@ -1371,7 +1371,7 @@ public function testParseEventRequest() $source = $event->getSource(); $this->assertEquals(12345678901234, $event->getTimestamp()); $this->assertEquals('active', $event->getMode()); - $this->assertTrue($source instanceOf UserSource); + $this->assertTrue($source instanceof UserSource); $this->assertEquals('userid', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -1415,7 +1415,7 @@ public function testParseEventRequest() $source = $event->getSource(); $this->assertEquals(1462629479859, $event->getTimestamp()); $this->assertEquals('active', $event->getMode()); - $this->assertTrue($source instanceOf UserSource); + $this->assertTrue($source instanceof UserSource); $this->assertEquals('U4af4980629...', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -1439,7 +1439,7 @@ public function testParseEventRequest() $source = $event->getSource(); $this->assertEquals(1462629479859, $event->getTimestamp()); $this->assertEquals('active', $event->getMode()); - $this->assertTrue($source instanceOf UserSource); + $this->assertTrue($source instanceof UserSource); $this->assertEquals('U0123456789abcd0123456789abcdef', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -1462,7 +1462,7 @@ public function testParseEventRequest() $source = $event->getSource(); $this->assertEquals(1462629479859, $event->getTimestamp()); $this->assertEquals('active', $event->getMode()); - $this->assertTrue($source instanceOf UserSource); + $this->assertTrue($source instanceof UserSource); $this->assertEquals('U0123456789abcd0123456789abcdef', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertFalse($event->getDeliveryContext()->getIsRedelivery()); @@ -1480,7 +1480,7 @@ public function testParseEventRequest() // Only included when multiple images are sent simultaneously. $event = $events[36]; $source = $event->getSource(); - $this->assertTrue($source instanceOf GroupSource); + $this->assertTrue($source instanceof GroupSource); $this->assertEquals('groupid', $source->getGroupId()); $this->assertEquals(null, $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); @@ -1507,7 +1507,7 @@ public function testParseEventRequest() // However, it won't be included if the sender is using LINE 11.15 or earlier for Android. $event = $events[37]; $source = $event->getSource(); - $this->assertTrue($source instanceOf GroupSource); + $this->assertTrue($source instanceof GroupSource); $this->assertEquals('groupid', $source->getGroupId()); $this->assertEquals(null, $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); @@ -1541,7 +1541,7 @@ public function testParseEventRequest() $source = $event->getSource(); $this->assertEquals(12345678901234, $event->getTimestamp()); $this->assertEquals('active', $event->getMode()); - $this->assertTrue($source instanceOf UserSource); + $this->assertTrue($source instanceof UserSource); $this->assertEquals('userid', $source->getUserId()); $this->assertEquals('testwebhookeventid', $event->getWebhookEventId()); $this->assertTrue($event->getDeliveryContext()->getIsRedelivery());