mirror_php/PHP-Parser
1
0
Fork 0
mirror of https://github.com/nikic/PHP-Parser.git synced 2025-01-17 15:18:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add column info for non-syntax errors where relatively precise

Browse Source 
Should it also be added if only rough information is available? E.g.
spanning an entire class?
This commit is contained in:
Nikita Popov 2015-04-18 13:20:39 +02:00
parent 611fa5c7f1
commit 62f83a0dc2
10 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PhpParser/Node/Param.php
View File

@ -37,7 +37,7 @@ class Param extends NodeAbstract
$this->default = $default;
if ($variadic && null !== $default) {
throw new Error('Variadic parameter cannot have a default value');
throw new Error('Variadic parameter cannot have a default value', $default->getAttributes());
}
}

10
lib/PhpParser/Node/Stmt/Class_.php
View File

@ -53,12 +53,18 @@ class Class_ extends ClassLike
}
if (isset(self::$specialNames[(string) $this->extends])) {
throw new Error(sprintf('Cannot use \'%s\' as class name as it is reserved', $this->extends));
throw new Error(
sprintf('Cannot use \'%s\' as class name as it is reserved', $this->extends),
$this->extends->getAttributes()
);
}
foreach ($this->implements as $interface) {
if (isset(self::$specialNames[(string) $interface])) {
throw new Error(sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface));
throw new Error(
sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface),
$interface->getAttributes()
);
}
}
}

5
lib/PhpParser/Node/Stmt/Interface_.php
View File

@ -37,7 +37,10 @@ class Interface_ extends ClassLike
foreach ($this->extends as $interface) {
if (isset(self::$specialNames[(string) $interface])) {
throw new Error(sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface));
throw new Error(
sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface),
$interface->getAttributes()
);
}
}
}

7
lib/PhpParser/Node/Stmt/Namespace_.php
View File

@ -31,13 +31,16 @@ class Namespace_ extends Node\Stmt
$this->stmts = $stmts;
if (isset(self::$specialNames[(string) $this->name])) {
throw new Error(sprintf('Cannot use \'%s\' as namespace name', $this->name));
throw new Error(
sprintf('Cannot use \'%s\' as namespace name', $this->name),
$this->name->getAttributes()
);
}
if (null !== $this->stmts) {
foreach ($this->stmts as $stmt) {
if ($stmt instanceof self) {
throw new Error('Namespace declarations cannot be nested', $stmt->getLine());
throw new Error('Namespace declarations cannot be nested', $stmt->getAttributes());
}
}
}

2
lib/PhpParser/Parser.php
View File

@ -1143,7 +1143,7 @@ class Parser extends ParserAbstract
}
protected function reduceRule32($attributes) {
throw new Error('__HALT_COMPILER() can only be used from the outermost scope');
throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $attributes);
}
protected function reduceRule33($attributes) {

12
test/code/parser/stmt/class/name.test-fail
View File

@ -14,11 +14,11 @@ Syntax error, unexpected T_STATIC, expecting T_STRING from 1:12 to 1:17
-----
<?php class A extends self {}
-----
Cannot use 'self' as class name as it is reserved on line 1
Cannot use 'self' as class name as it is reserved from 1:22 to 1:25
-----
<?php class A extends parent {}
-----
Cannot use 'parent' as class name as it is reserved on line 1
Cannot use 'parent' as class name as it is reserved from 1:22 to 1:27
-----
<?php class A extends static {}
-----
@ -26,11 +26,11 @@ Syntax error, unexpected T_STATIC, expecting T_STRING or T_NAMESPACE or T_NS_SEP
-----
<?php class A implements self {}
-----
Cannot use 'self' as interface name as it is reserved on line 1
Cannot use 'self' as interface name as it is reserved from 1:25 to 1:28
-----
<?php class A implements parent {}
-----
Cannot use 'parent' as interface name as it is reserved on line 1
Cannot use 'parent' as interface name as it is reserved from 1:25 to 1:30
-----
<?php class A implements static {}
-----
@ -50,11 +50,11 @@ Syntax error, unexpected T_STATIC, expecting T_STRING from 1:16 to 1:21
-----
<?php interface A extends self {}
-----
Cannot use 'self' as interface name as it is reserved on line 1
Cannot use 'self' as interface name as it is reserved from 1:26 to 1:29
-----
<?php interface A extends parent {}
-----
Cannot use 'parent' as interface name as it is reserved on line 1
Cannot use 'parent' as interface name as it is reserved from 1:26 to 1:31
-----
<?php interface A extends static {}
-----

2
test/code/parser/stmt/function/variadic.test-fail
View File

@ -3,4 +3,4 @@ Invalid variadic function
<?php
function foo(...$foo = []) {}
-----
Variadic parameter cannot have a default value on line 2
Variadic parameter cannot have a default value from 2:23 to 2:24

2
test/code/parser/stmt/haltCompilerOutermostScope.test-fail
View File

@ -5,4 +5,4 @@ if (true) {
__halt_compiler();
}
-----
__HALT_COMPILER() can only be used from the outermost scope on line 3
__HALT_COMPILER() can only be used from the outermost scope from 3:4 to 3:18

4
test/code/parser/stmt/namespace/name.test-fail
View File

@ -2,11 +2,11 @@ Invalid namespace names
-----
<?php namespace self;
-----
Cannot use 'self' as namespace name on line 1
Cannot use 'self' as namespace name from 1:16 to 1:19
-----
<?php namespace parent;
-----
Cannot use 'parent' as namespace name on line 1
Cannot use 'parent' as namespace name from 1:16 to 1:21
-----
<?php namespace static;
-----

2
test/code/parser/stmt/namespace/nested.test-fail
View File

@ -7,4 +7,4 @@ namespace A {
}
}
-----
Namespace declarations cannot be nested on line 3
Namespace declarations cannot be nested from 3:4 to 5:4