Merge pull request #809 from drecken/v3

freekmurze · web-flow · commit 4510ac8a4506 · 2022-08-30T08:53:23.000+02:00
PHP 8.1 Support
diff --git a/src/QueryBuilderRequest.php b/src/QueryBuilderRequest.php
@@ -38,7 +38,7 @@ public function includes(): Collection
 
         $includeParts = $this->getRequestData($includeParameterName);
 
-        if (! is_array($includeParts)) {
+        if (is_string($includeParts)) {
             $includeParts = explode(static::getIncludesArrayValueDelimiter(), $this->getRequestData($includeParameterName));
         }
 
@@ -53,7 +53,7 @@ public function appends(): Collection
 
         $appendParts = $this->getRequestData($appendParameterName);
 
-        if (! is_array($appendParts)) {
+        if (! is_array($appendParts) && ! is_null($appendParts)) {
             $appendParts = explode(static::getAppendsArrayValueDelimiter(), $appendParts);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function includes(): Collection`
`38`	`38`
`39`	`39`	`$includeParts = $this->getRequestData($includeParameterName);`
`40`	`40`
`41`		`- if (! is_array($includeParts)) {`
	`41`	`+ if (is_string($includeParts)) {`
`42`	`42`	`$includeParts = explode(static::getIncludesArrayValueDelimiter(), $this->getRequestData($includeParameterName));`
`43`	`43`	`}`
`44`	`44`
`@@ -53,7 +53,7 @@ public function appends(): Collection`
`53`	`53`
`54`	`54`	`$appendParts = $this->getRequestData($appendParameterName);`
`55`	`55`
`56`		`- if (! is_array($appendParts)) {`
	`56`	`+ if (! is_array($appendParts) && ! is_null($appendParts)) {`
`57`	`57`	`$appendParts = explode(static::getAppendsArrayValueDelimiter(), $appendParts);`
`58`	`58`	`}`
`59`	`59`