Merge branch 'master' into feature/php-8.1-fix-call-to-http_build-query

ramsey · web-flow · commit 3b140254d7b6 · 2021-11-29T21:27:15.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ testing/
 nbproject/private/
 test/log
 build
+/.phpunit.result.cache
diff --git a/src/Token/AccessTokenInterface.php b/src/Token/AccessTokenInterface.php
@@ -15,6 +15,7 @@
 namespace League\OAuth2\Client\Token;
 
 use JsonSerializable;
+use ReturnTypeWillChange;
 use RuntimeException;
 
 interface AccessTokenInterface extends JsonSerializable
@@ -68,5 +69,6 @@ public function __toString();
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize();
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`namespace League\OAuth2\Client\Token;`
`16`	`16`
`17`	`17`	`use JsonSerializable;`
	`18`	`+use ReturnTypeWillChange;`
`18`	`19`	`use RuntimeException;`
`19`	`20`
`20`	`21`	`interface AccessTokenInterface extends JsonSerializable`
`@@ -68,5 +69,6 @@ public function __toString();`
`68`	`69`	`*`
`69`	`70`	`* @return array`
`70`	`71`	`*/`
	`72`	`+ #[ReturnTypeWillChange]`
`71`	`73`	`public function jsonSerialize();`
`72`	`74`	`}`