updated packages

This commit is contained in:
2019-05-18 09:06:43 +00:00
parent 901d16349e
commit e9487fa58a
2025 changed files with 30366 additions and 49653 deletions
@@ -6,9 +6,8 @@ use PhpParser\Comment;
use PhpParser\Node;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class ClassTest extends TestCase
class ClassTest extends \PHPUnit\Framework\TestCase
{
protected function createClassBuilder($class) {
return new Class_($class);
@@ -8,9 +8,8 @@ use PhpParser\Node\Expr\Print_;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class FunctionTest extends TestCase
class FunctionTest extends \PHPUnit\Framework\TestCase
{
public function createFunctionBuilder($name) {
return new Function_($name);
@@ -6,9 +6,8 @@ use PhpParser\Comment;
use PhpParser\Node;
use PhpParser\Node\Scalar\DNumber;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class InterfaceTest extends TestCase
class InterfaceTest extends \PHPUnit\Framework\TestCase
{
/** @var Interface_ */
protected $builder;
@@ -8,9 +8,8 @@ use PhpParser\Node\Expr\Print_;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class MethodTest extends TestCase
class MethodTest extends \PHPUnit\Framework\TestCase
{
public function createMethodBuilder($name) {
return new Method($name);
@@ -5,9 +5,8 @@ namespace PhpParser\Builder;
use PhpParser\Comment\Doc;
use PhpParser\Node;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class NamespaceTest extends TestCase
class NamespaceTest extends \PHPUnit\Framework\TestCase
{
protected function createNamespaceBuilder($fqn) {
return new Namespace_($fqn);
@@ -5,9 +5,8 @@ namespace PhpParser\Builder;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Scalar;
use PHPUnit\Framework\TestCase;
class ParamTest extends TestCase
class ParamTest extends \PHPUnit\Framework\TestCase
{
public function createParamBuilder($name) {
return new Param($name);
@@ -7,9 +7,8 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class PropertyTest extends TestCase
class PropertyTest extends \PHPUnit\Framework\TestCase
{
public function createPropertyBuilder($name) {
return new Property($name);
@@ -5,9 +5,8 @@ namespace PhpParser\Builder;
use PhpParser\Comment;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class TraitTest extends TestCase
class TraitTest extends \PHPUnit\Framework\TestCase
{
protected function createTraitBuilder($class) {
return new Trait_($class);
@@ -2,14 +2,11 @@
namespace PhpParser\Builder;
use PhpParser\Comment;
use PhpParser\Node;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Class_;
use PHPUnit\Framework\TestCase;
class TraitUseAdaptationTest extends TestCase
class TraitUseAdaptationTest extends \PHPUnit\Framework\TestCase
{
protected function createTraitUseAdaptationBuilder($trait, $method) {
return new TraitUseAdaptation($trait, $method);
@@ -2,13 +2,10 @@
namespace PhpParser\Builder;
use PhpParser\Comment;
use PhpParser\Node;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class TraitUseTest extends TestCase
class TraitUseTest extends \PHPUnit\Framework\TestCase
{
protected function createTraitUseBuilder(...$traits) {
return new TraitUse(...$traits);
+3 -2
View File
@@ -1,11 +1,12 @@
<?php declare(strict_types=1);
namespace PhpParser\Builder;
use PhpParser\Builder;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class UseTest extends TestCase
class UseTest extends \PHPUnit\Framework\TestCase
{
protected function createUseBuilder($name, $type = Stmt\Use_::TYPE_NORMAL) {
return new Builder\Use_($name, $type);
@@ -2,7 +2,6 @@
namespace PhpParser;
use PhpParser\Builder;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BinaryOp\Concat;
@@ -10,10 +9,8 @@ use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Scalar\String_;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Yaml\Tests\A;
class BuilderFactoryTest extends TestCase
class BuilderFactoryTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideTestFactory
+2 -4
View File
@@ -5,8 +5,6 @@ namespace PhpParser;
use PhpParser\Node\Expr;
use PhpParser\Node\Stmt;
require_once __DIR__ . '/CodeTestAbstract.php';
class CodeParsingTest extends CodeTestAbstract
{
/**
@@ -79,9 +77,9 @@ class CodeParsingTest extends CodeTestAbstract
private function formatErrorMessage(Error $e, $code) {
if ($e->hasColumnInfo()) {
return $e->getMessageWithColumnInfo($code);
} else {
return $e->getMessage();
}
return $e->getMessage();
}
private function checkAttributes($stmts) {
@@ -2,11 +2,7 @@
namespace PhpParser;
use PHPUnit\Framework\TestCase;
require_once __DIR__ . '/CodeTestParser.php';
abstract class CodeTestAbstract extends TestCase
abstract class CodeTestAbstract extends \PHPUnit\Framework\TestCase
{
protected function getTests($directory, $fileExtension, $chunksPerTest = 2) {
$parser = new CodeTestParser;
+1 -3
View File
@@ -2,9 +2,7 @@
namespace PhpParser;
use PHPUnit\Framework\TestCase;
class CommentTest extends TestCase
class CommentTest extends \PHPUnit\Framework\TestCase
{
public function testGetSet() {
$comment = new Comment('/* Some comment */', 1, 10, 2);
@@ -4,9 +4,8 @@ namespace PhpParser;
use PhpParser\Node\Expr;
use PhpParser\Node\Scalar;
use PHPUnit\Framework\TestCase;
class ConstExprEvaluatorTest extends TestCase
class ConstExprEvaluatorTest extends \PHPUnit\Framework\TestCase
{
/** @dataProvider provideTestEvaluate */
public function testEvaluate($exprString, $expected) {
@@ -3,9 +3,8 @@
namespace PhpParser\ErrorHandler;
use PhpParser\Error;
use PHPUnit\Framework\TestCase;
class CollectingTest extends TestCase
class CollectingTest extends \PHPUnit\Framework\TestCase
{
public function testHandleError() {
$errorHandler = new Collecting();
@@ -3,9 +3,8 @@
namespace PhpParser\ErrorHandler;
use PhpParser\Error;
use PHPUnit\Framework\TestCase;
class ThrowingTest extends TestCase
class ThrowingTest extends \PHPUnit\Framework\TestCase
{
public function testHandleError() {
$this->expectException(Error::class);
+1 -3
View File
@@ -2,9 +2,7 @@
namespace PhpParser;
use PHPUnit\Framework\TestCase;
class ErrorTest extends TestCase
class ErrorTest extends \PHPUnit\Framework\TestCase
{
public function testConstruct() {
$attributes = [
@@ -2,9 +2,7 @@
namespace PhpParser\Internal;
use PHPUnit\Framework\TestCase;
class DifferTest extends TestCase
class DifferTest extends \PHPUnit\Framework\TestCase
{
private function formatDiffString(array $diff) {
$diffStr = '';
+1 -3
View File
@@ -2,9 +2,7 @@
namespace PhpParser;
use PHPUnit\Framework\TestCase;
class JsonDecoderTest extends TestCase
class JsonDecoderTest extends \PHPUnit\Framework\TestCase
{
public function testRoundTrip() {
$code = <<<'PHP'
@@ -6,8 +6,6 @@ use PhpParser\ErrorHandler;
use PhpParser\LexerTest;
use PhpParser\Parser\Tokens;
require_once __DIR__ . '/../LexerTest.php';
class EmulativeTest extends LexerTest
{
protected function getLexer(array $options = []) {
@@ -110,6 +108,10 @@ class EmulativeTest extends LexerTest
public function provideTestLexNewFeatures() {
return [
// PHP 7.4
['??=', [
[Tokens::T_COALESCE_EQUAL, '??='],
]],
['yield from', [
[Tokens::T_YIELD_FROM, 'yield from'],
]],
+1 -2
View File
@@ -3,9 +3,8 @@
namespace PhpParser;
use PhpParser\Parser\Tokens;
use PHPUnit\Framework\TestCase;
class LexerTest extends TestCase
class LexerTest extends \PHPUnit\Framework\TestCase
{
/* To allow overwriting in parent class */
protected function getLexer(array $options = []) {
+1 -2
View File
@@ -4,9 +4,8 @@ namespace PhpParser;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\Use_;
use PHPUnit\Framework\TestCase;
class NameContextTest extends TestCase
class NameContextTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideTestGetPossibleNames
@@ -2,9 +2,7 @@
namespace PhpParser\Node;
use PHPUnit\Framework\TestCase;
class IdentifierTest extends TestCase
class IdentifierTest extends \PHPUnit\Framework\TestCase
{
public function testToString() {
$identifier = new Identifier('Foo');
+1 -3
View File
@@ -2,9 +2,7 @@
namespace PhpParser\Node;
use PHPUnit\Framework\TestCase;
class NameTest extends TestCase
class NameTest extends \PHPUnit\Framework\TestCase
{
public function testConstruct() {
$name = new Name(['foo', 'bar']);
@@ -2,9 +2,7 @@
namespace PhpParser\Node\Scalar;
use PHPUnit\Framework\TestCase;
class MagicConstTest extends TestCase
class MagicConstTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideTestGetName
@@ -2,9 +2,7 @@
namespace PhpParser\Node\Scalar;
use PHPUnit\Framework\TestCase;
class StringTest extends TestCase
class StringTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideTestParseEscapeSequences
@@ -2,9 +2,7 @@
namespace PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class ClassConstTest extends TestCase
class ClassConstTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideModifiers
@@ -5,9 +5,8 @@ namespace PhpParser\Node\Stmt;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Name;
use PhpParser\Node\Param;
use PHPUnit\Framework\TestCase;
class ClassMethodTest extends TestCase
class ClassMethodTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideModifiers
@@ -2,9 +2,7 @@
namespace PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class ClassTest extends TestCase
class ClassTest extends \PHPUnit\Framework\TestCase
{
public function testIsAbstract() {
$class = new Class_('Foo', ['type' => Class_::MODIFIER_ABSTRACT]);
@@ -3,9 +3,8 @@
namespace PhpParser\Node\Stmt;
use PhpParser\Node;
use PHPUnit\Framework\TestCase;
class InterfaceTest extends TestCase
class InterfaceTest extends \PHPUnit\Framework\TestCase
{
public function testGetMethods() {
$methods = [
@@ -2,9 +2,7 @@
namespace PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class PropertyTest extends TestCase
class PropertyTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider provideModifiers
@@ -2,8 +2,6 @@
namespace PhpParser;
use PHPUnit\Framework\TestCase;
class DummyNode extends NodeAbstract
{
public $subNode1;
@@ -25,7 +23,7 @@ class DummyNode extends NodeAbstract
}
}
class NodeAbstractTest extends TestCase
class NodeAbstractTest extends \PHPUnit\Framework\TestCase
{
public function provideNodes() {
$attributes = [
+1 -3
View File
@@ -2,9 +2,7 @@
namespace PhpParser;
use PHPUnit\Framework\TestCase;
class NodeDumperTest extends TestCase
class NodeDumperTest extends \PHPUnit\Framework\TestCase
{
private function canonicalize($string) {
return str_replace("\r\n", "\n", $string);
+1 -2
View File
@@ -3,9 +3,8 @@
namespace PhpParser;
use PhpParser\Node\Expr;
use PHPUnit\Framework\TestCase;
class NodeFinderTest extends TestCase
class NodeFinderTest extends \PHPUnit\Framework\TestCase
{
private function getStmtsAndVars() {
$assign = new Expr\Assign(new Expr\Variable('a'), new Expr\BinaryOp\Concat(
+19 -21
View File
@@ -4,10 +4,8 @@ namespace PhpParser;
use PhpParser\Node\Expr;
use PhpParser\Node\Scalar\String_;
use PhpParser\NodeVisitor;
use PHPUnit\Framework\TestCase;
class NodeTraverserTest extends TestCase
class NodeTraverserTest extends \PHPUnit\Framework\TestCase
{
public function testNonModifying() {
$str1Node = new String_('Foo');
@@ -43,32 +41,32 @@ class NodeTraverserTest extends TestCase
// replace empty statements with string1 node
$visitor1->expects($this->at(0))->method('beforeTraverse')->with([])
->will($this->returnValue([$str1Node]));
->willReturn([$str1Node]);
$visitor2->expects($this->at(0))->method('beforeTraverse')->with([$str1Node]);
// replace string1 node with print node
$visitor1->expects($this->at(1))->method('enterNode')->with($str1Node)
->will($this->returnValue($printNode));
->willReturn($printNode);
$visitor2->expects($this->at(1))->method('enterNode')->with($printNode);
// replace string1 node with string2 node
$visitor1->expects($this->at(2))->method('enterNode')->with($str1Node)
->will($this->returnValue($str2Node));
->willReturn($str2Node);
$visitor2->expects($this->at(2))->method('enterNode')->with($str2Node);
// replace string2 node with string1 node again
$visitor1->expects($this->at(3))->method('leaveNode')->with($str2Node)
->will($this->returnValue($str1Node));
->willReturn($str1Node);
$visitor2->expects($this->at(3))->method('leaveNode')->with($str1Node);
// replace print node with string1 node again
$visitor1->expects($this->at(4))->method('leaveNode')->with($printNode)
->will($this->returnValue($str1Node));
->willReturn($str1Node);
$visitor2->expects($this->at(4))->method('leaveNode')->with($str1Node);
// replace string1 node with empty statements again
$visitor1->expects($this->at(5))->method('afterTraverse')->with([$str1Node])
->will($this->returnValue([]));
->willReturn([]);
$visitor2->expects($this->at(5))->method('afterTraverse')->with([]);
$traverser = new NodeTraverser;
@@ -87,7 +85,7 @@ class NodeTraverserTest extends TestCase
// remove the string1 node, leave the string2 node
$visitor->expects($this->at(2))->method('leaveNode')->with($str1Node)
->will($this->returnValue(NodeTraverser::REMOVE_NODE));
->willReturn(NodeTraverser::REMOVE_NODE);
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -106,7 +104,7 @@ class NodeTraverserTest extends TestCase
// replace strMiddle with strR1 and strR2 by merge
$visitor->expects($this->at(4))->method('leaveNode')->with($strMiddle)
->will($this->returnValue([$strR1, $strR2]));
->willReturn([$strR1, $strR2]);
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -139,7 +137,7 @@ class NodeTraverserTest extends TestCase
$visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor1->expects($this->at(1))->method('enterNode')->with($printNode)
->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CHILDREN));
->willReturn(NodeTraverser::DONT_TRAVERSE_CHILDREN);
$visitor2->expects($this->at(1))->method('enterNode')->with($printNode);
$visitor1->expects($this->at(2))->method('leaveNode')->with($printNode);
@@ -150,7 +148,7 @@ class NodeTraverserTest extends TestCase
$visitor1->expects($this->at(4))->method('enterNode')->with($mulNode);
$visitor2->expects($this->at(4))->method('enterNode')->with($mulNode)
->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CHILDREN));
->willReturn(NodeTraverser::DONT_TRAVERSE_CHILDREN);
$visitor1->expects($this->at(5))->method('leaveNode')->with($mulNode);
$visitor2->expects($this->at(5))->method('leaveNode')->with($mulNode);
@@ -179,14 +177,14 @@ class NodeTraverserTest extends TestCase
$visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor1->expects($this->at(1))->method('enterNode')->with($printNode)
->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN));
->willReturn(NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN);
$visitor1->expects($this->at(2))->method('leaveNode')->with($printNode);
$visitor1->expects($this->at(3))->method('enterNode')->with($negNode);
$visitor2->expects($this->at(1))->method('enterNode')->with($negNode);
$visitor1->expects($this->at(4))->method('enterNode')->with($mulNode)
->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN));
->willReturn(NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN);
$visitor1->expects($this->at(5))->method('leaveNode')->with($mulNode)->willReturn($divNode);
$visitor1->expects($this->at(6))->method('leaveNode')->with($negNode);
@@ -212,7 +210,7 @@ class NodeTraverserTest extends TestCase
// From enterNode() with array parent
$visitor = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor->expects($this->at(1))->method('enterNode')->with($mulNode)
->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
->willReturn(NodeTraverser::STOP_TRAVERSAL);
$visitor->expects($this->at(2))->method('afterTraverse');
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -221,7 +219,7 @@ class NodeTraverserTest extends TestCase
// From enterNode with Node parent
$visitor = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor->expects($this->at(2))->method('enterNode')->with($varNode1)
->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
->willReturn(NodeTraverser::STOP_TRAVERSAL);
$visitor->expects($this->at(3))->method('afterTraverse');
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -230,7 +228,7 @@ class NodeTraverserTest extends TestCase
// From leaveNode with Node parent
$visitor = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor->expects($this->at(3))->method('leaveNode')->with($varNode1)
->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
->willReturn(NodeTraverser::STOP_TRAVERSAL);
$visitor->expects($this->at(4))->method('afterTraverse');
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -239,7 +237,7 @@ class NodeTraverserTest extends TestCase
// From leaveNode with array parent
$visitor = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor->expects($this->at(6))->method('leaveNode')->with($mulNode)
->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
->willReturn(NodeTraverser::STOP_TRAVERSAL);
$visitor->expects($this->at(7))->method('afterTraverse');
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -248,9 +246,9 @@ class NodeTraverserTest extends TestCase
// Check that pending array modifications are still carried out
$visitor = $this->getMockBuilder(NodeVisitor::class)->getMock();
$visitor->expects($this->at(6))->method('leaveNode')->with($mulNode)
->will($this->returnValue(NodeTraverser::REMOVE_NODE));
->willReturn(NodeTraverser::REMOVE_NODE);
$visitor->expects($this->at(7))->method('enterNode')->with($printNode)
->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
->willReturn(NodeTraverser::STOP_TRAVERSAL);
$visitor->expects($this->at(8))->method('afterTraverse');
$traverser = new NodeTraverser;
$traverser->addVisitor($visitor);
@@ -5,9 +5,8 @@ namespace PhpParser\NodeVisitor;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\NodeTraverser;
use PHPUnit\Framework\TestCase;
class FindingVisitorTest extends TestCase
class FindingVisitorTest extends \PHPUnit\Framework\TestCase
{
public function testFindVariables() {
$traverser = new NodeTraverser();
@@ -5,9 +5,8 @@ namespace PhpParser\NodeVisitor;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\NodeTraverser;
use PHPUnit\Framework\TestCase;
class FirstFindingVisitorTest extends TestCase
class FirstFindingVisitorTest extends \PHPUnit\Framework\TestCase
{
public function testFindFirstVariable() {
$traverser = new NodeTraverser();
@@ -7,16 +7,15 @@ use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
class NameResolverTest extends TestCase
class NameResolverTest extends \PHPUnit\Framework\TestCase
{
private function canonicalize($string) {
return str_replace("\r\n", "\n", $string);
}
/**
* @covers PhpParser\NodeVisitor\NameResolver
* @covers \PhpParser\NodeVisitor\NameResolver
*/
public function testResolveNames() {
$code = <<<'EOC'
@@ -95,6 +94,13 @@ namespace Baz {
C;
E;
K;
class ClassWithTypeProperties
{
public float $php = 7.4;
public ?Foo $person;
protected static ?bool $probability;
}
}
EOC;
$expectedCode = <<<'EOC'
@@ -163,6 +169,12 @@ namespace Baz {
\Y\T\B\C;
\Y\T\D\E;
\Z\T\K;
class ClassWithTypeProperties
{
public float $php = 7.4;
public ?\Baz\Foo $person;
protected static ?bool $probability;
}
}
EOC;
@@ -181,7 +193,7 @@ EOC;
}
/**
* @covers PhpParser\NodeVisitor\NameResolver
* @covers \PhpParser\NodeVisitor\NameResolver
*/
public function testResolveLocations() {
$code = <<<'EOC'
@@ -9,8 +9,6 @@ use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Stmt;
use PhpParser\ParserTest;
require_once __DIR__ . '/../ParserTest.php';
class MultipleTest extends ParserTest
{
// This provider is for the generic parser tests, just pick an arbitrary order here
@@ -84,11 +82,11 @@ class MultipleTest extends ParserTest
$parserA = $this->getMockBuilder(\PhpParser\Parser::class)->getMock();
$parserA->expects($this->at(0))
->method('parse')->will($this->throwException(new Error('FAIL A')));
->method('parse')->willThrowException(new Error('FAIL A'));
$parserB = $this->getMockBuilder(\PhpParser\Parser::class)->getMock();
$parserB->expects($this->at(0))
->method('parse')->will($this->throwException(new Error('FAIL B')));
->method('parse')->willThrowException(new Error('FAIL B'));
$parser = new Multiple([$parserA, $parserB]);
$parser->parse('dummy');
@@ -5,8 +5,6 @@ namespace PhpParser\Parser;
use PhpParser\Lexer;
use PhpParser\ParserTest;
require_once __DIR__ . '/../ParserTest.php';
class Php5Test extends ParserTest
{
protected function getParser(Lexer $lexer) {
@@ -5,8 +5,6 @@ namespace PhpParser\Parser;
use PhpParser\Lexer;
use PhpParser\ParserTest;
require_once __DIR__ . '/../ParserTest.php';
class Php7Test extends ParserTest
{
protected function getParser(Lexer $lexer) {
@@ -4,9 +4,8 @@ namespace PhpParser;
/* This test is very weak, because PHPUnit's assertEquals assertion is way too slow dealing with the
* large objects involved here. So we just do some basic instanceof tests instead. */
use PHPUnit\Framework\TestCase;
class ParserFactoryTest extends TestCase
class ParserFactoryTest extends \PHPUnit\Framework\TestCase
{
/** @dataProvider provideTestCreate */
public function testCreate($kind, $lexer, $expected) {
+5 -2
View File
@@ -6,9 +6,8 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Scalar;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt;
use PHPUnit\Framework\TestCase;
abstract class ParserTest extends TestCase
abstract class ParserTest extends \PHPUnit\Framework\TestCase
{
/** @returns Parser */
abstract protected function getParser(Lexer $lexer);
@@ -167,6 +166,10 @@ EOC;
["namespace Foo;", ['kind' => Stmt\Namespace_::KIND_SEMICOLON]],
["namespace Foo {}", ['kind' => Stmt\Namespace_::KIND_BRACED]],
["namespace {}", ['kind' => Stmt\Namespace_::KIND_BRACED]],
["(float) 5.0", ['kind' => Expr\Cast\Double::KIND_FLOAT]],
["(double) 5.0", ['kind' => Expr\Cast\Double::KIND_DOUBLE]],
["(real) 5.0", ['kind' => Expr\Cast\Double::KIND_REAL]],
[" ( REAL ) 5.0", ['kind' => Expr\Cast\Double::KIND_REAL]],
];
}
}
@@ -12,8 +12,6 @@ use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt;
use PhpParser\PrettyPrinter\Standard;
require_once __DIR__ . '/CodeTestAbstract.php';
class PrettyPrinterTest extends CodeTestAbstract
{
protected function doTestPrettyPrintMethod($method, $name, $code, $expected, $modeLine) {
@@ -13,4 +13,16 @@ $new->args[] = new Expr\Variable('y');
<?php
new class
($x, $y)
{ };
{ };
-----
<?php
new class
{};
-----
// Ignore name assigned to anon class
$new = $stmts[0]->expr;
$new->class->name = new Node\Identifier('Anon1');
-----
<?php
new class
{};
@@ -18,6 +18,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_PROTECTED (2)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -756,6 +756,7 @@ array(
)
3: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -975,6 +976,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
+19 -8
View File
@@ -17,6 +17,7 @@ $a += $b;
$a <<= $b;
$a >>= $b;
$a **= $b;
$a ??= $b;
// chained assign
$a = $b *= $c **= $d;
@@ -185,6 +186,16 @@ array(
)
)
13: Stmt_Expression(
expr: Expr_AssignOp_Coalesce(
var: Expr_Variable(
name: a
)
expr: Expr_Variable(
name: b
)
)
)
14: Stmt_Expression(
expr: Expr_Assign(
var: Expr_Variable(
name: a
@@ -213,7 +224,7 @@ array(
0: // chained assign
)
)
14: Stmt_Expression(
15: Stmt_Expression(
expr: Expr_AssignRef(
var: Expr_Variable(
name: a
@@ -232,7 +243,7 @@ array(
0: // by ref assign
)
)
15: Stmt_Expression(
16: Stmt_Expression(
expr: Expr_Assign(
var: Expr_List(
items: array(
@@ -259,7 +270,7 @@ array(
0: // list() assign
)
)
16: Stmt_Expression(
17: Stmt_Expression(
expr: Expr_Assign(
var: Expr_List(
items: array(
@@ -285,7 +296,7 @@ array(
)
)
)
17: Stmt_Expression(
18: Stmt_Expression(
expr: Expr_Assign(
var: Expr_List(
items: array(
@@ -326,7 +337,7 @@ array(
)
)
)
18: Stmt_Expression(
19: Stmt_Expression(
expr: Expr_PreInc(
var: Expr_Variable(
name: a
@@ -339,21 +350,21 @@ array(
0: // inc/dec
)
)
19: Stmt_Expression(
20: Stmt_Expression(
expr: Expr_PostInc(
var: Expr_Variable(
name: a
)
)
)
20: Stmt_Expression(
21: Stmt_Expression(
expr: Expr_PreDec(
var: Expr_Variable(
name: a
)
)
)
21: Stmt_Expression(
22: Stmt_Expression(
expr: Expr_PostDec(
var: Expr_Variable(
name: a
@@ -112,6 +112,7 @@ array(
)
4: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -123,6 +124,7 @@ array(
)
5: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -89,6 +89,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -24,6 +24,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: 0
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -35,6 +36,7 @@ array(
)
1: Stmt_Property(
flags: MODIFIER_STATIC (8)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -15,6 +15,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -43,6 +44,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_PUBLIC | MODIFIER_PROTECTED (3)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -99,6 +101,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_STATIC (8)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -207,6 +210,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_ABSTRACT (16)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -235,6 +239,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: MODIFIER_FINAL (32)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -20,6 +20,7 @@ array(
stmts: array(
0: Stmt_Property(
flags: 0
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -63,6 +63,7 @@ array(
)
1: Stmt_Property(
flags: MODIFIER_PUBLIC (1)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -84,6 +85,7 @@ array(
)
2: Stmt_Property(
flags: MODIFIER_PROTECTED (2)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -95,6 +97,7 @@ array(
)
3: Stmt_Property(
flags: MODIFIER_PRIVATE (4)
type: null
props: array(
0: Stmt_PropertyProperty(
name: VarLikeIdentifier(
@@ -19,6 +19,9 @@ $a--;
(float) $a;
(double) $a;
(real) $a;
( float) $a;
(double ) $a;
( REAL ) $a;
(string) $a;
(binary) $a;
(array) $a;
@@ -53,9 +56,9 @@ $a || $b;
$a ? $b : $c;
$a ?: $c;
$a ?? $c;
$a = $b;
$a **= $b;
$a ??= $c;
$a *= $b;
$a /= $b;
$a %= $b;
@@ -87,9 +90,12 @@ $a--;
+$a;
(int) $a;
(int) $a;
(float) $a;
(double) $a;
(real) $a;
(float) $a;
(double) $a;
(double) $a;
(real) $a;
(string) $a;
(string) $a;
(array) $a;
@@ -125,6 +131,7 @@ $a ?: $c;
$a ?? $c;
$a = $b;
$a **= $b;
$a ??= $c;
$a *= $b;
$a /= $b;
$a %= $b;