Page MenuHomePhabricator
Files F15384847

D12386.id29730.diff
No OneTemporary
Actions

D12386.id29730.diff
View Options

diff --git a/src/error/PhutilErrorHandler.php b/src/error/PhutilErrorHandler.php
--- a/src/error/PhutilErrorHandler.php
+++ b/src/error/PhutilErrorHandler.php
@@ -349,7 +349,7 @@
$timestamp = strftime('%Y-%m-%d %H:%M:%S');
switch ($event) {
- case PhutilErrorHandler::ERROR:
+ case self::ERROR:
$default_message = sprintf(
'[%s] ERROR %d: %s at [%s:%d]',
$timestamp,
@@ -362,7 +362,7 @@
error_log($default_message);
self::outputStacktrace($metadata['trace']);
break;
- case PhutilErrorHandler::EXCEPTION:
+ case self::EXCEPTION:
$messages = array();
$current = $value;
do {
@@ -385,7 +385,7 @@
error_log($default_message);
self::outputStacktrace(self::getRootException($value)->getTrace());
break;
- case PhutilErrorHandler::PHLOG:
+ case self::PHLOG:
$default_message = sprintf(
'[%s] PHLOG: %s at [%s:%d]',
$timestamp,
@@ -396,7 +396,7 @@
$metadata['default_message'] = $default_message;
error_log($default_message);
break;
- case PhutilErrorHandler::DEPRECATED:
+ case self::DEPRECATED:
$default_message = sprintf(
'[%s] DEPRECATED: %s is deprecated; %s',
$timestamp,
diff --git a/src/filesystem/Filesystem.php b/src/filesystem/Filesystem.php
--- a/src/filesystem/Filesystem.php
+++ b/src/filesystem/Filesystem.php
@@ -170,7 +170,7 @@
* @task file
*/
public static function writeUniqueFile($base, $data) {
- $full_path = Filesystem::resolvePath($base);
+ $full_path = self::resolvePath($base);
$sequence = 0;
assert_stringlike($data);
// Try 'file', 'file.1', 'file.2', etc., until something doesn't exist.
@@ -308,7 +308,7 @@
*/
private static function executeRemovePath($path) {
if (is_dir($path) && !is_link($path)) {
- foreach (Filesystem::listDirectory($path, true) as $child) {
+ foreach (self::listDirectory($path, true) as $child) {
self::executeRemovePath($path.DIRECTORY_SEPARATOR.$child);
}
$ok = rmdir($path);
@@ -599,7 +599,7 @@
if (is_dir($path)) {
if ($umask) {
- Filesystem::changePermissions($path, $umask);
+ self::changePermissions($path, $umask);
}
return $path;
}
@@ -628,7 +628,7 @@
// the process's umask in the usual way: the permissions of the created
// directory are (mode & ~umask & 0777)."'
if ($umask) {
- Filesystem::changePermissions($path, $umask);
+ self::changePermissions($path, $umask);
}
return $path;
@@ -914,8 +914,8 @@
// If `where %s` could not find anything, check for relative binary
if ($err) {
- $path = Filesystem::resolvePath($binary);
- if (Filesystem::pathExists($path)) {
+ $path = self::resolvePath($binary);
+ if (self::pathExists($path)) {
return $path;
}
return null;
@@ -942,8 +942,8 @@
* @task path
*/
public static function pathsAreEquivalent($u, $v) {
- $u = Filesystem::resolvePath($u);
- $v = Filesystem::resolvePath($v);
+ $u = self::resolvePath($u);
+ $v = self::resolvePath($v);
$real_u = realpath($u);
$real_v = realpath($v);
diff --git a/src/parser/aast/api/AASTNodeList.php b/src/parser/aast/api/AASTNodeList.php
--- a/src/parser/aast/api/AASTNodeList.php
+++ b/src/parser/aast/api/AASTNodeList.php
@@ -10,7 +10,7 @@
protected function __construct() {}
protected function newList(array $nodes) {
- return AASTNodeList::newFromTreeAndNodes($this->tree, $nodes);
+ return self::newFromTreeAndNodes($this->tree, $nodes);
}
public function selectDescendantsOfType($type_name) {
diff --git a/src/parser/argument/PhutilArgumentSpecification.php b/src/parser/argument/PhutilArgumentSpecification.php
--- a/src/parser/argument/PhutilArgumentSpecification.php
+++ b/src/parser/argument/PhutilArgumentSpecification.php
@@ -102,7 +102,7 @@
public static function newSpecsFromList(array $specs) {
foreach ($specs as $key => $spec) {
if (is_array($spec)) {
- $specs[$key] = PhutilArgumentSpecification::newQuickSpec(
+ $specs[$key] = self::newQuickSpec(
$spec);
}
}
diff --git a/src/parser/xhpast/api/XHPASTTree.php b/src/parser/xhpast/api/XHPASTTree.php
--- a/src/parser/xhpast/api/XHPASTTree.php
+++ b/src/parser/xhpast/api/XHPASTTree.php
@@ -27,7 +27,7 @@
public static function newStatementFromString($string) {
$string = '<?php '.rtrim($string, ';').";\n";
- $tree = XHPASTTree::newFromData($string);
+ $tree = self::newFromData($string);
$statements = $tree->getRootNode()->selectDescendantsOfType('n_STATEMENT');
if (count($statements) != 1) {
throw new Exception(
diff --git a/src/serviceprofiler/PhutilServiceProfiler.php b/src/serviceprofiler/PhutilServiceProfiler.php
--- a/src/serviceprofiler/PhutilServiceProfiler.php
+++ b/src/serviceprofiler/PhutilServiceProfiler.php
@@ -57,7 +57,7 @@
}
public static function installEchoListener() {
- $instance = PhutilServiceProfiler::getInstance();
+ $instance = self::getInstance();
$instance->addListener(array('PhutilServiceProfiler', 'echoListener'));
}
diff --git a/src/utils/viewutils.php b/src/utils/viewutils.php
--- a/src/utils/viewutils.php
+++ b/src/utils/viewutils.php
@@ -60,7 +60,7 @@
$remainder);
$duration = $remainder;
$this_level++;
- };
+ }
if ($is_negative) {
$detailed_relative_time .= ' ago';

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 9:00 PM (3 d, 10 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7703654
Default Alt Text
D12386.id29730.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility