Page MenuHomePhabricator
Files F14096808

D14633.diff
No OneTemporary
Actions

D14633.diff
View Options

diff --git a/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php
--- a/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php
@@ -46,7 +46,7 @@
$this->raiseLintAtNode(
$decl_name,
pht(
- "The name of this file differs from the name of the ".
+ 'The name of this file differs from the name of the '.
'class or interface it declares. Rename the file to `%s`.',
$rename));
}
diff --git a/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php
--- a/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php
@@ -193,7 +193,7 @@
'This `%s` or `%s` has a nonempty block which does not end '.
'with `%s`, `%s`, `%s`, `%s` or `%s`. Did you forget to add '.
'one of those? If you intend to fall through, add a `%s` '.
- "comment to silence this warning.",
+ 'comment to silence this warning.',
'case',
'default',
'break',
diff --git a/src/parser/ArcanistBaseCommitParser.php b/src/parser/ArcanistBaseCommitParser.php
--- a/src/parser/ArcanistBaseCommitParser.php
+++ b/src/parser/ArcanistBaseCommitParser.php
@@ -8,7 +8,6 @@
public function __construct(ArcanistRepositoryAPI $api) {
$this->api = $api;
- return $this;
}
private function tokenizeBaseCommitSpecification($raw_spec) {
diff --git a/src/repository/api/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php
--- a/src/repository/api/ArcanistMercurialAPI.php
+++ b/src/repository/api/ArcanistMercurialAPI.php
@@ -360,7 +360,7 @@
$working_status = ArcanistMercurialParser::parseMercurialStatus($stdout);
foreach ($working_status as $path => $mask) {
- if (!($mask & ArcanistRepositoryAPI::FLAG_UNTRACKED)) {
+ if (!($mask & parent::FLAG_UNTRACKED)) {
// Mark tracked files as uncommitted.
$mask |= self::FLAG_UNCOMMITTED;
}
diff --git a/src/repository/api/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php
--- a/src/repository/api/ArcanistSubversionAPI.php
+++ b/src/repository/api/ArcanistSubversionAPI.php
@@ -139,7 +139,7 @@
$status = $this->svnStatus;
if (!$with_externals) {
foreach ($status as $path => $mask) {
- if ($mask & ArcanistRepositoryAPI::FLAG_EXTERNALS) {
+ if ($mask & parent::FLAG_EXTERNALS) {
unset($status[$path]);
}
}
@@ -384,7 +384,7 @@
$status = $status[$path];
// Build meaningful diff text for "svn copy" operations.
- if ($status & ArcanistRepositoryAPI::FLAG_ADDED) {
+ if ($status & parent::FLAG_ADDED) {
$info = $this->getSVNInfo($path);
if (!empty($info['Copied From URL'])) {
return $this->buildSyntheticAdditionDiff(
@@ -403,7 +403,7 @@
if (preg_match('/\.(gif|png|jpe?g|swf|pdf|ico)$/i', $path, $matches)) {
// Check if the file is deleted first; SVN will complain if we try to
// get properties of a deleted file.
- if ($status & ArcanistRepositoryAPI::FLAG_DELETED) {
+ if ($status & parent::FLAG_DELETED) {
return <<<EODIFF
Index: {$path}
===================================================================
diff --git a/src/unit/engine/NoseTestEngine.php b/src/unit/engine/NoseTestEngine.php
--- a/src/unit/engine/NoseTestEngine.php
+++ b/src/unit/engine/NoseTestEngine.php
@@ -139,14 +139,14 @@
for ($ii = 0; $ii < $lines->length; $ii++) {
$line = $lines->item($ii);
- $next_line = intval($line->getAttribute('number'));
+ $next_line = (int)$line->getAttribute('number');
for ($start_line; $start_line < $next_line; $start_line++) {
$coverage .= 'N';
}
- if (intval($line->getAttribute('hits')) == 0) {
+ if ((int)$line->getAttribute('hits') == 0) {
$coverage .= 'U';
- } else if (intval($line->getAttribute('hits')) > 0) {
+ } else if ((int)$line->getAttribute('hits') > 0) {
$coverage .= 'C';
}
diff --git a/src/unit/engine/PytestTestEngine.php b/src/unit/engine/PytestTestEngine.php
--- a/src/unit/engine/PytestTestEngine.php
+++ b/src/unit/engine/PytestTestEngine.php
@@ -116,14 +116,14 @@
for ($ii = 0; $ii < $lines->length; $ii++) {
$line = $lines->item($ii);
- $next_line = intval($line->getAttribute('number'));
+ $next_line = (int)$line->getAttribute('number');
for ($start_line; $start_line < $next_line; $start_line++) {
$coverage .= 'N';
}
- if (intval($line->getAttribute('hits')) == 0) {
+ if ((int)$line->getAttribute('hits') == 0) {
$coverage .= 'U';
- } else if (intval($line->getAttribute('hits')) > 0) {
+ } else if ((int)$line->getAttribute('hits') > 0) {
$coverage .= 'C';
}
diff --git a/src/workflow/ArcanistFlagWorkflow.php b/src/workflow/ArcanistFlagWorkflow.php
--- a/src/workflow/ArcanistFlagWorkflow.php
+++ b/src/workflow/ArcanistFlagWorkflow.php
@@ -14,14 +14,30 @@
);
private static $colorSpec = array(
- 'red' => 0, 'r' => 0, 0 => 0,
- 'orange' => 1, 'o' => 1, 1 => 1,
- 'yellow' => 2, 'y' => 2, 2 => 2,
- 'green' => 3, 'g' => 3, 3 => 3,
- 'blue' => 4, 'b' => 4, 4 => 4,
- 'pink' => 5, 'p' => 5, 5 => 5,
- 'purple' => 6, 'v' => 6, 6 => 6,
- 'checkered' => 7, 'c' => 7, 7 => 7,
+ 'red' => 0,
+ 'r' => 0,
+ 0 => 0,
+ 'orange' => 1,
+ 'o' => 1,
+ 1 => 1,
+ 'yellow' => 2,
+ 'y' => 2,
+ 2 => 2,
+ 'green' => 3,
+ 'g' => 3,
+ 3 => 3,
+ 'blue' => 4,
+ 'b' => 4,
+ 4 => 4,
+ 'pink' => 5,
+ 'p' => 5,
+ 5 => 5,
+ 'purple' => 6,
+ 'v' => 6,
+ 6 => 6,
+ 'checkered' => 7,
+ 'c' => 7,
+ 7 => 7,
);
public function getWorkflowName() {

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 5:24 AM (20 h, 39 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6792066
Default Alt Text
D14633.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility