Support phpstan 2.0 (#635)

eucyt · web-flow · commit ab044354acca · 2024-12-24T11:01:53.000+09:00
I made adjustments due to breaking changes in PHPStan 2.0. When the Suppress annotation contains a period, quotes are now required. phpstan/phpdoc-parser#256 close #622
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "orchestra/testbench": "*",
     "guzzlehttp/guzzle": "^7.3",
     "guzzlehttp/psr7": "^1.7 || ^2.0",
-    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan": "^2.0",
     "phpunit/phpunit": "^10.2"
   },
   "autoload": {
diff --git a/docs/classes/LINE-Laravel-Tests-Facades-FacadesTest.html b/docs/classes/LINE-Laravel-Tests-Facades-FacadesTest.html
@@ -167,7 +167,7 @@ <h5 class="phpdocumentor-tag-list__heading" id="tags">
                 </dt>
                 <dd class="phpdocumentor-tag-list__definition">
                                                                                 
-                                                 <section class="phpdocumentor-description"><p>(PHPMD.CouplingBetweenObjects)</p>
+                                                 <section class="phpdocumentor-description"><p>(&quot;PHPMD.CouplingBetweenObjects&quot;)</p>
 </section>
 
                                     </dd>
@@ -294,7 +294,7 @@ <h5 class="phpdocumentor-tag-list__heading" id="tags">
                 </dt>
                 <dd class="phpdocumentor-tag-list__definition">
                                                                                 
-                                                 <section class="phpdocumentor-description"><p>(PHPMD.UnusedFormalParameter)</p>
+                                                 <section class="phpdocumentor-description"><p>(&quot;PHPMD.UnusedFormalParameter&quot;)</p>
 </section>
 
                                     </dd>
@@ -352,7 +352,7 @@ <h5 class="phpdocumentor-tag-list__heading" id="tags">
                 </dt>
                 <dd class="phpdocumentor-tag-list__definition">
                                                                                 
-                                                 <section class="phpdocumentor-description"><p>(PHPMD.UnusedFormalParameter)</p>
+                                                 <section class="phpdocumentor-description"><p>(&quot;PHPMD.UnusedFormalParameter&quot;)</p>
 </section>
 
                                     </dd>
@@ -410,7 +410,7 @@ <h5 class="phpdocumentor-tag-list__heading" id="tags">
                 </dt>
                 <dd class="phpdocumentor-tag-list__definition">
                                                                                 
-                                                 <section class="phpdocumentor-description"><p>(PHPMD.UnusedFormalParameter)</p>
+                                                 <section class="phpdocumentor-description"><p>(&quot;PHPMD.UnusedFormalParameter&quot;)</p>
 </section>
 
                                     </dd>
diff --git a/docs/classes/LINE-Parser-EventRequestParser.html b/docs/classes/LINE-Parser-EventRequestParser.html
@@ -162,7 +162,7 @@ <h5 class="phpdocumentor-tag-list__heading" id="tags">
                 </dt>
                 <dd class="phpdocumentor-tag-list__definition">
                                                                                 
-                                                 <section class="phpdocumentor-description"><p>(PHPMD.CouplingBetweenObjects)</p>
+                                                 <section class="phpdocumentor-description"><p>(&quot;PHPMD.CouplingBetweenObjects&quot;)</p>
 </section>
 
                                     </dd>
diff --git a/docs/classes/LINE-Parser-Tests-EventRequestParserTest.html b/docs/classes/LINE-Parser-Tests-EventRequestParserTest.html
@@ -1223,7 +1223,7 @@ <h4 class="phpdocumentor-element__name" id="method_getSignature">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/parser/test/EventRequestParserTest.php"><a href="files/src-parser-test-eventrequestparsertest.html"><abbr title="src/parser/test/EventRequestParserTest.php">EventRequestParserTest.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">1715</span>
+    <span class="phpdocumentor-element-found-in__line">1714</span>
 
     </aside>
 
diff --git a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleRestaurant.php b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleRestaurant.php
@@ -49,7 +49,7 @@
 use LINE\Constants\MessageType;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class FlexSampleRestaurant
 {
diff --git a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleShopping.php b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/Flex/FlexSampleShopping.php
@@ -43,7 +43,7 @@
 use LINE\Constants\MessageType;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class FlexSampleShopping
 {
diff --git a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/ImageMessageHandler.php b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/ImageMessageHandler.php
@@ -30,7 +30,7 @@
 use LINE\Webhook\Model\MessageEvent;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class ImageMessageHandler implements EventHandler
 {
diff --git a/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/TextMessageHandler.php b/examples/KitchenSink/src/LINEBot/KitchenSink/EventHandler/MessageHandler/TextMessageHandler.php
@@ -57,9 +57,9 @@
 use LINE\Webhook\Model\TextMessageContent;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
+ * @SuppressWarnings("PHPMD.CyclomaticComplexity")
+ * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
  */
 class TextMessageHandler implements EventHandler
 {
diff --git a/src/laravel/test/Facades/FacadesTest.php b/src/laravel/test/Facades/FacadesTest.php
@@ -19,14 +19,14 @@
 namespace LINE\Laravel\Tests\Facades;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class FacadesTest extends \Orchestra\Testbench\TestCase
 {
     /**
      * Load package service provider
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      * @param  \Illuminate\Foundation\Application $app
      * @return array
      */
@@ -38,7 +38,7 @@ protected function getPackageProviders($app)
     /**
      * Load package alias
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      * @param  \Illuminate\Foundation\Application $app
      * @return array
      */
@@ -69,7 +69,7 @@ public function testConfigLoaded()
     /**
      * Testing LINEBot facade instance
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      * @return void
      */
     public function testLINEBotFacadeInstance()
diff --git a/src/parser/lib/EventRequestParser.php b/src/parser/lib/EventRequestParser.php
@@ -44,7 +44,7 @@
 use LINE\Webhook\Model\UserMentionee;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class EventRequestParser
 {
diff --git a/src/parser/test/EventRequestParserTest.php b/src/parser/test/EventRequestParserTest.php
@@ -1234,11 +1234,10 @@ public function testParseEventRequest()
             $this->assertEquals('__unknown__', $event->jsonSerialize()->type); // with unprocessed event body
             $this->assertEquals(12345678901234, $event->getTimestamp());
             $this->assertEquals('active', $event->getMode());
-            $this->assertTrue($source instanceof UserSource);
+            $this->assertInstanceOf(UserSource::class, $source);
             $this->assertEquals('userid', $source->getUserId());
             $this->assertEquals('testwebhookeventid', $event->getWebhookEventId());
             $this->assertFalse($event->getDeliveryContext()->getIsRedelivery());
-            $this->assertEquals(true, $source instanceof UserSource);
         }
 
         {

Original file line number	Diff line number	Diff line change
`@@ -1223,7 +1223,7 @@ <h4 class="phpdocumentor-element__name" id="method_getSignature">`
`1223`	`1223`	`<aside class="phpdocumentor-element-found-in">`
`1224`	`1224`	`<abbr class="phpdocumentor-element-found-in__file" title="src/parser/test/EventRequestParserTest.php"><a href="files/src-parser-test-eventrequestparsertest.html"><abbr title="src/parser/test/EventRequestParserTest.php">EventRequestParserTest.php</abbr></a></abbr>`
`1225`	`1225`	`:`
`1226`		`- <span class="phpdocumentor-element-found-in__line">1715</span>`
	`1226`	`+ <span class="phpdocumentor-element-found-in__line">1714</span>`
`1227`	`1227`
`1228`	`1228`	`</aside>`
`1229`	`1229`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`use LINE\Constants\MessageType;`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`52`	`+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")`
`53`	`53`	`*/`
`54`	`54`	`class FlexSampleRestaurant`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`use LINE\Constants\MessageType;`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`46`	`+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")`
`47`	`47`	`*/`
`48`	`48`	`class FlexSampleShopping`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`use LINE\Webhook\Model\MessageEvent;`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`33`	`+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")`
`34`	`34`	`*/`
`35`	`35`	`class ImageMessageHandler implements EventHandler`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`use LINE\Webhook\Model\UserMentionee;`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`47`	`+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")`
`48`	`48`	`*/`
`49`	`49`	`class EventRequestParser`
`50`	`50`	`{`