Merge remote-tracking branch 'upstream/develop'

dereuromark · dereuromark · commit 1ee395a997ea · 2022-11-15T23:40:37.000+01:00
# Conflicts:
#	.github/workflows/ci.yml
diff --git a/src/ImageVariantCollection.php b/src/ImageVariantCollection.php
@@ -157,7 +157,7 @@ public function remove(string $name): void
     /**
      * @inheritDoc
      */
-    public function jsonSerialize(): mixed
+    public function jsonSerialize(): array
     {
         return $this->toArray();
     }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function remove(string $name): void`
`157`	`157`	`/**`
`158`	`158`	`* @inheritDoc`
`159`	`159`	`*/`
`160`		`- public function jsonSerialize(): mixed`
	`160`	`+ public function jsonSerialize(): array`
`161`	`161`	`{`
`162`	`162`	`return $this->toArray();`
`163`	`163`	`}`