fix conflicts

taylorotwell · taylorotwell · commit 22f183f6da5f · 2025-02-18T09:38:29.000-06:00
diff --git a/Pipeline.php b/Pipeline.php
@@ -225,10 +225,12 @@ protected function carry()
      */
     protected function parsePipeString($pipe)
     {
-        [$name, $parameters] = array_pad(explode(':', $pipe, 2), 2, []);
+        [$name, $parameters] = array_pad(explode(':', $pipe, 2), 2, null);
 
-        if (is_string($parameters)) {
+        if (! is_null($parameters)) {
             $parameters = explode(',', $parameters);
+        } else {
+            $parameters = [];
         }
 
         return [$name, $parameters];

Original file line number	Diff line number	Diff line change
`@@ -225,10 +225,12 @@ protected function carry()`
`225`	`225`	`*/`
`226`	`226`	`protected function parsePipeString($pipe)`
`227`	`227`	`{`
`228`		`- [$name, $parameters] = array_pad(explode(':', $pipe, 2), 2, []);`
	`228`	`+ [$name, $parameters] = array_pad(explode(':', $pipe, 2), 2, null);`
`229`	`229`
`230`		`- if (is_string($parameters)) {`
	`230`	`+ if (! is_null($parameters)) {`
`231`	`231`	`$parameters = explode(',', $parameters);`
	`232`	`+ } else {`
	`233`	`+ $parameters = [];`
`232`	`234`	`}`
`233`	`235`
`234`	`236`	`return [$name, $parameters];`