Merge branch 'patch-1' of github.com:tigitz/safe into fsockopen

moufmouf · moufmouf · commit f8893773ec81 · 2019-01-23T17:41:07.000+01:00
diff --git a/lib/special_cases.php b/lib/special_cases.php
@@ -139,15 +139,14 @@ function apcu_fetch($key)
  * -1 (no limit).
  * @param int $count If specified, this variable will be filled with the number of
  * replacements done.
- * @return string|array|null preg_replace returns an array if the
+ * @return string|array preg_replace returns an array if the
  * subject parameter is an array, or a string
  * otherwise.
  *
  * If matches are found, the new subject will
  * be returned, otherwise subject will be
  * returned unchanged.
  *
- * Returns a file pointer resource on success, .
  * @throws PcreException
  *
  */

Original file line number	Diff line number	Diff line change
`@@ -139,15 +139,14 @@ function apcu_fetch($key)`
`139`	`139`	`* -1 (no limit).`
`140`	`140`	`* @param int $count If specified, this variable will be filled with the number of`
`141`	`141`	`* replacements done.`
`142`		`- * @return string\|array\|null preg_replace returns an array if the`
	`142`	`+ * @return string\|array preg_replace returns an array if the`
`143`	`143`	`* subject parameter is an array, or a string`
`144`	`144`	`* otherwise.`
`145`	`145`	`*`
`146`	`146`	`* If matches are found, the new subject will`
`147`	`147`	`* be returned, otherwise subject will be`
`148`	`148`	`* returned unchanged.`
`149`	`149`	`*`
`150`		`- * Returns a file pointer resource on success, .`
`151`	`150`	`* @throws PcreException`
`152`	`151`	`*`
`153`	`152`	`*/`