From 3ff7016618153548b27d9b91c46a5ff0590c172e Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 27 Jul 2019 13:02:32 +0200 Subject: [PATCH] fix multiple annotations in one filep --- .../CompleteImportForPartialAnnotationRector.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/Restoration/src/Rector/Namespace_/CompleteImportForPartialAnnotationRector.php b/packages/Restoration/src/Rector/Namespace_/CompleteImportForPartialAnnotationRector.php index c858464b391..bb5607e7fb7 100644 --- a/packages/Restoration/src/Rector/Namespace_/CompleteImportForPartialAnnotationRector.php +++ b/packages/Restoration/src/Rector/Namespace_/CompleteImportForPartialAnnotationRector.php @@ -92,18 +92,18 @@ CODE_SAMPLE $annotationToSeek = Strings::after($import, '\\', -1); } - $annotationToSeek = '#\*\s+@' . $annotationToSeek . '#'; + $annotationToSeek = '#\*\s+\@' . $annotationToSeek . '#'; if (! Strings::match($this->print($class), $annotationToSeek)) { continue; } - return $this->addImportToNamespaceIfMissing($node, $import, $alias); + $node = $this->addImportToNamespaceIfMissing($node, $import, $alias); } - return null; + return $node; } - private function addImportToNamespaceIfMissing(Namespace_ $namespace, string $import, string $alias): ?Namespace_ + private function addImportToNamespaceIfMissing(Namespace_ $namespace, string $import, string $alias): Namespace_ { foreach ($namespace->stmts as $stmt) { if (! $stmt instanceof Use_) { @@ -114,7 +114,7 @@ CODE_SAMPLE // already there if ($this->isName($useUse->name, $import) && (string) $useUse->alias === $alias) { - return null; + return $namespace; } }