From 0b5f9fbe415f24b6200b3c0b96e4102ce8bb153d Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Mon, 15 Sep 2014 10:04:32 -0400 Subject: [PATCH] Update nikic/php-parser to 1.0.* --- composer.json | 2 +- .../BaseGeneratorStrategy.php | 14 ++--- .../FileWriterGeneratorStrategy.php | 8 +-- .../GeneratorStrategyInterface.php | 2 +- .../ReflectionBuilder/ClassBuilder.php | 56 +++++++++---------- .../Visitor/ClassClonerVisitor.php | 14 ++--- .../Visitor/ClassExtensionVisitor.php | 34 +++++------ .../Visitor/ClassFQCNResolverVisitor.php | 24 ++++---- .../Visitor/ClassImplementorVisitor.php | 36 ++++++------ .../Visitor/ClassRenamerVisitor.php | 40 ++++++------- .../Visitor/MethodDisablerVisitor.php | 34 +++++------ .../Visitor/PublicMethodsFilterVisitor.php | 14 ++--- .../BaseGeneratorStrategyTest.php | 6 +- .../EvaluatingGeneratorStrategyTest.php | 6 +- .../FileWriterGeneratorStrategyTest.php | 10 ++-- .../ReflectionBuilder/ClassBuilderTest.php | 24 ++++---- .../Visitor/ClassClonerVisitorTest.php | 8 +-- .../Visitor/ClassExtensionVisitorTest.php | 20 +++---- .../Visitor/ClassFQCNResolverVisitorTest.php | 20 +++---- .../Visitor/ClassImplementorVisitorTest.php | 20 +++---- .../Visitor/ClassRenamerVisitorTest.php | 42 +++++++------- .../Visitor/MethodDisablerVisitorTest.php | 18 +++--- .../PublicMethodsFilterVisitorTest.php | 27 ++++----- 23 files changed, 241 insertions(+), 238 deletions(-) diff --git a/composer.json b/composer.json index 7b5b43e0..839ae3e0 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": ">=5.3.3", - "nikic/php-parser": "0.9.*" + "nikic/php-parser": "1.0.*" }, "require-dev": { "phpunit/phpunit": ">=3.7", diff --git a/src/CodeGenerationUtils/GeneratorStrategy/BaseGeneratorStrategy.php b/src/CodeGenerationUtils/GeneratorStrategy/BaseGeneratorStrategy.php index c1af9a4a..b708e652 100644 --- a/src/CodeGenerationUtils/GeneratorStrategy/BaseGeneratorStrategy.php +++ b/src/CodeGenerationUtils/GeneratorStrategy/BaseGeneratorStrategy.php @@ -18,8 +18,8 @@ namespace CodeGenerationUtils\GeneratorStrategy; -use PHPParser_PrettyPrinter_Default; -use PHPParser_PrettyPrinterAbstract; +use PhpParser\PrettyPrinter\Standard; +use PhpParser\PrettyPrinterAbstract; /** * Generator strategy that generates the class body @@ -30,7 +30,7 @@ class BaseGeneratorStrategy implements GeneratorStrategyInterface { /** - * @var \PHPParser_PrettyPrinterAbstract|null + * @var \PhpParser\PrettyPrinterAbstract|null */ private $prettyPrinter; @@ -43,18 +43,18 @@ public function generate(array $ast) } /** - * @param PHPParser_PrettyPrinterAbstract $prettyPrinter + * @param PhpParser\PrettyPrinterAbstract $prettyPrinter */ - public function setPrettyPrinter(PHPParser_PrettyPrinterAbstract $prettyPrinter) + public function setPrettyPrinter(PrettyPrinterAbstract $prettyPrinter) { $this->prettyPrinter = $prettyPrinter; } /** - * @return PHPParser_PrettyPrinterAbstract + * @return PhpParser\PrettyPrinterAbstract */ protected function getPrettyPrinter() { - return $this->prettyPrinter ?: $this->prettyPrinter = new PHPParser_PrettyPrinter_Default(); + return $this->prettyPrinter ?: $this->prettyPrinter = new Standard(); } } diff --git a/src/CodeGenerationUtils/GeneratorStrategy/FileWriterGeneratorStrategy.php b/src/CodeGenerationUtils/GeneratorStrategy/FileWriterGeneratorStrategy.php index ab83a196..e82606e5 100644 --- a/src/CodeGenerationUtils/GeneratorStrategy/FileWriterGeneratorStrategy.php +++ b/src/CodeGenerationUtils/GeneratorStrategy/FileWriterGeneratorStrategy.php @@ -20,8 +20,8 @@ use CodeGenerationUtils\FileLocator\FileLocatorInterface; use CodeGenerationUtils\Visitor\ClassFQCNResolverVisitor; -use PHPParser_Node_Stmt_Class; -use PHPParser_NodeTraverser; +use PhpParser\Node\Stmt\Class_; +use PhpParser\NodeTraverser; /** * Generator strategy that writes the generated classes to disk while generating them @@ -39,7 +39,7 @@ class FileWriterGeneratorStrategy extends BaseGeneratorStrategy protected $fileLocator; /** - * @var \PHPParser_NodeTraverserInterface + * @var \PhpParser\NodeTraverserInterface */ private $traverser; @@ -52,7 +52,7 @@ class FileWriterGeneratorStrategy extends BaseGeneratorStrategy public function __construct(FileLocatorInterface $fileLocator) { $this->fileLocator = $fileLocator; - $this->traverser = new PHPParser_NodeTraverser(); + $this->traverser = new NodeTraverser(); $this->visitor = new ClassFQCNResolverVisitor(); $this->traverser->addVisitor($this->visitor); diff --git a/src/CodeGenerationUtils/GeneratorStrategy/GeneratorStrategyInterface.php b/src/CodeGenerationUtils/GeneratorStrategy/GeneratorStrategyInterface.php index 95b383f4..232a142d 100644 --- a/src/CodeGenerationUtils/GeneratorStrategy/GeneratorStrategyInterface.php +++ b/src/CodeGenerationUtils/GeneratorStrategy/GeneratorStrategyInterface.php @@ -29,7 +29,7 @@ interface GeneratorStrategyInterface /** * Generate the provided AST as a class * - * @param \PHPParser_Node[] $ast + * @param \PhpParser\Node[] $ast * * @return string the class body */ diff --git a/src/CodeGenerationUtils/ReflectionBuilder/ClassBuilder.php b/src/CodeGenerationUtils/ReflectionBuilder/ClassBuilder.php index ca232cf6..a52bcc84 100644 --- a/src/CodeGenerationUtils/ReflectionBuilder/ClassBuilder.php +++ b/src/CodeGenerationUtils/ReflectionBuilder/ClassBuilder.php @@ -18,18 +18,18 @@ namespace CodeGenerationUtils\ReflectionBuilder; -use PHPParser_Builder_Method; -use PHPParser_Builder_Param; -use PHPParser_Builder_Property; -use PHPParser_BuilderAbstract; -use PHPParser_Node; -use PHPParser_Node_Const; -use PHPParser_Node_Expr_ConstFetch; -use PHPParser_Node_Name; -use PHPParser_Node_Name_FullyQualified; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_ClassConst; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Builder\Method; +use PhpParser\Builder\Param; +use PhpParser\Builder\Property; +use PhpParser\BuilderAbstract; +use PhpParser\Node; +use PhpParser\Node\Const_; +use PhpParser\Node\Expr\ConstFetch; +use PhpParser\Node\Name; +use PhpParser\Node\Name\FullyQualified; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\ClassConst; +use PhpParser\Node\Stmt\Namespace_; use ReflectionClass; use ReflectionMethod; use ReflectionParameter; @@ -43,33 +43,33 @@ * @author Marco Pivetta * @license MIT */ -class ClassBuilder extends PHPParser_BuilderAbstract +class ClassBuilder extends BuilderAbstract { /** * @param \ReflectionClass $reflectionClass * - * @return PHPParser_Node[] + * @return PhpParser\Node[] */ public function fromReflection(ReflectionClass $reflectionClass) { - $class = new PHPParser_Node_Stmt_Class($reflectionClass->getShortName()); + $class = new Class_($reflectionClass->getShortName()); $stmts = array($class); if ($parentClass = $reflectionClass->getParentClass()) { - $class->extends = new PHPParser_Node_Name_FullyQualified($parentClass->getName()); + $class->extends = new FullyQualified($parentClass->getName()); } $interfaces = array(); foreach ($reflectionClass->getInterfaces() as $reflectionInterface) { - $interfaces[] = new PHPParser_Node_Name_FullyQualified($reflectionInterface->getName()); + $interfaces[] = new FullyQualified($reflectionInterface->getName()); } $class->implements = $interfaces; foreach ($reflectionClass->getConstants() as $constant => $value) { - $class->stmts[] = new PHPParser_Node_Stmt_ClassConst( - array(new PHPParser_Node_Const($constant, $this->normalizeValue($value))) + $class->stmts[] = new ClassConst( + array(new Const_($constant, $this->normalizeValue($value))) ); } @@ -85,7 +85,7 @@ public function fromReflection(ReflectionClass $reflectionClass) return $stmts; } - return array(new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name(explode('\\', $namespace)), $stmts)); + return array(new Namespace_(new Name(explode('\\', $namespace)), $stmts)); } /** @@ -99,11 +99,11 @@ public function getNode() /** * @param ReflectionProperty $reflectionProperty * - * @return \PHPParser_Node_Stmt_Property + * @return \PhpParser\Node\Stmt\Property */ protected function buildProperty(ReflectionProperty $reflectionProperty) { - $propertyBuilder = new PHPParser_Builder_Property($reflectionProperty->getName()); + $propertyBuilder = new Property($reflectionProperty->getName()); if ($reflectionProperty->isPublic()) { $propertyBuilder->makePublic(); @@ -133,11 +133,11 @@ protected function buildProperty(ReflectionProperty $reflectionProperty) /** * @param ReflectionMethod $reflectionMethod * - * @return \PHPParser_Node_Stmt_ClassMethod + * @return \PhpParser\Node\Stmt\ClassMethod */ protected function buildMethod(ReflectionMethod $reflectionMethod) { - $methodBuilder = new PHPParser_Builder_Method($reflectionMethod->getName()); + $methodBuilder = new Method($reflectionMethod->getName()); if ($reflectionMethod->isPublic()) { $methodBuilder->makePublic(); @@ -179,11 +179,11 @@ protected function buildMethod(ReflectionMethod $reflectionMethod) /** * @param ReflectionParameter $reflectionParameter * - * @return \PHPParser_Node_Param + * @return \PhpParser\Node\Param */ protected function buildParameter(ReflectionParameter $reflectionParameter) { - $parameterBuilder = new PHPParser_Builder_Param($reflectionParameter->getName()); + $parameterBuilder = new Param($reflectionParameter->getName()); if ($reflectionParameter->isPassedByReference()) { $parameterBuilder->makeByRef(); @@ -206,8 +206,8 @@ protected function buildParameter(ReflectionParameter $reflectionParameter) && $reflectionParameter->isDefaultValueConstant() ) { $parameterBuilder->setDefault( - new PHPParser_Node_Expr_ConstFetch( - new PHPParser_Node_Name($reflectionParameter->getDefaultValueConstantName()) + new ConstFetch( + new Name($reflectionParameter->getDefaultValueConstantName()) ) ); } else { diff --git a/src/CodeGenerationUtils/Visitor/ClassClonerVisitor.php b/src/CodeGenerationUtils/Visitor/ClassClonerVisitor.php index e33fc5ec..b032616c 100644 --- a/src/CodeGenerationUtils/Visitor/ClassClonerVisitor.php +++ b/src/CodeGenerationUtils/Visitor/ClassClonerVisitor.php @@ -18,10 +18,10 @@ namespace CodeGenerationUtils\Visitor; -use PHPParser_Lexer_Emulative; -use PHPParser_Node; -use PHPParser_NodeVisitorAbstract; -use PHPParser_Parser; +use PhpParser\Lexer\Emulative; +use PhpParser\Node; +use PhpParser\NodeVisitorAbstract; +use PhpParser\Parser; use ReflectionClass; /** @@ -33,7 +33,7 @@ * @author Marco Pivetta * @license MIT */ -class ClassClonerVisitor extends PHPParser_NodeVisitorAbstract +class ClassClonerVisitor extends NodeVisitorAbstract { /** * @var ReflectionClass @@ -54,13 +54,13 @@ public function __construct(ReflectionClass $reflectedClass) * * @param array $nodes * - * @return \PHPParser_Node[] + * @return \PhpParser\Node[] */ public function beforeTraverse(array $nodes) { // quickfix - if the list is empty, replace it it if (empty($nodes)) { - $parser = new PHPParser_Parser(new PHPParser_Lexer_Emulative); + $parser = new Parser(new Emulative); return $parser->parse(file_get_contents($this->reflectedClass->getFileName())); } diff --git a/src/CodeGenerationUtils/Visitor/ClassExtensionVisitor.php b/src/CodeGenerationUtils/Visitor/ClassExtensionVisitor.php index 99c25168..b703592b 100644 --- a/src/CodeGenerationUtils/Visitor/ClassExtensionVisitor.php +++ b/src/CodeGenerationUtils/Visitor/ClassExtensionVisitor.php @@ -18,11 +18,11 @@ namespace CodeGenerationUtils\Visitor; -use PHPParser_Node; -use PHPParser_Node_Name_FullyQualified; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; -use PHPParser_NodeVisitorAbstract; +use PhpParser\Node; +use PhpParser\Node\Name\FullyQualified; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; +use PhpParser\NodeVisitorAbstract; /** * Visitor that extends the matched class in the visited AST from another given class @@ -30,7 +30,7 @@ * @author Marco Pivetta * @license MIT */ -class ClassExtensionVisitor extends PHPParser_NodeVisitorAbstract +class ClassExtensionVisitor extends NodeVisitorAbstract { /** * @var string @@ -43,7 +43,7 @@ class ClassExtensionVisitor extends PHPParser_NodeVisitorAbstract private $newParentClassFQCN; /** - * @var \PHPParser_Node_Stmt_Namespace|null + * @var \PhpParser\Node\Stmt\Namespace_|null */ private $currentNamespace; @@ -70,13 +70,13 @@ public function beforeTraverse(array $nodes) } /** - * @param PHPParser_Node $node + * @param PhpParser\Node $node * - * @return PHPParser_Node_Stmt_Namespace|null + * @return PhpParser\Node\Stmt\Namespace_|null */ - public function enterNode(PHPParser_Node $node) + public function enterNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { $this->currentNamespace = $node; return $node; @@ -91,23 +91,23 @@ public function enterNode(PHPParser_Node $node) * * @todo can be abstracted away into a visitor that allows to modify the node via a callback * - * @param PHPParser_Node $node + * @param PhpParser\Node $node * - * @return PHPParser_Node_Stmt_Class|void + * @return PhpParser\Node\Stmt\Class_|void */ - public function leaveNode(PHPParser_Node $node) + public function leaveNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { $this->currentNamespace = null; } - if ($node instanceof PHPParser_Node_Stmt_Class) { + if ($node instanceof Class_) { $namespace = ($this->currentNamespace && is_array($this->currentNamespace->name->parts)) ? implode('\\', $this->currentNamespace->name->parts) : ''; if (trim($namespace . '\\' . $node->name, '\\') === $this->matchedClassFQCN) { - $node->extends = new PHPParser_Node_Name_FullyQualified($this->newParentClassFQCN); + $node->extends = new FullyQualified($this->newParentClassFQCN); } return $node; diff --git a/src/CodeGenerationUtils/Visitor/ClassFQCNResolverVisitor.php b/src/CodeGenerationUtils/Visitor/ClassFQCNResolverVisitor.php index a4d6ee4c..cbef00d8 100644 --- a/src/CodeGenerationUtils/Visitor/ClassFQCNResolverVisitor.php +++ b/src/CodeGenerationUtils/Visitor/ClassFQCNResolverVisitor.php @@ -19,11 +19,11 @@ namespace CodeGenerationUtils\Visitor; use CodeGenerationUtils\Visitor\Exception\UnexpectedValueException; -use PHPParser_Node; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; -use PHPParser_NodeVisitorAbstract; -use PHPParser_Parser; +use PhpParser\Node; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; +use PhpParser\NodeVisitorAbstract; +use PhpParser\Parser; /** * Resolves the FQCN of the class included in the AST. @@ -32,15 +32,15 @@ * @author Marco Pivetta * @license MIT */ -class ClassFQCNResolverVisitor extends PHPParser_NodeVisitorAbstract +class ClassFQCNResolverVisitor extends NodeVisitorAbstract { /** - * @var PHPParser_Node_Stmt_Namespace|null + * @var PhpParser\Node\Stmt\Namespace_|null */ private $namespace; /** - * @var PHPParser_Node_Stmt_Class|null + * @var PhpParser\Node\Stmt\Class_|null */ private $class; @@ -56,13 +56,13 @@ public function beforeTraverse(array $nodes) } /** - * @param PHPParser_Node $node + * @param PhpParser\Node $node * * @throws Exception\UnexpectedValueException if more than one class is found */ - public function enterNode(PHPParser_Node $node) + public function enterNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { if ($this->namespace) { throw new UnexpectedValueException('Multiple nested namespaces discovered (invalid AST?)'); } @@ -70,7 +70,7 @@ public function enterNode(PHPParser_Node $node) $this->namespace = $node; } - if ($node instanceof PHPParser_Node_Stmt_Class) { + if ($node instanceof Class_) { if ($this->class) { throw new UnexpectedValueException('Multiple classes discovered'); } diff --git a/src/CodeGenerationUtils/Visitor/ClassImplementorVisitor.php b/src/CodeGenerationUtils/Visitor/ClassImplementorVisitor.php index 4da7f831..0fd1564b 100644 --- a/src/CodeGenerationUtils/Visitor/ClassImplementorVisitor.php +++ b/src/CodeGenerationUtils/Visitor/ClassImplementorVisitor.php @@ -18,11 +18,11 @@ namespace CodeGenerationUtils\Visitor; -use PHPParser_Node; -use PHPParser_Node_Name_FullyQualified; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; -use PHPParser_NodeVisitorAbstract; +use PhpParser\Node; +use PhpParser\Node\Name\FullyQualified; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; +use PhpParser\NodeVisitorAbstract; /** * Implements the given interfaces on the given class name within the AST @@ -30,17 +30,17 @@ * @author Marco Pivetta * @license MIT */ -class ClassImplementorVisitor extends PHPParser_NodeVisitorAbstract +class ClassImplementorVisitor extends NodeVisitorAbstract { private $matchedClassFQCN; /** - * @var \PHPParser_Node_Name[] + * @var \PhpParser\Node\Name[] */ private $interfaces; /** - * @var PHPParser_Node_Stmt_Namespace|null + * @var PhpParser\Node\Stmt\Namespace_|null */ private $currentNamespace; @@ -53,7 +53,7 @@ public function __construct($matchedClassFQCN, array $interfaces) $this->matchedClassFQCN = (string) $matchedClassFQCN; $this->interfaces = array_map( function ($interfaceName) { - return new PHPParser_Node_Name_FullyQualified($interfaceName); + return new FullyQualified($interfaceName); }, $interfaces ); @@ -70,13 +70,13 @@ public function beforeTraverse(array $nodes) } /** - * @param PHPParser_Node $node + * @param PhpParser\Node $node * - * @return PHPParser_Node_Stmt_Namespace|void + * @return PhpParser\Node\Stmt\Namespace_|void */ - public function enterNode(PHPParser_Node $node) + public function enterNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { $this->currentNamespace = $node; return $node; @@ -87,19 +87,19 @@ public function enterNode(PHPParser_Node $node) * Replaces class nodes with nodes implementing the given interfaces. Implemented interfaces are replaced, * not added. * - * @param PHPParser_Node $node + * @param PhpParser\Node $node * * @todo can be abstracted away into a visitor that allows to modify the matched node via a callback * - * @return PHPParser_Node_Stmt_Class|void + * @return PhpParser\Node\Stmt\Class_|void */ - public function leaveNode(PHPParser_Node $node) + public function leaveNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { $this->currentNamespace = null; } - if ($node instanceof PHPParser_Node_Stmt_Class) { + if ($node instanceof Class_) { $namespace = ($this->currentNamespace && is_array($this->currentNamespace->name->parts)) ? implode('\\', $this->currentNamespace->name->parts) : ''; diff --git a/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php b/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php index 049459b6..a58f961d 100644 --- a/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php +++ b/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php @@ -18,13 +18,13 @@ namespace CodeGenerationUtils\Visitor; -use PHPParser_Lexer_Emulative; -use PHPParser_Node; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; -use PHPParser_NodeVisitorAbstract; -use PHPParser_Parser; +use PhpParser\Lexer\Emulative; +use PhpParser\Node; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; +use PhpParser\NodeVisitorAbstract; +use PhpParser\Parser; use ReflectionClass; /** @@ -34,7 +34,7 @@ * @author Marco Pivetta * @license MIT */ -class ClassRenamerVisitor extends PHPParser_NodeVisitorAbstract +class ClassRenamerVisitor extends NodeVisitorAbstract { /** * @var ReflectionClass @@ -52,12 +52,12 @@ class ClassRenamerVisitor extends PHPParser_NodeVisitorAbstract private $newNamespace; /** - * @var PHPParser_Node_Stmt_Namespace|null + * @var PhpParser\Node\Stmt\Namespace_|null */ private $currentNamespace; /** - * @var PHPParser_Node_Stmt_Class|null the currently detected class in this namespace + * @var PhpParser\Node\Stmt\Class_|null the currently detected class in this namespace */ private $replacedInNamespace; @@ -86,13 +86,13 @@ public function beforeTraverse(array $nodes) } /** - * @param PHPParser_Node $node + * @param PhpParser\Node $node * - * @return PHPParser_Node_Stmt_Namespace|void + * @return PhpParser\Node\Stmt\Namespace_|void */ - public function enterNode(PHPParser_Node $node) + public function enterNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { return $this->currentNamespace = $node; } } @@ -100,15 +100,15 @@ public function enterNode(PHPParser_Node $node) /** * Replaces (if matching) the given node to comply with the new given name * - * @param PHPParser_Node $node + * @param PhpParser\Node $node * * @todo can be abstracted away into a visitor that allows to modify the matched node via a callback * - * @return array|null|PHPParser_Node_Stmt_Class|PHPParser_Node_Stmt_Namespace|void + * @return array|null|PhpParser\Node\Stmt\Class_|PhpParser\Node\Stmt\Namespace_|void */ - public function leaveNode(PHPParser_Node $node) + public function leaveNode(Node $node) { - if ($node instanceof PHPParser_Node_Stmt_Namespace) { + if ($node instanceof Namespace_) { $namespace = $this->currentNamespace; $replacedInNamespace = $this->replacedInNamespace; $this->currentNamespace = null; @@ -126,7 +126,7 @@ public function leaveNode(PHPParser_Node $node) } } - if ($node instanceof PHPParser_Node_Stmt_Class + if ($node instanceof Class_ && $this->namespaceMatches() && ($this->reflectedClass->getShortName() === $node->name) ) { @@ -138,7 +138,7 @@ public function leaveNode(PHPParser_Node $node) $this->currentNamespace->stmts = array($node); } elseif ($this->newNamespace) { // wrap in namespace if no previous namespace exists - return new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name($this->newNamespace), array($node)); + return new Namespace_(new Name($this->newNamespace), array($node)); } return $node; diff --git a/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php b/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php index 1785e082..ad9de858 100644 --- a/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php +++ b/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php @@ -18,12 +18,14 @@ namespace CodeGenerationUtils\Visitor; -use PHPParser_Node; -use PHPParser_Node_Expr_New; -use PHPParser_Node_Name_FullyQualified; -use PHPParser_Node_Stmt_ClassMethod; -use PHPParser_Node_Stmt_Throw; -use PHPParser_NodeVisitorAbstract; +use PhpParser\Node; +use PhpParser\Node\Arg; +use PhpParser\Node\Expr\New_; +use PhpParser\Node\Name\FullyQualified; +use PhpParser\Node\Scalar\String; +use PhpParser\Node\Stmt\ClassMethod; +use PhpParser\Node\Stmt\Throw_; +use PhpParser\NodeVisitorAbstract; /** * Disables class methods matching a given filter by replacing their body so that @@ -32,7 +34,7 @@ * @author Marco Pivetta * @license MIT */ -class MethodDisablerVisitor extends PHPParser_NodeVisitorAbstract +class MethodDisablerVisitor extends NodeVisitorAbstract { /** * @var callable @@ -43,7 +45,7 @@ class MethodDisablerVisitor extends PHPParser_NodeVisitorAbstract * Constructor. * * @param callable $filter a filter method that accepts a single parameter of - * type {@see \PHPParser_Node} and returns null|true|false to + * type {@see \PhpParser\Node} and returns null|true|false to * respectively ignore, remove or replace it. */ public function __construct($filter) @@ -54,15 +56,15 @@ public function __construct($filter) /** * Replaces the given node if it is a class method and matches according to the given callback * - * @param PHPParser_Node $node + * @param PhpParser\Node $node * - * @return bool|null|PHPParser_Node_Stmt_ClassMethod + * @return bool|null|PhpParser\Node\Stmt\ClassMethod */ - public function leaveNode(PHPParser_Node $node) + public function leaveNode(Node $node) { $filter = $this->filter; - if (! $node instanceof PHPParser_Node_Stmt_ClassMethod || null === ($filterResult = $filter($node))) { + if (! $node instanceof ClassMethod || null === ($filterResult = $filter($node))) { return null; } @@ -71,10 +73,10 @@ public function leaveNode(PHPParser_Node $node) } $node->stmts = array( - new PHPParser_Node_Stmt_Throw( - new PHPParser_Node_Expr_New( - new PHPParser_Node_Name_FullyQualified('BadMethodCallException'), - array(new \PHPParser_Node_Arg(new \PHPParser_Node_Scalar_String('Method is disabled'))) + new Throw_( + new New_( + new FullyQualified('BadMethodCallException'), + array(new Arg(new String('Method is disabled'))) ) ) ); diff --git a/src/CodeGenerationUtils/Visitor/PublicMethodsFilterVisitor.php b/src/CodeGenerationUtils/Visitor/PublicMethodsFilterVisitor.php index 563a90b1..1179e0f9 100644 --- a/src/CodeGenerationUtils/Visitor/PublicMethodsFilterVisitor.php +++ b/src/CodeGenerationUtils/Visitor/PublicMethodsFilterVisitor.php @@ -18,9 +18,9 @@ namespace CodeGenerationUtils\Visitor; -use PHPParser_Node; -use PHPParser_Node_Stmt_ClassMethod; -use PHPParser_NodeVisitorAbstract; +use PhpParser\Node; +use PhpParser\Node\Stmt\ClassMethod; +use PhpParser\NodeVisitorAbstract; /** * Removes all non-public class methods @@ -28,17 +28,17 @@ * @author Marco Pivetta * @license MIT */ -class PublicMethodsFilterVisitor extends PHPParser_NodeVisitorAbstract +class PublicMethodsFilterVisitor extends NodeVisitorAbstract { /** * Removes the node if it is a non-public method * - * @param PHPParser_Node $node + * @param PhpParser\Node $node * * @return bool|null */ - public function leaveNode(PHPParser_Node $node) + public function leaveNode(Node $node) { - return ($node instanceof PHPParser_Node_Stmt_ClassMethod && ! $node->isPublic()) ? false : null; + return ($node instanceof ClassMethod && ! $node->isPublic()) ? false : null; } } diff --git a/tests/CodeGenerationUtilsTest/GeneratorStrategy/BaseGeneratorStrategyTest.php b/tests/CodeGenerationUtilsTest/GeneratorStrategy/BaseGeneratorStrategyTest.php index fc05f64e..d85f1b34 100644 --- a/tests/CodeGenerationUtilsTest/GeneratorStrategy/BaseGeneratorStrategyTest.php +++ b/tests/CodeGenerationUtilsTest/GeneratorStrategy/BaseGeneratorStrategyTest.php @@ -20,7 +20,7 @@ use CodeGenerationUtils\GeneratorStrategy\BaseGeneratorStrategy; use CodeGenerationUtils\Inflector\Util\UniqueIdentifierGenerator; -use PHPParser_Node_Stmt_Class; +use PhpParser\Node\Stmt\Class_; use PHPUnit_Framework_TestCase; /** @@ -38,7 +38,7 @@ public function testGenerate() { $strategy = new BaseGeneratorStrategy(); $className = UniqueIdentifierGenerator::getIdentifier('Foo'); - $generated = $strategy->generate(array(new PHPParser_Node_Stmt_Class($className))); + $generated = $strategy->generate(array(new Class_($className))); $this->assertGreaterThan(0, strpos($generated, $className)); } @@ -51,7 +51,7 @@ public function testSetPrettyPrinter() { $strategy = new BaseGeneratorStrategy(); - $prettyPrinter = $this->getMock('PHPParser_PrettyPrinterAbstract'); + $prettyPrinter = $this->getMock('PhpParser\PrettyPrinterAbstract'); $prettyPrinter ->expects($this->once()) diff --git a/tests/CodeGenerationUtilsTest/GeneratorStrategy/EvaluatingGeneratorStrategyTest.php b/tests/CodeGenerationUtilsTest/GeneratorStrategy/EvaluatingGeneratorStrategyTest.php index 54b4aaa0..b16ea591 100644 --- a/tests/CodeGenerationUtilsTest/GeneratorStrategy/EvaluatingGeneratorStrategyTest.php +++ b/tests/CodeGenerationUtilsTest/GeneratorStrategy/EvaluatingGeneratorStrategyTest.php @@ -20,7 +20,7 @@ use CodeGenerationUtils\GeneratorStrategy\EvaluatingGeneratorStrategy; use CodeGenerationUtils\Inflector\Util\UniqueIdentifierGenerator; -use PHPParser_Node_Stmt_Class; +use PhpParser\Node\Stmt\Class_; use PHPUnit_Framework_TestCase; /** @@ -39,7 +39,7 @@ public function testGenerate() { $strategy = new EvaluatingGeneratorStrategy(); $className = UniqueIdentifierGenerator::getIdentifier('Foo'); - $generated = $strategy->generate(array(new PHPParser_Node_Stmt_Class($className))); + $generated = $strategy->generate(array(new Class_($className))); $this->assertGreaterThan(0, strpos($generated, $className)); $this->assertTrue(class_exists($className, false)); @@ -57,7 +57,7 @@ public function testGenerateWithDisabledEval() $strategy = new EvaluatingGeneratorStrategy(); $className = 'Foo' . uniqid(); - $generated = $strategy->generate(array(new PHPParser_Node_Stmt_Class($className))); + $generated = $strategy->generate(array(new Class_($className))); $this->assertGreaterThan(0, strpos($generated, $className)); $this->assertTrue(class_exists($className, false)); diff --git a/tests/CodeGenerationUtilsTest/GeneratorStrategy/FileWriterGeneratorStrategyTest.php b/tests/CodeGenerationUtilsTest/GeneratorStrategy/FileWriterGeneratorStrategyTest.php index beca18b1..60568bab 100644 --- a/tests/CodeGenerationUtilsTest/GeneratorStrategy/FileWriterGeneratorStrategyTest.php +++ b/tests/CodeGenerationUtilsTest/GeneratorStrategy/FileWriterGeneratorStrategyTest.php @@ -20,9 +20,9 @@ use CodeGenerationUtils\GeneratorStrategy\FileWriterGeneratorStrategy; use CodeGenerationUtils\Inflector\Util\UniqueIdentifierGenerator; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; /** @@ -51,8 +51,8 @@ public function testGenerate() ->with($fqcn) ->will($this->returnValue($tmpFile)); - $class = new PHPParser_Node_Stmt_Class($className); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Foo'), array($class)); + $class = new Class_($className); + $namespace = new Namespace_(new Name('Foo'), array($class)); $body = $generator->generate(array($namespace)); $this->assertGreaterThan(0, strpos($body, $className)); diff --git a/tests/CodeGenerationUtilsTest/ReflectionBuilder/ClassBuilderTest.php b/tests/CodeGenerationUtilsTest/ReflectionBuilder/ClassBuilderTest.php index 0233cd2e..96962f73 100644 --- a/tests/CodeGenerationUtilsTest/ReflectionBuilder/ClassBuilderTest.php +++ b/tests/CodeGenerationUtilsTest/ReflectionBuilder/ClassBuilderTest.php @@ -20,7 +20,7 @@ use CodeGenerationUtils\ReflectionBuilder\ClassBuilder; use CodeGenerationUtilsTest\ReflectionBuilder\ClassWithDefaultValueIsConstantMethod; -use PHPParser_Node_Stmt_ClassMethod; +use PhpParser\Node\Stmt\ClassMethod; use PHPUnit_Framework_TestCase; use ReflectionClass; @@ -41,30 +41,30 @@ public function testBuildSelf() { $classBuilder = new ClassBuilder(); $ast = $classBuilder->fromReflection(new ReflectionClass(__CLASS__)); - /* @var $namespace \PHPParser_Node_Stmt_Namespace */ + /* @var $namespace \PhpParser\Node\Stmt\Namespace_ */ $namespace = $ast[0]; - $this->assertInstanceOf('PHPParser_Node_Stmt_Namespace', $namespace); + $this->assertInstanceOf('PhpParser\Node\Stmt\Namespace_', $namespace); $this->assertSame(__NAMESPACE__, $namespace->name->toString()); - /* @var $class \PHPParser_Node_Stmt_Class */ + /* @var $class \PhpParser\Node\Stmt\Class_ */ $class = $namespace->stmts[0]; - $this->assertInstanceOf('PHPParser_Node_Stmt_Class', $class); + $this->assertInstanceOf('PhpParser\Node\Stmt\Class_', $class); $this->assertSame('ClassBuilderTest', $class->name); $currentMethod = __FUNCTION__; - /* @var $methods PHPParser_Node_Stmt_ClassMethod[] */ + /* @var $methods PhpParser\Node\Stmt\ClassMethod[] */ $methods = array_filter( $class->stmts, function ($node) use ($currentMethod) { - return $node instanceof PHPParser_Node_Stmt_ClassMethod && $node->name === $currentMethod; + return $node instanceof ClassMethod && $node->name === $currentMethod; } ); $this->assertCount(1, $methods); - /* @var $thisMethod PHPParser_Node_Stmt_ClassMethod */ + /* @var $thisMethod PhpParser\Node\Stmt\ClassMethod */ $thisMethod = reset($methods); $this->assertSame($currentMethod, $thisMethod->name); @@ -79,22 +79,22 @@ public function testBuildWithDefaultValueConstantParameter() $testClass = new ClassWithDefaultValueIsConstantMethod(); $ast = $classBuilder->fromReflection(new ReflectionClass($testClass)); - /* @var $namespace \PHPParser_Node_Stmt_Namespace */ + /* @var $namespace \PhpParser\Node\Stmt\Namespace_ */ $namespace = $ast[0]; $class = $namespace->stmts[0]; $method = 'defaultValueIsConstant'; - /* @var $methods PHPParser_Node_Stmt_ClassMethod[] */ + /* @var $methods PhpParser\Node\Stmt\ClassMethod[] */ $methods = array_filter( $class->stmts, function ($node) use ($method) { - return ($node instanceof PHPParser_Node_Stmt_ClassMethod && $node->name === $method); + return ($node instanceof ClassMethod && $node->name === $method); } ); $this->assertCount(1, $methods); - /* @var $thisMethod PHPParser_Node_Stmt_ClassMethod */ + /* @var $thisMethod PhpParser\Node\Stmt\ClassMethod */ $thisMethod = reset($methods); $this->assertSame($method, $thisMethod->name); diff --git a/tests/CodeGenerationUtilsTest/Visitor/ClassClonerVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/ClassClonerVisitorTest.php index 96fbfa38..53095070 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/ClassClonerVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/ClassClonerVisitorTest.php @@ -40,17 +40,17 @@ public function testClonesClassIntoEmptyNodeList() $nodes = $visitor->beforeTraverse(array()); - $this->assertInstanceOf('PHPParser_Node_Stmt_Namespace', $nodes[0]); + $this->assertInstanceOf('PhpParser\Node\Stmt\Namespace_', $nodes[0]); - /* @var $node \PHPParser_Node_Stmt_Namespace */ + /* @var $node \PhpParser\Node\Stmt\Namespace_ */ $node = $nodes[0]; $this->assertSame(__NAMESPACE__, implode('\\', $node->name->parts)); - /* @var $class \PHPParser_Node_Stmt_Class */ + /* @var $class \PhpParser\Node\Stmt\Class_ */ $class = end($node->stmts); - $this->assertInstanceOf('PHPParser_Node_Stmt_Class', $class); + $this->assertInstanceOf('PhpParser\Node\Stmt\Class_', $class); $this->assertSame('ClassClonerVisitorTest', $class->name); } diff --git a/tests/CodeGenerationUtilsTest/Visitor/ClassExtensionVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/ClassExtensionVisitorTest.php index f077043c..884ae385 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/ClassExtensionVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/ClassExtensionVisitorTest.php @@ -19,9 +19,9 @@ namespace CodeGenerationUtilsTest\Visitor; use CodeGenerationUtils\Visitor\ClassExtensionVisitor; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; /** @@ -37,8 +37,8 @@ class ClassExtensionVisitorTest extends PHPUnit_Framework_TestCase public function testRenamesNodesOnMatchingClass() { $visitor = new ClassExtensionVisitor('Foo\\Bar', 'Baz\\Tab'); - $class = new PHPParser_Node_Stmt_Class('Bar'); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Foo')); + $class = new Class_('Bar'); + $namespace = new Namespace_(new Name('Foo')); $visitor->beforeTraverse(array()); $this->assertSame($namespace, $visitor->enterNode($namespace)); @@ -53,8 +53,8 @@ public function testRenamesNodesOnMatchingClass() public function testIgnoresNodesOnNonMatchingClass() { $visitor = new ClassExtensionVisitor('Foo\\Bar', 'Baz\\Tab'); - $class = new PHPParser_Node_Stmt_Class('Tab'); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Foo')); + $class = new Class_('Tab'); + $namespace = new Namespace_(new Name('Foo')); $visitor->beforeTraverse(array()); $this->assertSame($namespace, $visitor->enterNode($namespace)); @@ -68,8 +68,8 @@ public function testIgnoresNodesOnNonMatchingClass() public function testIgnoresNodesOnNonMatchingNamespace() { $visitor = new ClassExtensionVisitor('Foo\\Bar', 'Baz\\Tab'); - $class = new PHPParser_Node_Stmt_Class('Bar'); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Tab')); + $class = new Class_('Bar'); + $namespace = new Namespace_(new Name('Tab')); $visitor->beforeTraverse(array()); $this->assertSame($namespace, $visitor->enterNode($namespace)); @@ -83,7 +83,7 @@ public function testIgnoresNodesOnNonMatchingNamespace() public function testMatchOnEmptyNamespace() { $visitor = new ClassExtensionVisitor('Foo', 'Baz\\Tab'); - $class = new PHPParser_Node_Stmt_Class('Foo'); + $class = new Class_('Foo'); $visitor->beforeTraverse(array()); $this->assertNull($visitor->enterNode($class)); diff --git a/tests/CodeGenerationUtilsTest/Visitor/ClassFQCNResolverVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/ClassFQCNResolverVisitorTest.php index 62e8e81d..c793559b 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/ClassFQCNResolverVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/ClassFQCNResolverVisitorTest.php @@ -20,9 +20,9 @@ use CodeGenerationUtils\Visitor\ClassClonerVisitor; use CodeGenerationUtils\Visitor\ClassFQCNResolverVisitor; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; use ReflectionClass; @@ -51,7 +51,7 @@ public function setUp() public function testDiscoversSimpleClass() { - $class = new PHPParser_Node_Stmt_Class('Foo'); + $class = new Class_('Foo'); $this->visitor->beforeTraverse(array($class)); $this->visitor->enterNode($class); @@ -62,8 +62,8 @@ public function testDiscoversSimpleClass() public function testDiscoversNamespacedClass() { - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name(array('Bar', 'Baz'))); - $class = new PHPParser_Node_Stmt_Class('Foo'); + $namespace = new Namespace_(new Name(array('Bar', 'Baz'))); + $class = new Class_('Foo'); $namespace->stmts = array($class); @@ -77,8 +77,8 @@ public function testDiscoversNamespacedClass() public function testThrowsExceptionOnMultipleClasses() { - $class1 = new PHPParser_Node_Stmt_Class('Foo'); - $class2 = new PHPParser_Node_Stmt_Class('Bar'); + $class1 = new Class_('Foo'); + $class2 = new Class_('Bar'); $this->visitor->beforeTraverse(array($class1, $class2)); @@ -91,8 +91,8 @@ public function testThrowsExceptionOnMultipleClasses() public function testThrowsExceptionOnMultipleNamespaces() { - $namespace1 = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Foo')); - $namespace2 = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Bar')); + $namespace1 = new Namespace_(new Name('Foo')); + $namespace2 = new Namespace_(new Name('Bar')); $this->visitor->beforeTraverse(array($namespace1, $namespace2)); diff --git a/tests/CodeGenerationUtilsTest/Visitor/ClassImplementorVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/ClassImplementorVisitorTest.php index df6686ee..1350af0c 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/ClassImplementorVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/ClassImplementorVisitorTest.php @@ -19,9 +19,9 @@ namespace CodeGenerationUtilsTest\Visitor; use CodeGenerationUtils\Visitor\ClassImplementorVisitor; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; /** @@ -37,8 +37,8 @@ class ClassImplementorVisitorTest extends PHPUnit_Framework_TestCase public function testRenamesNodesOnMatchingClass() { $visitor = new ClassImplementorVisitor('Foo\\Bar', array('Baz\\Tab', 'Tar\\War')); - $class = new PHPParser_Node_Stmt_Class('Bar'); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Foo')); + $class = new Class_('Bar'); + $namespace = new Namespace_(new Name('Foo')); $visitor->beforeTraverse(array()); $this->assertSame($namespace, $visitor->enterNode($namespace)); @@ -53,8 +53,8 @@ public function testRenamesNodesOnMatchingClass() public function testIgnoresNodesOnNonMatchingClass() { $visitor = new ClassImplementorVisitor('Foo\\Bar', array('Baz\\Tab', 'Tar\\War')); - $class = new PHPParser_Node_Stmt_Class('Tab'); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Foo')); + $class = new Class_('Tab'); + $namespace = new Namespace_(new Name('Foo')); $visitor->beforeTraverse(array()); $this->assertSame($namespace, $visitor->enterNode($namespace)); @@ -68,8 +68,8 @@ public function testIgnoresNodesOnNonMatchingClass() public function testIgnoresNodesOnNonMatchingNamespace() { $visitor = new ClassImplementorVisitor('Foo\\Bar', array('Baz\\Tab', 'Tar\\War')); - $class = new PHPParser_Node_Stmt_Class('Bar'); - $namespace = new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name('Tab')); + $class = new Class_('Bar'); + $namespace = new Namespace_(new Name('Tab')); $visitor->beforeTraverse(array()); $this->assertSame($namespace, $visitor->enterNode($namespace)); @@ -83,7 +83,7 @@ public function testIgnoresNodesOnNonMatchingNamespace() public function testMatchOnEmptyNamespace() { $visitor = new ClassImplementorVisitor('Foo', array('Baz\\Tab', 'Tar\\War')); - $class = new PHPParser_Node_Stmt_Class('Foo'); + $class = new Class_('Foo'); $visitor->beforeTraverse(array()); $this->assertNull($visitor->enterNode($class)); diff --git a/tests/CodeGenerationUtilsTest/Visitor/ClassRenamerVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/ClassRenamerVisitorTest.php index 7d3c4f0b..0f76bc42 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/ClassRenamerVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/ClassRenamerVisitorTest.php @@ -19,9 +19,9 @@ namespace CodeGenerationUtilsTest\Visitor; use CodeGenerationUtils\Visitor\ClassRenamerVisitor; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; use ReflectionClass; @@ -38,9 +38,9 @@ class ClassRenamerVisitorTest extends PHPUnit_Framework_TestCase public function testRenamesNodesOnMatchingClass() { $visitor = new ClassRenamerVisitor(new ReflectionClass(__CLASS__), 'Foo\\Bar\\Baz'); - $class = new PHPParser_Node_Stmt_Class('ClassRenamerVisitorTest'); - $namespace = new PHPParser_Node_Stmt_Namespace( - new PHPParser_Node_Name(array('CodeGenerationUtilsTest', 'Visitor')) + $class = new Class_('ClassRenamerVisitorTest'); + $namespace = new Namespace_( + new Name(array('CodeGenerationUtilsTest', 'Visitor')) ); $visitor->beforeTraverse(array()); @@ -57,9 +57,9 @@ public function testRenamesNodesOnMatchingClass() public function testIgnoresNodesOnNonMatchingClass() { $visitor = new ClassRenamerVisitor(new ReflectionClass(__CLASS__), 'Foo\\Bar\\Baz'); - $class = new PHPParser_Node_Stmt_Class('Wrong'); - $namespace = new PHPParser_Node_Stmt_Namespace( - new PHPParser_Node_Name(array('CodeGenerationUtilsTest', 'Visitor')) + $class = new Class_('Wrong'); + $namespace = new Namespace_( + new Name(array('CodeGenerationUtilsTest', 'Visitor')) ); $visitor->beforeTraverse(array()); @@ -75,9 +75,9 @@ public function testIgnoresNodesOnNonMatchingClass() public function testIgnoresNodesOnNonMatchingNamespace() { $visitor = new ClassRenamerVisitor(new ReflectionClass(__CLASS__), 'Foo\\Bar\\Baz'); - $class = new PHPParser_Node_Stmt_Class('ClassRenamerVisitorTest'); - $namespace = new PHPParser_Node_Stmt_Namespace( - new PHPParser_Node_Name(array('Wrong', 'Namespace', 'Here')) + $class = new Class_('ClassRenamerVisitorTest'); + $namespace = new Namespace_( + new Name(array('Wrong', 'Namespace', 'Here')) ); $visitor->beforeTraverse(array()); @@ -93,7 +93,7 @@ public function testIgnoresNodesOnNonMatchingNamespace() public function testMatchOnEmptyNamespace() { $visitor = new ClassRenamerVisitor(new ReflectionClass('stdClass'), 'Baz'); - $class = new PHPParser_Node_Stmt_Class('stdClass'); + $class = new Class_('stdClass'); $visitor->beforeTraverse(array()); $this->assertNull($visitor->enterNode($class)); @@ -105,9 +105,9 @@ public function testMatchOnEmptyNamespace() public function testUnwrapsNamespacedClassCorrectly() { $visitor = new ClassRenamerVisitor(new ReflectionClass(__CLASS__), 'Baz'); - $class = new PHPParser_Node_Stmt_Class('ClassRenamerVisitorTest'); - $namespace = new PHPParser_Node_Stmt_Namespace( - new PHPParser_Node_Name(array('CodeGenerationUtilsTest', 'Visitor')) + $class = new Class_('ClassRenamerVisitorTest'); + $namespace = new Namespace_( + new Name(array('CodeGenerationUtilsTest', 'Visitor')) ); $visitor->beforeTraverse(array()); @@ -122,13 +122,13 @@ public function testUnwrapsNamespacedClassCorrectly() public function testWrapsGlobalClassCorrectly() { $visitor = new ClassRenamerVisitor(new ReflectionClass('stdClass'), 'Foo\\Bar'); - $class = new PHPParser_Node_Stmt_Class('stdClass'); + $class = new Class_('stdClass'); $visitor->beforeTraverse(array()); $this->assertNull($visitor->enterNode($class)); $namespace = $visitor->leaveNode($class); - $this->assertInstanceOf('PHPParser_Node_Stmt_Namespace', $namespace); + $this->assertInstanceOf('PhpParser\Node\Stmt\Namespace_', $namespace); $this->assertSame('Foo', $namespace->name->toString()); $this->assertSame(array($class), $namespace->stmts); } @@ -136,9 +136,9 @@ public function testWrapsGlobalClassCorrectly() public function testMismatchOnEmptyNamespace() { $visitor = new ClassRenamerVisitor(new ReflectionClass('stdClass'), 'Baz'); - $class = new PHPParser_Node_Stmt_Class('stdClass'); - $namespace = new PHPParser_Node_Stmt_Namespace( - new PHPParser_Node_Name(array('Wrong', 'Namespace', 'Here')) + $class = new Class_('stdClass'); + $namespace = new Namespace_( + new Name(array('Wrong', 'Namespace', 'Here')) ); $visitor->beforeTraverse(array()); diff --git a/tests/CodeGenerationUtilsTest/Visitor/MethodDisablerVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/MethodDisablerVisitorTest.php index 176a5c71..19e409df 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/MethodDisablerVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/MethodDisablerVisitorTest.php @@ -19,10 +19,10 @@ namespace CodeGenerationUtilsTest\Visitor; use CodeGenerationUtils\Visitor\MethodDisablerVisitor; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_ClassMethod; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\ClassMethod; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; /** @@ -37,7 +37,7 @@ class MethodDisablerVisitorTest extends PHPUnit_Framework_TestCase { public function testDisablesMethod() { - $method = new PHPParser_Node_Stmt_ClassMethod('test'); + $method = new ClassMethod('test'); $filter = $this->getMock('stdClass', array('__invoke')); $filter->expects($this->once())->method('__invoke')->with($method)->will($this->returnValue(true)); @@ -45,12 +45,12 @@ public function testDisablesMethod() $visitor = new MethodDisablerVisitor($filter); $this->assertSame($method, $visitor->leaveNode($method)); - $this->assertInstanceOf('PHPParser_Node_Stmt_Throw', reset($method->stmts)); + $this->assertInstanceOf('PhpParser\Node\Stmt\Throw_', reset($method->stmts)); } public function testSkipsOnFailedFiltering() { - $method = new PHPParser_Node_Stmt_ClassMethod('test'); + $method = new ClassMethod('test'); $filter = $this->getMock('stdClass', array('__invoke')); $filter->expects($this->once())->method('__invoke')->with($method)->will($this->returnValue(false)); @@ -62,7 +62,7 @@ public function testSkipsOnFailedFiltering() public function testSkipsOnIgnoreFiltering() { - $method = new PHPParser_Node_Stmt_ClassMethod('test'); + $method = new ClassMethod('test'); $filter = $this->getMock('stdClass', array('__invoke')); $filter->expects($this->once())->method('__invoke')->with($method)->will($this->returnValue(null)); @@ -74,7 +74,7 @@ public function testSkipsOnIgnoreFiltering() public function testSkipsOnNodeTypeMismatch() { - $class = new PHPParser_Node_Stmt_Class('test'); + $class = new Class_('test'); $filter = $this->getMock('stdClass', array('__invoke')); $filter->expects($this->never())->method('__invoke'); diff --git a/tests/CodeGenerationUtilsTest/Visitor/PublicMethodsFilterVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/PublicMethodsFilterVisitorTest.php index eb0f18af..84c3c953 100644 --- a/tests/CodeGenerationUtilsTest/Visitor/PublicMethodsFilterVisitorTest.php +++ b/tests/CodeGenerationUtilsTest/Visitor/PublicMethodsFilterVisitorTest.php @@ -19,10 +19,11 @@ namespace CodeGenerationUtilsTest\Visitor; use CodeGenerationUtils\Visitor\PublicMethodsFilterVisitor; -use PHPParser_Node; -use PHPParser_Node_Name; -use PHPParser_Node_Stmt_Class; -use PHPParser_Node_Stmt_Namespace; +use PhpParser\Node; +use PhpParser\Node\Name; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\ClassMethod; +use PhpParser\Node\Stmt\Namespace_; use PHPUnit_Framework_TestCase; /** @@ -38,10 +39,10 @@ class PublicMethodsFilterVisitorTest extends PHPUnit_Framework_TestCase /** * @dataProvider nodeProvider * - * @param PHPParser_Node $node + * @param PhpParser\Node $node * @param mixed $expected */ - public function testRemovesOnlyPrivateMethods(PHPParser_Node $node, $expected) + public function testRemovesOnlyPrivateMethods(Node $node, $expected) { $visitor = new PublicMethodsFilterVisitor(); @@ -52,27 +53,27 @@ public function nodeProvider() { return array( array( - new \PHPParser_Node_Stmt_ClassMethod( + new ClassMethod( 'foo', - array('type' => PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC) + array('type' => Class_::MODIFIER_PUBLIC) ), null, ), array( - new \PHPParser_Node_Stmt_ClassMethod( + new ClassMethod( 'foo', - array('type' => PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED) + array('type' => Class_::MODIFIER_PROTECTED) ), false, ), array( - new \PHPParser_Node_Stmt_ClassMethod( + new ClassMethod( 'foo', - array('type' => PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE) + array('type' => Class_::MODIFIER_PRIVATE) ), false, ), - array(new \PHPParser_Node_Stmt_Class('foo'), null,), + array(new Class_('foo'), null,), ); } }