Merge conflict

moufmouf · moufmouf · commit 714820161d69 · 2020-01-02T15:08:11.000+01:00
diff --git a/src/Rules/UseSafeFunctionsRule.php b/src/Rules/UseSafeFunctionsRule.php
@@ -15,7 +15,7 @@
 use PhpParser\Node\Scalar;
 
 /**
- * This rule checks that no superglobals are used in code.
+ * This rule checks that no "unsafe" functions are used in code.
  *
  * @implements Rule<Node\Expr\FuncCall>
  */

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use PhpParser\Node\Scalar;`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * This rule checks that no superglobals are used in code.`
	`18`	`+ * This rule checks that no "unsafe" functions are used in code.`
`19`	`19`	`*`
`20`	`20`	`* @implements Rule<Node\Expr\FuncCall>`
`21`	`21`	`*/`