M2CE#34441: Fixed deprecated passing null to non-nullable arguments

andrewbess · andrewbess · commit bbbc1c8313f5 · 2021-11-29T19:08:38.000+02:00
diff --git a/library/Zend/Db/Adapter/Abstract.php b/library/Zend/Db/Adapter/Abstract.php
@@ -928,10 +928,12 @@ public function quote($value, $type = null)
      */
     public function quoteInto($text, $value, $type = null, $count = null)
     {
+        $quote = $this->quote($value, $type);
+
         if ($count === null) {
-            return str_replace('?', $this->quote($value, $type), $text);
+            return $quote !== null ? str_replace('?', $quote, $text) : $text;
         } else {
-            return implode($this->quote($value, $type), explode('?', $text, $count + 1));
+            return $quote !== null ? implode($quote, explode('?', $text, $count + 1)) : $text;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -928,10 +928,12 @@ public function quote($value, $type = null)`
`928`	`928`	`*/`
`929`	`929`	`public function quoteInto($text, $value, $type = null, $count = null)`
`930`	`930`	`{`
	`931`	`+ $quote = $this->quote($value, $type);`
	`932`	`+`
`931`	`933`	`if ($count === null) {`
`932`		`- return str_replace('?', $this->quote($value, $type), $text);`
	`934`	`+ return $quote !== null ? str_replace('?', $quote, $text) : $text;`
`933`	`935`	`} else {`
`934`		`- return implode($this->quote($value, $type), explode('?', $text, $count + 1));`
	`936`	`+ return $quote !== null ? implode($quote, explode('?', $text, $count + 1)) : $text;`
`935`	`937`	`}`
`936`	`938`	`}`
`937`	`939`