1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 00:32:41 +01:00

Add a linter rule for newlines after PHP open tags

Summary: `<?php\n\n...` is much easier to read than `<?php\n...`. Depends on D13889 and D13890.

Test Plan: Added unit tests.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13534
This commit is contained in:
Joshua Spence 2015-08-31 06:49:29 +10:00 committed by Joshua Spence
parent 10f9c460fa
commit a5304e472d
58 changed files with 327 additions and 190 deletions

View file

@ -171,6 +171,7 @@ phutil_register_library_map(array(
'ArcanistMissingLinterException' => 'lint/linter/exception/ArcanistMissingLinterException.php', 'ArcanistMissingLinterException' => 'lint/linter/exception/ArcanistMissingLinterException.php',
'ArcanistModifierOrderingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistModifierOrderingXHPASTLinterRule.php', 'ArcanistModifierOrderingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistModifierOrderingXHPASTLinterRule.php',
'ArcanistNamingConventionsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php', 'ArcanistNamingConventionsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php',
'ArcanistNewlineAfterOpenTagXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNewlineAfterOpenTagXHPASTLinterRule.php',
'ArcanistNoEffectException' => 'exception/usage/ArcanistNoEffectException.php', 'ArcanistNoEffectException' => 'exception/usage/ArcanistNoEffectException.php',
'ArcanistNoEngineException' => 'exception/usage/ArcanistNoEngineException.php', 'ArcanistNoEngineException' => 'exception/usage/ArcanistNoEngineException.php',
'ArcanistNoLintLinter' => 'lint/linter/ArcanistNoLintLinter.php', 'ArcanistNoLintLinter' => 'lint/linter/ArcanistNoLintLinter.php',
@ -455,6 +456,7 @@ phutil_register_library_map(array(
'ArcanistMissingLinterException' => 'Exception', 'ArcanistMissingLinterException' => 'Exception',
'ArcanistModifierOrderingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule', 'ArcanistModifierOrderingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistNamingConventionsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule', 'ArcanistNamingConventionsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistNewlineAfterOpenTagXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistNoEffectException' => 'ArcanistUsageException', 'ArcanistNoEffectException' => 'ArcanistUsageException',
'ArcanistNoEngineException' => 'ArcanistUsageException', 'ArcanistNoEngineException' => 'ArcanistUsageException',
'ArcanistNoLintLinter' => 'ArcanistLinter', 'ArcanistNoLintLinter' => 'ArcanistLinter',

View file

@ -1,4 +1,5 @@
<?php <?php
array(1, 2, 3); array(1, 2, 3);
array(1, 2, 3,); array(1, 2, 3,);
array( array(
@ -33,14 +34,15 @@ array(
2, 2,
3, /* comment */ ); 3, /* comment */ );
~~~~~~~~~~ ~~~~~~~~~~
advice:3:14 advice:4:14
advice:12:3 advice:13:3
advice:16:3 advice:17:3
advice:26:3 advice:27:3
advice:30:3 advice:31:3
advice:34:20 advice:35:20
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
array(1, 2, 3); array(1, 2, 3);
array(1, 2, 3); array(1, 2, 3);
array( array(

View file

@ -1,15 +1,17 @@
<?php <?php
$a []= 1; $a []= 1;
$a[] = 1; $a[] = 1;
$a[]=1; $a[]=1;
$a [] = 1; $a [] = 1;
~~~~~~~~~~ ~~~~~~~~~~
warning:2:3 warning:3:3
warning:2:6 warning:3:6
warning:4:5 warning:5:5
warning:5:3 warning:6:3
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
$a[] = 1; $a[] = 1;
$a[] = 1; $a[] = 1;
$a[] = 1; $a[] = 1;

View file

@ -1,7 +1,8 @@
<?php <?php
eval('evil code'); eval('evil code');
~~~~~~~~~~ ~~~~~~~~~~
error:2:1 error:3:1
~~~~~~~~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~
{ {

View file

@ -1,4 +1,5 @@
<?php <?php
class MyClass { class MyClass {
public function myfunc($var) { public function myfunc($var) {
echo $var; echo $var;
@ -24,10 +25,10 @@ $foo(&$myvar);
array_walk(array(), function () use (&$x) {}); array_walk(array(), function () use (&$x) {});
MyClass::myfunc(array(&$x, &$y)); MyClass::myfunc(array(&$x, &$y));
~~~~~~~~~~ ~~~~~~~~~~
error:2:7 XHP19 error:3:7 XHP19
error:9:8 error:10:8
error:12:15 error:13:15
error:15:17 error:16:17
error:18:24 error:19:24
error:18:39 error:19:39
error:22:6 error:23:6

View file

@ -1,12 +1,14 @@
<?php <?php
echo (double)0; echo (double)0;
echo (int) 1; echo (int) 1;
echo (string) 2; echo (string) 2;
~~~~~~~~~~ ~~~~~~~~~~
advice:3:11 advice:4:11
advice:4:14 advice:5:14
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
echo (double)0; echo (double)0;
echo (int)1; echo (int)1;
echo (string)2; echo (string)2;

View file

@ -1,4 +1,5 @@
<?php <?php
class MyClass { class MyClass {
public function someMethod() { public function someMethod() {
return 'MyClass'; return 'MyClass';
@ -11,11 +12,12 @@ class MyClass {
} }
} }
~~~~~~~~~~ ~~~~~~~~~~
error:2:7 error:3:7
advice:4:12 advice:5:12
advice:8:10 advice:9:10
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
class MyClass { class MyClass {
public function someMethod() { public function someMethod() {
return __CLASS__; return __CLASS__;

View file

@ -1,4 +1,5 @@
<?php <?php
define('foo', 'bar'); define('foo', 'bar');
const bar = 'baz'; const bar = 'baz';
@ -6,7 +7,7 @@ class Foo {
const bar = 'baz'; const bar = 'baz';
} }
~~~~~~~~~~ ~~~~~~~~~~
warning:2:8 warning:3:8
warning:3:7 warning:4:7
error:5:7 error:6:7
warning:6:9 warning:7:9

View file

@ -1,12 +1,14 @@
<?php <?php
new Foo; new Foo;
new Bar(); new Bar();
new Foo\Bar; new Foo\Bar;
~~~~~~~~~~ ~~~~~~~~~~
advice:2:5 advice:3:5
advice:4:5 advice:5:5
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
new Foo(); new Foo();
new Bar(); new Bar();
new Foo\Bar(); new Foo\Bar();

View file

@ -1,4 +1,5 @@
<?php <?php
function foo($x, $y, $z) {} function foo($x, $y, $z) {}
function bar($x, $y = null, $z) {} function bar($x, $y = null, $z) {}
function baz($x = null, $y = null, $z = null) {} function baz($x = null, $y = null, $z = null) {}
@ -7,6 +8,6 @@ class MyClass {
public function myMethod($x, $y = null, $z) {} public function myMethod($x, $y = null, $z) {}
} }
~~~~~~~~~~ ~~~~~~~~~~
warning:3:13 warning:4:13
error:6:7 error:7:7
warning:7:27 warning:8:27

View file

@ -1,4 +1,5 @@
<?php <?php
'foobar'; 'foobar';
"foo\"bar"; "foo\"bar";
"foobar\n"; "foobar\n";
@ -12,9 +13,10 @@ pht(
"This string also requires \123\345 double quotes, but ". "This string also requires \123\345 double quotes, but ".
"this string does not. Here, they are used for consistency."); "this string does not. Here, they are used for consistency.");
~~~~~~~~~~ ~~~~~~~~~~
advice:3:1 advice:4:1
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
'foobar'; 'foobar';
'foo"bar'; 'foo"bar';
"foobar\n"; "foobar\n";

View file

@ -1,4 +1,5 @@
<?php <?php
$a = array( $a = array(
'a' => 'val1', 'a' => 'val1',
$a => 'val2', $a => 'val2',
@ -34,9 +35,9 @@ $f = array(
$a => 'var2', $a => 'var2',
); );
~~~~~~~~~~ ~~~~~~~~~~
error:5:3 error:6:3
error:8:3 error:9:3
error:15:3 error:16:3
error:20:3 error:21:3
error:25:3 error:26:3
error:34:3 error:35:3

View file

@ -1,4 +1,5 @@
<?php <?php
$x = null; $x = null;
$y = null; $y = null;
switch ($x) {} switch ($x) {}
@ -24,5 +25,5 @@ switch ($x) {
break; break;
} }
~~~~~~~~~~ ~~~~~~~~~~
error:15:3 error:16:3
error:22:7 error:23:7

View file

@ -1,8 +1,9 @@
<?php <?php
define('PONY', 'cute'); define('PONY', 'cute');
define($pony, 'cute'); define($pony, 'cute');
define('PONY', $cute); define('PONY', $cute);
define($pony, $cute); define($pony, $cute);
~~~~~~~~~~ ~~~~~~~~~~
error:3:8 dynamic define error:4:8 dynamic define
error:5:8 dynamic define error:6:8 dynamic define

View file

@ -1,4 +1,5 @@
<?php <?php
if (true) { if (true) {
echo 'foo'; echo 'foo';
} elseif (false) { } elseif (false) {
@ -7,9 +8,10 @@ if (true) {
echo 'baz'; echo 'baz';
} }
~~~~~~~~~~ ~~~~~~~~~~
advice:4:3 advice:5:3
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
if (true) { if (true) {
echo 'foo'; echo 'foo';
} else if (false) { } else if (false) {

View file

@ -1,4 +1,5 @@
<?php <?php
function w() {} function w() {}
function x() { function x() {
// This is deliberately empty. // This is deliberately empty.
@ -9,10 +10,11 @@ function z() {
} }
~~~~~~~~~~ ~~~~~~~~~~
advice:6:14
advice:7:14 advice:7:14
advice:8:14
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
function w() {} function w() {}
function x() { function x() {
// This is deliberately empty. // This is deliberately empty.

View file

@ -1,11 +1,13 @@
<?php <?php
final class Foo {}; final class Foo {};
$x = null;; $x = null;;
~~~~~~~~~~ ~~~~~~~~~~
error:2:13 XHP19 error:3:13 XHP19
advice:2:19 advice:3:19
advice:3:11 advice:4:11
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
final class Foo {} final class Foo {}
$x = null; $x = null;

View file

@ -1,4 +1,5 @@
<?php <?php
exit(-1); exit(-1);
exit -1; exit -1;
strtoupper(33 * exit - 6); strtoupper(33 * exit - 6);
@ -8,8 +9,8 @@ print '';
$x = new stdClass(); $x = new stdClass();
$y = clone $x; $y = clone $x;
~~~~~~~~~~ ~~~~~~~~~~
error:3:1 error:4:1
warning:3:5 warning:4:5
warning:3:6 warning:4:6
error:4:17 error:5:17
warning:4:21 warning:5:21

View file

@ -1,4 +1,5 @@
<?php <?php
printf(); printf();
printf(null); printf(null);
printf(''); printf('');
@ -11,11 +12,11 @@ queryfx(null, 'x', 'y');
foobar(null, null, '%s'); foobar(null, null, '%s');
~~~~~~~~~~ ~~~~~~~~~~
error:2:1 error:3:1
error:6:1
error:7:1 error:7:1
error:10:1 error:8:1
error:12:1 error:11:1
error:13:1
~~~~~~~~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~
{ {

View file

@ -1,8 +1,9 @@
<?php <?php
global $BASE_URL; global $BASE_URL;
function foo() { function foo() {
global $x, $y; global $x, $y;
} }
~~~~~~~~~~ ~~~~~~~~~~
warning:2:1 warning:3:1
warning:4:3 warning:5:3

View file

@ -1,4 +1,5 @@
<?php <?php
# no # no
#no #no
// yes // yes
@ -20,17 +21,18 @@
/** yes */ /** yes */
/**** yes ****/ /**** yes ****/
~~~~~~~~~~ ~~~~~~~~~~
error:2:1
error:3:1 error:3:1
error:5:1 error:4:1
error:6:11 error:6:1
advice:13:1 error:7:11
advice:14:1 advice:14:1
error:15:1 advice:15:1
advice:18:1 error:16:1
advice:19:1 advice:19:1
advice:20:1
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
// no // no
// no // no
// yes // yes

View file

@ -1,4 +1,5 @@
<?php <?php
final class Foo { final class Foo {
public function bar() {} public function bar() {}
function baz() {} function baz() {}
@ -10,13 +11,14 @@ final class Foo {
private $z; private $z;
} }
~~~~~~~~~~ ~~~~~~~~~~
error:2:13 XHP19 error:3:13 XHP19
advice:4:3
advice:5:3 advice:5:3
advice:8:3 advice:6:3
advice:9:3 advice:9:3
advice:10:3
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
final class Foo { final class Foo {
public function bar() {} public function bar() {}
public function baz() {} public function baz() {}

View file

@ -1,7 +1,8 @@
<?php <?php
f()[0]; f()[0];
~~~~~~~~~~ ~~~~~~~~~~
error:2:5 error:3:5
~~~~~~~~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~
{ {

View file

@ -1,9 +1,10 @@
<?php <?php
var_dump('foobar' instanceof stdClass); var_dump('foobar' instanceof stdClass);
var_dump(123 instanceof stdClass); var_dump(123 instanceof stdClass);
var_dump(null instanceof stdClass); var_dump(null instanceof stdClass);
var_dump($x instanceof stdClass); var_dump($x instanceof stdClass);
~~~~~~~~~~ ~~~~~~~~~~
error:2:10
error:3:10 error:3:10
error:4:10 error:4:10
error:5:10

View file

@ -1,4 +1,5 @@
<?php <?php
function func_one(array $x) {} function func_one(array $x) {}
function func_two(array $x = null) {} function func_two(array $x = null) {}
function func_three(array $x = array()) {} function func_three(array $x = array()) {}
@ -12,6 +13,6 @@ function func_eight(stdClass $x) {}
function func_nine(stdClass $x = null) {} function func_nine(stdClass $x = null) {}
function func_ten(stdClass $x = array()) {} function func_ten(stdClass $x = array()) {}
~~~~~~~~~~ ~~~~~~~~~~
error:5:31 error:6:31
error:9:35 error:10:35
error:13:33 error:14:33

View file

@ -1,4 +1,5 @@
<?php <?php
class SomeClass { class SomeClass {
public $a; public $a;
public public $b; public public $b;
@ -10,9 +11,9 @@ class SomeClass {
abstract final public function baz() {} abstract final public function baz() {}
} }
~~~~~~~~~~ ~~~~~~~~~~
error:2:7 XHP19 error:3:7 XHP19
error:4:10
error:5:10 error:5:10
error:6:11 error:6:10
error:9:10 error:7:11
error:10:12 error:10:10
error:11:12

View file

@ -1,4 +1,5 @@
<?php <?php
function __lambda_func() {} function __lambda_func() {}
~~~~~~~~~~ ~~~~~~~~~~
error:2:1 error:3:1

View file

@ -1,4 +1,5 @@
<?php <?php
include 'foo.php'; include 'foo.php';
include_once 'foo.php'; include_once 'foo.php';
require 'foo.php'; require 'foo.php';
@ -17,18 +18,19 @@ require ('baz.php');
require_once ('baz.php'); require_once ('baz.php');
echo ('baz'); echo ('baz');
~~~~~~~~~~ ~~~~~~~~~~
warning:8:8 warning:9:8
warning:9:13 warning:10:13
warning:10:8 warning:11:8
warning:11:13 warning:12:13
warning:12:5 warning:13:5
warning:14:9 warning:15:9
warning:15:14 warning:16:14
warning:16:9 warning:17:9
warning:17:14 warning:18:14
warning:18:6 warning:19:6
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
include 'foo.php'; include 'foo.php';
include_once 'foo.php'; include_once 'foo.php';
require 'foo.php'; require 'foo.php';

View file

@ -1,11 +1,13 @@
<?php <?php
list($x, $y, , ,) = array(); list($x, $y, , ,) = array();
list($x, $y, , , $z) = array(); list($x, $y, , , $z) = array();
~~~~~~~~~~ ~~~~~~~~~~
warning:2:12 warning:3:12
warning:2:14 warning:3:14
warning:2:16 warning:3:16
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
list($x, $y ) = array(); list($x, $y ) = array();
list($x, $y, , , $z) = array(); list($x, $y, , , $z) = array();

View file

@ -1,9 +1,11 @@
<?php <?php
var_dump(''); var_dump('');
Var_Dump(''); Var_Dump('');
~~~~~~~~~~ ~~~~~~~~~~
advice:3:1 advice:4:1
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
var_dump(''); var_dump('');
var_dump(''); var_dump('');

View file

@ -1,4 +1,5 @@
<?php <?php
class Foo { class Foo {
public $x; public $x;
static protected $y; static protected $y;
@ -8,12 +9,13 @@ class Foo {
static final public function foobar() {} static final public function foobar() {}
} }
~~~~~~~~~~ ~~~~~~~~~~
error:2:7 XHP19 error:3:7 XHP19
advice:4:3 advice:5:3
advice:6:3 advice:7:3
advice:8:3 advice:9:3
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
class Foo { class Foo {
public $x; public $x;
protected static $y; protected static $y;

View file

@ -1,4 +1,5 @@
<?php <?php
final class a { final class a {
const b = 1, c = d; const b = 1, c = d;
protected $E, $H; protected $E, $H;
@ -7,8 +8,6 @@ final class a {
interface i {} interface i {}
function YY($ZZ) {} function YY($ZZ) {}
final class Quack { final class Quack {
@ -17,10 +16,6 @@ final class Quack {
public function vV($w_w) {} public function vV($w_w) {}
} }
function () use ($this_is_a_closure) {}; function () use ($this_is_a_closure) {};
function f(&$YY) {} function f(&$YY) {}
@ -54,23 +49,24 @@ function j() {
Other::$y = 0; Other::$y = 0;
$mIxEdCaSe = 1; $mIxEdCaSe = 1;
} }
~~~~~~~~~~ ~~~~~~~~~~
warning:2:13 warning:3:13
warning:3:9 warning:4:9
warning:3:16 warning:4:9
warning:4:13 warning:4:16
warning:4:17 warning:4:16
warning:5:19 warning:5:13
warning:5:21 warning:5:17
warning:5:25 warning:6:19
warning:8:11 warning:6:21
warning:12:10 warning:6:25
warning:12:13 warning:9:11
warning:26:13 warning:11:10
warning:29:3 warning:11:13
warning:30:3 warning:21:13
warning:31:3 warning:24:3
warning:33:3 warning:25:3
warning:37:3 warning:26:3
warning:55:3 warning:28:3
warning:32:3
warning:50:3

View file

@ -0,0 +1,24 @@
<?php phpinfo() ?>
<? phpinfo(); ?>
<?php
phpinfo();
?>
<?
phpinfo();
~~~~~~~~~~
advice:4:6
advice:8:3
~~~~~~~~~~
<?php phpinfo() ?>
<? phpinfo(); ?>
<?php
phpinfo();
?>
<?
phpinfo();

View file

@ -1,4 +1,5 @@
<?php <?php
abstract class A {} abstract class A {}
final class F {} final class F {}
~~~~~~~~~~ ~~~~~~~~~~

View file

@ -1,3 +1,4 @@
<?php <?php
exit(); exit();
~~~~~~~~~~ ~~~~~~~~~~

View file

@ -1,9 +1,10 @@
<?php <?php
echo <<<'EOT' echo <<<'EOT'
Hello World! Hello World!
EOT; EOT;
~~~~~~~~~~ ~~~~~~~~~~
error:2:6 error:3:6
~~~~~~~~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~
{ {

View file

@ -1,12 +1,14 @@
<?php <?php
$x -> doSomething(); $x -> doSomething();
id(new Something()) id(new Something())
->doSomething(); ->doSomething();
~~~~~~~~~~ ~~~~~~~~~~
warning:2:3 warning:3:3
warning:2:6 warning:3:6
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
$x->doSomething(); $x->doSomething();
id(new Something()) id(new Something())
->doSomething(); ->doSomething();

View file

@ -1,4 +1,5 @@
<?php <?php
if ( $x ) {} if ( $x ) {}
f( ); f( );
q( ); q( );
@ -20,25 +21,26 @@ some_call( /* respect authorial intent */ $b,
$a // if comments are present $a // if comments are present
); );
~~~~~~~~~~ ~~~~~~~~~~
warning:2:5 warning:3:5
warning:2:8 warning:3:8
warning:3:3
warning:4:3 warning:4:3
warning:6:21 warning:5:3
warning:6:24 warning:7:21
warning:12:6 warning:7:24
warning:12:30 warning:13:6
warning:13:10 warning:13:30
warning:13:19 warning:14:10
warning:14:12 warning:14:19
warning:14:15 warning:15:12
error:15:13 XHP19 Class-Filename Mismatch warning:15:15
warning:16:21 error:16:13 XHP19 Class-Filename Mismatch
warning:16:24 warning:17:21
warning:18:10 warning:17:24
warning:18:25 warning:19:10
warning:19:25
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
if ($x) {} if ($x) {}
f(); f();
q(); q();

View file

@ -1,4 +1,5 @@
<?php <?php
break; break;
break 0; break 0;
break 1; break 1;
@ -8,10 +9,10 @@ continue 0;
continue 1; continue 1;
continue 1 + foo() * $bar; continue 1 + foo() * $bar;
~~~~~~~~~~ ~~~~~~~~~~
error:3:7 error:4:7
error:5:7 error:6:7
error:7:10 error:8:10
error:9:10 error:10:10
~~~~~~~~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~
{"config": {"xhpast.php-version": "5.4.0"}} {"config": {"xhpast.php-version": "5.4.0"}}

View file

@ -6,7 +6,6 @@ function foo($bar) {
preg_Quote('moo'); preg_Quote('moo');
preg_quote('moo', '/'); preg_quote('moo', '/');
} }
~~~~~~~~~~ ~~~~~~~~~~
advice:4:3 Wrong number of arguments to preg_quote() advice:4:3 Wrong number of arguments to preg_quote()
advice:6:3 Wrong number of arguments to preg_quote() advice:6:3 Wrong number of arguments to preg_quote()

View file

@ -119,7 +119,6 @@ function closure4() {
}; };
$a++; // Reuse of $a $a++; // Reuse of $a
} }
~~~~~~~~~~ ~~~~~~~~~~
warning:6:3 warning:6:3
warning:12:8 warning:12:8

View file

@ -62,7 +62,6 @@ function k($stuff, $thing) {
$other = array(); $other = array();
foreach ($other as $item) {} foreach ($other as $item) {}
} }
~~~~~~~~~~ ~~~~~~~~~~
error:43:22 error:43:22
error:53:22 error:53:22

View file

@ -1,14 +1,16 @@
<?php <?php
foo(); foo();
bar() ; bar() ;
baz() baz()
; ;
~~~~~~~~~~ ~~~~~~~~~~
advice:3:6
advice:4:6 advice:4:6
advice:5:6
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
foo(); foo();
bar(); bar();
baz(); baz();

View file

@ -1,14 +1,16 @@
<?php <?php
// This test is checking that the LintPatcher correctly applies adjacent patches // This test is checking that the LintPatcher correctly applies adjacent patches
// with large character delta effects. // with large character delta effects.
function f( ) { function f( ) {
g( ); g( );
} }
~~~~~~~~~~ ~~~~~~~~~~
warning:4:12 warning:5:12
warning:5:5 warning:6:5
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
// This test is checking that the LintPatcher correctly applies adjacent patches // This test is checking that the LintPatcher correctly applies adjacent patches
// with large character delta effects. // with large character delta effects.
function f() { function f() {

View file

@ -1,4 +1,5 @@
<?php <?php
if($x) {} if($x) {}
else{} else{}
for(;;) {} for(;;) {}
@ -25,23 +26,24 @@ do {
try {} catch(Exception $ex) {} try {} catch(Exception $ex) {}
~~~~~~~~~~ ~~~~~~~~~~
warning:2:1
warning:2:10
warning:3:1 warning:3:1
warning:3:10
warning:4:1 warning:4:1
warning:5:1 warning:5:1
warning:6:1 warning:6:1
warning:7:1 warning:7:1
warning:7:6
warning:8:1 warning:8:1
warning:9:11 warning:8:6
warning:10:16 warning:9:1
warning:13:3 warning:10:11
warning:11:16
warning:14:3 warning:14:3
warning:24:3 warning:15:3
warning:26:8 warning:25:3
warning:27:8
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
if ($x) {} else {} if ($x) {} else {}
for (;;) {} for (;;) {}
foreach ($x as $y) {} foreach ($x as $y) {}

View file

@ -1,4 +1,5 @@
<?php <?php
$a.$b; $a.$b;
$a . $b; $a . $b;
$a. $b; $a. $b;
@ -24,16 +25,17 @@ array(
$x=>$y, $x=>$y,
); );
~~~~~~~~~~ ~~~~~~~~~~
warning:3:3 warning:4:3
warning:3:5 warning:4:5
warning:4:4 warning:5:4
warning:5:3 warning:6:3
warning:12:9 warning:13:9
warning:13:10 warning:14:10
warning:14:9 warning:15:9
warning:24:5 warning:25:5
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
$a.$b; $a.$b;
$a.$b; $a.$b;
$a.$b; $a.$b;

View file

@ -1,4 +1,5 @@
<?php <?php
$a + $b; $a + $b;
$a+$b; $a+$b;
$a +$b; $a +$b;
@ -23,21 +24,22 @@ if ($x instanceof z &&$w) {}
if ($x instanceof z && $w) {} if ($x instanceof z && $w) {}
f(1,2); f(1,2);
~~~~~~~~~~ ~~~~~~~~~~
warning:3:3 warning:4:3
warning:4:4 warning:5:4
warning:5:3 warning:6:3
warning:7:3
warning:8:3 warning:8:3
warning:9:4 warning:9:3
warning:10:3 warning:10:4
warning:11:3 warning:11:3
warning:13:14 warning:12:3
warning:20:52 warning:14:14
warning:21:54 warning:21:52
warning:22:21 warning:22:54
warning:24:4 warning:23:21
warning:25:4
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
$a + $b; $a + $b;
$a + $b; $a + $b;
$a + $b; $a + $b;

View file

@ -1,9 +1,10 @@
<?php <?php
final class Platypus { final class Platypus {
public function platypus() { public function platypus() {
// This method must be renamed to __construct(). // This method must be renamed to __construct().
} }
} }
~~~~~~~~~~ ~~~~~~~~~~
error:2:13 XHP19 Class-Filename Mismatch error:3:13 XHP19 Class-Filename Mismatch
error:3:19 error:4:19

View file

@ -15,7 +15,6 @@ $skip_cache = true || $some_complicated_expression;
$skip_cache = $a || $b; $skip_cache = $a || $b;
$skip_cache = false && something(); $skip_cache = false && something();
$skip_cache = f(); $skip_cache = f();
~~~~~~~~~~ ~~~~~~~~~~
error:3:5 error:3:5
error:5:5 error:5:5

View file

@ -1,4 +1,5 @@
<?php <?php
class MyClass { class MyClass {
public function __toString() { public function __toString() {
if (some_function()) { if (some_function()) {
@ -23,4 +24,4 @@ abstract class SomeAbstractClass {
abstract public function __toString(); abstract public function __toString();
} }
~~~~~~~~~~ ~~~~~~~~~~
error:5:7 error:6:7

View file

@ -1,9 +1,11 @@
<?php <?php
$x ++; $x ++;
$y--; $y--;
~~~~~~~~~~ ~~~~~~~~~~
warning:2:3 warning:3:3
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
$x++; $x++;
$y--; $y--;

View file

@ -1,12 +1,14 @@
<?php <?php
$f = @ fopen($path, 'rb'); $f = @ fopen($path, 'rb');
@fclose($f); @fclose($f);
exit (); exit ();
~~~~~~~~~~ ~~~~~~~~~~
warning:2:7 warning:3:7
warning:4:5 warning:5:5
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
$f = @fopen($path, 'rb'); $f = @fopen($path, 'rb');
@fclose($f); @fclose($f);
exit(); exit();

View file

@ -1,8 +1,9 @@
<?php <?php
final class Foo { final class Foo {
public function bar() {} public function bar() {}
final public function baz() {} final public function baz() {}
} }
~~~~~~~~~~ ~~~~~~~~~~
error:2:13 XHP19 error:3:13 XHP19
advice:4:3 advice:5:3

View file

@ -1,4 +1,5 @@
<?php <?php
// This test is just verifying the parseability of files with a large number // This test is just verifying the parseability of files with a large number
// (>500) of string concatenations. We emit n_CONCATENATION_LIST instead of // (>500) of string concatenations. We emit n_CONCATENATION_LIST instead of
// n_BINARY_EXPRESSION to avoid various call-depth traps in PHP, HPHP, and the // n_BINARY_EXPRESSION to avoid various call-depth traps in PHP, HPHP, and the
@ -43,6 +44,7 @@
~~~~~~~~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~
<?php <?php
// This test is just verifying the parseability of files with a large number // This test is just verifying the parseability of files with a large number
// (>500) of string concatenations. We emit n_CONCATENATION_LIST instead of // (>500) of string concatenations. We emit n_CONCATENATION_LIST instead of
// n_BINARY_EXPRESSION to avoid various call-depth traps in PHP, HPHP, and the // n_BINARY_EXPRESSION to avoid various call-depth traps in PHP, HPHP, and the

View file

@ -8,7 +8,6 @@ final class A {
$this->f(); $this->f();
} }
} }
~~~~~~~~~~ ~~~~~~~~~~
error:3:13 XHP19 Class-Filename Mismatch error:3:13 XHP19 Class-Filename Mismatch
error:8:5 Use of $this in a static method. error:8:5 Use of $this in a static method.

View file

@ -1,5 +1,6 @@
<?php <?php
$$foo; $$foo;
$obj->$bar; // okay $obj->$bar; // okay
~~~~~~~~~~ ~~~~~~~~~~
error:2:1 error:3:1

View file

@ -1,9 +1,10 @@
<?php <?php
'a'.'b'; 'a'.'b';
'a' + 'b'; 'a' + 'b';
'a' + $x; 'a' + $x;
$x + $y + $z + 'q' + 0; $x + $y + $z + 'q' + 0;
~~~~~~~~~~ ~~~~~~~~~~
error:3:1
error:4:1 error:4:1
error:5:1 error:5:1
error:6:1

View file

@ -0,0 +1,46 @@
<?php
final class ArcanistNewlineAfterOpenTagXHPASTLinterRule
extends ArcanistXHPASTLinterRule {
const ID = 81;
public function getLintName() {
return pht('Newline After PHP Open Tag');
}
public function getLintSeverity() {
return ArcanistLintSeverity::SEVERITY_ADVICE;
}
public function process(XHPASTNode $root) {
$tokens = $root->selectTokensOfType('T_OPEN_TAG');
foreach ($tokens as $token) {
for ($next = $token->getNextToken();
$next;
$next = $next->getNextToken()) {
if ($next->getTypeName() == 'T_WHITESPACE' &&
preg_match('/\n\s*\n/', $next->getValue())) {
continue 2;
}
if ($token->getLineNumber() != $next->getLineNumber()) {
break;
}
if ($next->getTypeName() == 'T_CLOSE_TAG') {
continue 2;
}
}
$next = $token->getNextToken();
$this->raiseLintAtToken(
$next,
pht('`%s` should be separated from code by an empty line.', '<?php'),
"\n".$next->getValue());
}
}
}