Page MenuHomePhabricator
Files F15466442

D11661.id28067.diff
No OneTemporary
Actions

D11661.id28067.diff
View Options

diff --git a/src/lint/linter/ArcanistPhutilXHPASTLinter.php b/src/lint/linter/ArcanistPhutilXHPASTLinter.php
--- a/src/lint/linter/ArcanistPhutilXHPASTLinter.php
+++ b/src/lint/linter/ArcanistPhutilXHPASTLinter.php
@@ -6,6 +6,7 @@
const LINT_DEPRECATED_FUNCTION = 3;
const LINT_UNSAFE_DYNAMIC_STRING = 4;
const LINT_RAGGED_CLASSTREE_EDGE = 5;
+ const LINT_FORMATTED_STRING = 6;
private $deprecatedFunctions = array();
private $dynamicStringFunctions = array();
@@ -49,6 +50,7 @@
'Class Not %s Or %s',
'abstract',
'final'),
+ self::LINT_FORMATTED_STRING => pht('Formatted String'),
);
}
@@ -128,6 +130,7 @@
'lintUnsafeDynamicString' => self::LINT_UNSAFE_DYNAMIC_STRING,
'lintDeprecatedFunctions' => self::LINT_DEPRECATED_FUNCTION,
'lintRaggedClasstreeEdges' => self::LINT_RAGGED_CLASSTREE_EDGE,
+ 'lintFormattedString' => self::LINT_FORMATTED_STRING,
);
foreach ($method_codes as $method => $codes) {
@@ -297,4 +300,71 @@
}
}
+ private function lintFormattedString(XHPASTNode $root) {
+ static $functions = array(
+ // TODO: This is duplicated from `lintUnsafeDynamicString`.
+ 'pht' => 0,
+
+ 'hsprintf' => 0,
+ 'jsprintf' => 0,
+
+ 'hgsprintf' => 0,
+
+ 'csprintf' => 0,
+ 'vcsprintf' => 0,
+ 'execx' => 0,
+ 'exec_manual' => 0,
+ 'phutil_passthru' => 0,
+
+ 'qsprintf' => 1,
+ 'vqsprintf' => 1,
+ 'queryfx' => 1,
+ 'vqueryfx' => 1,
+ 'queryfx_all' => 1,
+ 'vqueryfx_all' => 1,
+ 'queryfx_one' => 1,
+ );
+
+ $function_calls = $root->selectDescendantsOfType('n_FUNCTION_CALL');
+
+ foreach ($function_calls as $call) {
+ $name = $call->getChildByIndex(0)->getConcreteString();
+
+ $name = strtolower($name);
+ $start = idx($functions, $name);
+
+ if ($start === null) {
+ continue;
+ }
+
+ $parameters = $call->getChildOfType(1, 'n_CALL_PARAMETER_LIST');
+ $argc = count($parameters->getChildren()) - $start;
+
+ if ($argc < 1) {
+ continue;
+ }
+
+ $format = $parameters->getChildByIndex($start);
+ if ($format->getTypeName() != 'n_STRING_SCALAR') {
+ continue;
+ }
+
+ $argv = array($format->evalStatic()) + array_fill(0, $argc, null);
+
+ try {
+ xsprintf(array($this, 'xsprintfCallback'), null, $argv);
+ } catch (BadFunctionCallException $ex) {
+ $this->raiseLintAtNode(
+ $call,
+ self::LINT_FORMATTED_STRING,
+ $ex->getMessage());
+ }
+ }
+ }
+
+ public function xsprintfCallback() {
+ // TODO: Can we just pass a dummy callback to `xsprintf`?
+ // Empty
+ }
+
}
diff --git a/src/lint/linter/__tests__/phlxhp/formatted-string.lint-test b/src/lint/linter/__tests__/phlxhp/formatted-string.lint-test
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/__tests__/phlxhp/formatted-string.lint-test
@@ -0,0 +1,15 @@
+<?php
+pht();
+pht(null);
+pht('');
+
+csprintf('%s');
+execx('%s', 'foo', 'bar');
+
+qsprintf(null, 'x');
+qsprintf(null, 'x', 'y');
+~~~~~~~~~~
+warning:3:1
+error:6:1
+error:7:1
+error:10:1

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 4, 5:34 AM (1 d, 8 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7731431
Default Alt Text
D11661.id28067.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility