Merge branch '1.x' into 2.x

fabpot · fabpot · commit cc6f511765ab · 2022-01-19T09:20:47.000+01:00
* 1.x:
  ReturnTypeWillChange to surpress PHP8.1 Deprecation notice.
  Remove unecessary files from archive
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,7 @@
+/.github export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/.php_cs.dist export-ignore
 /.travis.yml export-ignore
 /phpunit.xml.dist export-ignore
 /tests export-ignore
diff --git a/src/Response.php b/src/Response.php
@@ -65,6 +65,7 @@ public static function fromJson(array $json): self
         return $response;
     }
 
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return ['body' => $this->body, 'headers' => $this->headers];

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public static function fromJson(array $json): self`
`65`	`65`	`return $response;`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ #[\ReturnTypeWillChange]`
`68`	`69`	`public function jsonSerialize()`
`69`	`70`	`{`
`70`	`71`	`return ['body' => $this->body, 'headers' => $this->headers];`