danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2024-11-27 04:14:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix implicit visibility for properties as well

Browse Source 
Also switch to using PPP mask.
This commit is contained in:
Nikita Popov 2015-07-05 20:15:02 +02:00
parent 0fbb5f90a1
commit 7434a682e5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/PhpParser/Node/Stmt/ClassMethod.php
View File

@ -75,7 +75,8 @@ class ClassMethod extends Node\Stmt implements FunctionLike
} }
public function isPublic() { public function isPublic() {
return ($this->type & Class_::MODIFIER_PUBLIC) !== 0 || (!$this->isPrivate() && !$this->isProtected()); return ($this->type & Class_::MODIFIER_PUBLIC) !== 0
|| ($this->type & Class_::VISIBILITY_MODIFER_MASK) === 0;
} }
public function isProtected() { public function isProtected() {

3
lib/PhpParser/Node/Stmt/Property.php
View File

@ -38,7 +38,8 @@ class Property extends Node\Stmt
} }
public function isPublic() { public function isPublic() {
return ($this->type & Class_::MODIFIER_PUBLIC) !== 0 || $this->type === 0; return ($this->type & Class_::MODIFIER_PUBLIC) !== 0
|| ($this->type & Class_::VISIBILITY_MODIFER_MASK) === 0;
} }
public function isProtected() { public function isProtected() {

8
test/PhpParser/Node/Stmt/PropertyTest.php
View File

@ -25,6 +25,14 @@ class PropertyTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($node->isStatic()); $this->assertFalse($node->isStatic());
} }
public function testStaticImplicitlyPublic() {
$node = new Property(Class_::MODIFIER_STATIC, array());
$this->assertTrue($node->isPublic());
$this->assertFalse($node->isProtected());
$this->assertFalse($node->isPrivate());
$this->assertTrue($node->isStatic());
}
public function provideModifiers() { public function provideModifiers() {
return array( return array(
array('public'), array('public'),