Skip to content

Commit 925f01d

Browse files
committed
Update goaop/parser-reflection library to the next major version
1 parent 325133d commit 925f01d

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"php": ">=5.6.0",
1212
"jakubledl/dissect": "~1.0",
1313
"doctrine/annotations": "^1.2.3",
14-
"goaop/parser-reflection": "~1.4",
14+
"goaop/parser-reflection": "~2.0",
1515
"doctrine/cache": "^1.5",
1616
"symfony/finder": "^3.4|^4.2"
1717
},

src/Instrument/Transformer/MagicConstantTransformer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private function wrapReflectionGetFileName(StreamMetaData $metadata)
9797
/** @var MethodCall[] $methodCalls */
9898
$methodCalls = $methodCallFinder->getFoundNodes();
9999
foreach ($methodCalls as $methodCallNode) {
100-
if ($methodCallNode->name !== 'getFileName') {
100+
if ($methodCallNode->name->toString() !== 'getFileName') {
101101
continue;
102102
}
103103
$startPosition = $methodCallNode->getAttribute('startTokenPos');

src/Instrument/Transformer/SelfValueVisitor.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public function beforeTraverse(array $nodes)
6969
public function enterNode(Node $node)
7070
{
7171
if ($node instanceof Stmt\Namespace_) {
72-
$this->namespace = $node->name;
72+
$this->namespace = $node->name->toString();
7373
} elseif ($node instanceof Stmt\Class_) {
7474
if ($node->name !== null) {
75-
$this->className = new Name($node->name);
75+
$this->className = new Name($node->name->toString());
7676
}
7777
} elseif ($node instanceof Stmt\ClassMethod || $node instanceof Expr\Closure) {
7878
$node->returnType = $this->resolveType($node->returnType);

src/Instrument/Transformer/WeavingTransformer.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ private function saveProxyToCache($class, $child)
286286

287287
$refNamespace = new ReflectionFileNamespace($class->getFileName(), $namespace);
288288
foreach ($refNamespace->getNamespaceAliases() as $fqdn => $alias) {
289-
$body .= "use {$fqdn} as {$alias};" . PHP_EOL;
289+
$aliasSuffix = ($alias !== null) ? " as {$alias}" : '';
290+
$body .= "use {$fqdn}{$aliasSuffix};" . PHP_EOL;
290291
}
291292

292293
$body .= $child;

0 commit comments

Comments
 (0)