Page MenuHomePhabricator
Files F14844539

D13275.diff
No OneTemporary
Actions

D13275.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_EXTENDS_PHOBJECT = 6;
private $deprecatedFunctions = array();
private $dynamicStringFunctions = array();
@@ -23,14 +24,16 @@
public function getLintNameMap() {
return array(
- self::LINT_ARRAY_COMBINE => pht(
- '%s Unreliable', 'array_combine()'),
- self::LINT_DEPRECATED_FUNCTION => pht(
- 'Use of Deprecated Function'),
- self::LINT_UNSAFE_DYNAMIC_STRING => pht(
- 'Unsafe Usage of Dynamic String'),
- self::LINT_RAGGED_CLASSTREE_EDGE => pht(
- 'Class Not %s Or %s', 'abstract', 'final'),
+ self::LINT_ARRAY_COMBINE =>
+ pht('%s Unreliable', 'array_combine()'),
+ self::LINT_DEPRECATED_FUNCTION =>
+ pht('Use of Deprecated Function'),
+ self::LINT_UNSAFE_DYNAMIC_STRING =>
+ pht('Unsafe Usage of Dynamic String'),
+ self::LINT_RAGGED_CLASSTREE_EDGE =>
+ pht('Class Not %s Or %s', 'abstract', 'final'),
+ self::LINT_EXTENDS_PHOBJECT =>
+ pht('Class Not Extending %s', 'Phobject'),
);
}
@@ -43,6 +46,7 @@
}
public function getLintSeverityMap() {
+ $advice = ArcanistLintSeverity::SEVERITY_ADVICE;
$warning = ArcanistLintSeverity::SEVERITY_WARNING;
return array(
@@ -50,6 +54,7 @@
self::LINT_DEPRECATED_FUNCTION => $warning,
self::LINT_UNSAFE_DYNAMIC_STRING => $warning,
self::LINT_RAGGED_CLASSTREE_EDGE => $warning,
+ self::LINT_EXTENDS_PHOBJECT => $advice,
);
}
@@ -112,6 +117,7 @@
'lintUnsafeDynamicString' => self::LINT_UNSAFE_DYNAMIC_STRING,
'lintDeprecatedFunctions' => self::LINT_DEPRECATED_FUNCTION,
'lintRaggedClasstreeEdges' => self::LINT_RAGGED_CLASSTREE_EDGE,
+ 'lintClassExtendsPhobject' => self::LINT_EXTENDS_PHOBJECT,
);
foreach ($method_codes as $method => $codes) {
@@ -302,4 +308,29 @@
}
}
+ private function lintClassExtendsPhobject(XHPASTNode $root) {
+ $classes = $root->selectDescendantsOfType('n_CLASS_DECLARATION');
+
+ foreach ($classes as $class) {
+ // TODO: This doesn't quite work for namespaced classes (see T8534).
+ $name = $class->getChildOfType(1, 'n_CLASS_NAME');
+ $extends = $class->getChildByIndex(2);
+
+ if ($name->getConcreteString() == 'Phobject') {
+ continue;
+ }
+
+ if ($extends->getTypeName() == 'n_EMPTY') {
+ $this->raiseLintAtNode(
+ $class,
+ self::LINT_EXTENDS_PHOBJECT,
+ pht(
+ 'Classes should extend from %s or from some other class. '.
+ 'All classes (except for %s itself) should have a base class.',
+ 'Phobject',
+ 'Phobject'));
+ }
+ }
+ }
+
}
diff --git a/src/lint/linter/__tests__/phlxhp/extends-phobject.lint-test b/src/lint/linter/__tests__/phlxhp/extends-phobject.lint-test
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/__tests__/phlxhp/extends-phobject.lint-test
@@ -0,0 +1,7 @@
+<?php
+
+abstract class A extends Phobject {}
+final class B extends A {}
+final class C {}
+~~~~~~~~~~
+advice:5:1
diff --git a/src/lint/linter/__tests__/phlxhp/ragged-classtree-edges.lint-test b/src/lint/linter/__tests__/phlxhp/ragged-classtree-edges.lint-test
--- a/src/lint/linter/__tests__/phlxhp/ragged-classtree-edges.lint-test
+++ b/src/lint/linter/__tests__/phlxhp/ragged-classtree-edges.lint-test
@@ -1,12 +1,12 @@
<?php
-class A { }
-abstract class B { }
-final class C { }
+class A extends Phobject {}
+abstract class B extends Phobject {}
+final class C extends Phobject {}
/**
* @concrete-extensible
*/
-class D { }
+class D extends Phobject {}
~~~~~~~~~~
warning:3:7

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 3, 4:30 PM (18 h, 52 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7085002
Default Alt Text
D13275.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility