From 882a87d22c3b68eabefdd4556c11c9c3b919367a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AF=D1=86=D0=B5=D0=BD=D0=BA=D0=BE=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 14 Mar 2022 21:10:31 +0300 Subject: [PATCH] fix concat --- composer.json | 2 +- composer.lock | 2 +- src/Parser/ParserFiles.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index bcbcc98..892299d 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "yzen.dev/laravel-route-coverage", - "version": "0.1.1", + "version": "0.1.2", "description": "Laravel route coverage", "minimum-stability": "dev", "prefer-stable": true, diff --git a/composer.lock b/composer.lock index 2c478d3..8ad2178 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c8f7645cc5693fc7e9cd4f731ff252eb", + "content-hash": "97808311b7093a4bfaea882314d94889", "packages": [ { "name": "doctrine/inflector", diff --git a/src/Parser/ParserFiles.php b/src/Parser/ParserFiles.php index e7dd016..a31416d 100644 --- a/src/Parser/ParserFiles.php +++ b/src/Parser/ParserFiles.php @@ -107,8 +107,8 @@ public function parse(): ?array $method = preg_replace('/json/i', '', $action[1]); $route = $action[2]; } - - $route = preg_replace('/([\'"][\n\s]*\.[\n\s]*\$(.*?)[\n\s]*\.[\n\s]*[\'"])/', '{$val}', $route); + + $route = preg_replace('/([\'"][\n\s]*\.[\n\s]*\$(.*?)[\n\s]*\.[\n\s]*[\'"])|{(.*)}/', '{$val}', $route); $route = preg_replace('/([\'"][\n\s]*\.[\n\s]*\$(.*))[\'"]*/', '{$val}', $route); $route = preg_replace('/([\'"])/', '', $route); $route = preg_replace('/\?(.*)/', '', $route);