From d5f87f5e8248b993b29e5974047cb93f01610b17 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 4 Jun 2019 13:27:32 +0300
Subject: [PATCH 1/3] fix cs

---
 .../src/PhpDocParser/BetterPhpDocParser.php                 | 4 ----
 .../BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php    | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/BetterPhpDocParser/src/PhpDocParser/BetterPhpDocParser.php b/packages/BetterPhpDocParser/src/PhpDocParser/BetterPhpDocParser.php
index 5b4c70fe080e..8c722b2bb276 100644
--- a/packages/BetterPhpDocParser/src/PhpDocParser/BetterPhpDocParser.php
+++ b/packages/BetterPhpDocParser/src/PhpDocParser/BetterPhpDocParser.php
@@ -5,9 +5,7 @@
 use Nette\Utils\Strings;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
 use PHPStan\PhpDocParser\Lexer\Lexer;
 use PHPStan\PhpDocParser\Parser\ConstExprParser;
 use PHPStan\PhpDocParser\Parser\ParserException;
@@ -15,9 +13,7 @@
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
 use Rector\BetterPhpDocParser\Attributes\Ast\AttributeAwareNodeFactory;
-use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwareGenericTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocNode;
-use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocTagNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\Attribute;
 use Rector\BetterPhpDocParser\Data\StartEndInfo;
 use Rector\BetterPhpDocParser\Printer\MultilineSpaceFormatPreserver;
diff --git a/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php b/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php
index fc8cf01474b9..82968e00cf1c 100644
--- a/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php
+++ b/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php
@@ -232,7 +232,11 @@ private function printPhpDocTagNode(
         if ($phpDocTagNode->getAttribute(Attribute::HAS_DESCRIPTION_WITH_ORIGINAL_SPACES)) {
             if (property_exists($phpDocTagNode->value, 'description') && $phpDocTagNode->value->description) {
                 $pattern = Strings::replace($phpDocTagNode->value->description, '#[\s]+#', '\s+');
-                $nodeOutput = Strings::replace($nodeOutput, '#' . preg_quote($pattern, '#') . '#', $phpDocTagNode->value->description);
+                $nodeOutput = Strings::replace(
+                    $nodeOutput,
+                    '#' . preg_quote($pattern, '#') . '#',
+                    $phpDocTagNode->value->description
+                );
                 if (substr_count($nodeOutput, "\n")) {
                     $nodeOutput = Strings::replace($nodeOutput, "#\n#", PHP_EOL . '  * ');
                 }

From 3d78ad6960aa2c93e9adbd88221db9e65eb32056 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 4 Jun 2019 13:29:39 +0300
Subject: [PATCH 2/3] fix symfony/finder compact in LevelOptionResolver

---
 src/Console/Option/LevelOptionResolver.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Console/Option/LevelOptionResolver.php b/src/Console/Option/LevelOptionResolver.php
index d6feea1c48d4..183259b30fc9 100644
--- a/src/Console/Option/LevelOptionResolver.php
+++ b/src/Console/Option/LevelOptionResolver.php
@@ -127,13 +127,14 @@ private function findNearestMatchingFiles(string $configDirectory, string $level
         foreach ($configFiles as $configFile) {
             // only similar configs, not too far
             // this allows to match "Symfony.40" to "symfony40" config
-            $distance = levenshtein($configFile->getFilenameWithoutExtension(), $levelName);
+            $fileNameWithoutExtension = pathinfo($configFile->getFilename(), PATHINFO_FILENAME);
+            $distance = levenshtein($fileNameWithoutExtension, $levelName);
             if ($distance > 2) {
                 continue;
             }
 
             if ($levelVersion) {
-                $fileVersion = $this->matchVersionInTheEnd($configFile->getFilenameWithoutExtension());
+                $fileVersion = $this->matchVersionInTheEnd($fileNameWithoutExtension);
                 if ($levelVersion !== $fileVersion) {
                     // not a version match
                     continue;

From 9b7853f30d87d228c792b61a1e11b108abd5b879 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 4 Jun 2019 13:35:58 +0300
Subject: [PATCH 3/3] fix escape pattern

---
 packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php b/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php
index 82968e00cf1c..2d74b635f239 100644
--- a/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php
+++ b/packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php
@@ -231,10 +231,10 @@ private function printPhpDocTagNode(
 
         if ($phpDocTagNode->getAttribute(Attribute::HAS_DESCRIPTION_WITH_ORIGINAL_SPACES)) {
             if (property_exists($phpDocTagNode->value, 'description') && $phpDocTagNode->value->description) {
-                $pattern = Strings::replace($phpDocTagNode->value->description, '#[\s]+#', '\s+');
+                $pattern = Strings::replace(preg_quote($phpDocTagNode->value->description, '#'), '#[\s]+#', '\s+');
                 $nodeOutput = Strings::replace(
                     $nodeOutput,
-                    '#' . preg_quote($pattern, '#') . '#',
+                    '#' . $pattern . '#',
                     $phpDocTagNode->value->description
                 );
                 if (substr_count($nodeOutput, "\n")) {