From abf60e04db1214bdf5c3afdf8ab71368761888c6 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 8 Aug 2019 11:47:10 +0200 Subject: [PATCH] allow multiline empty spaces strings --- ...anualJsonStringToJsonEncodeArrayRector.php | 2 +- .../Fixture/simple_row_with_spaces.php.inc | 29 +++++++++++++++++++ ...lJsonStringToJsonEncodeArrayRectorTest.php | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/Fixture/simple_row_with_spaces.php.inc diff --git a/packages/CodingStyle/src/Rector/String_/ManualJsonStringToJsonEncodeArrayRector.php b/packages/CodingStyle/src/Rector/String_/ManualJsonStringToJsonEncodeArrayRector.php index 874f52ed7fee..14b4efc1948f 100644 --- a/packages/CodingStyle/src/Rector/String_/ManualJsonStringToJsonEncodeArrayRector.php +++ b/packages/CodingStyle/src/Rector/String_/ManualJsonStringToJsonEncodeArrayRector.php @@ -149,7 +149,7 @@ private function processJsonString(Assign $assign, string $stringValue): Node private function isJsonString(string $stringValue): bool { - if (! (bool) Strings::match($stringValue, '#{(.*?\:.*?)}#')) { + if (! (bool) Strings::match($stringValue, '#{(.*?\:.*?)}#s')) { return false; } diff --git a/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/Fixture/simple_row_with_spaces.php.inc b/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/Fixture/simple_row_with_spaces.php.inc new file mode 100644 index 000000000000..206efd2c2b71 --- /dev/null +++ b/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/Fixture/simple_row_with_spaces.php.inc @@ -0,0 +1,29 @@ + +----- + 'Paulie', 'surname' => 'Garand']; + $json = \Nette\Utils\Json::encode($jsonData); + } +} + +?> diff --git a/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php b/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php index c961d329c74a..38ec18881f08 100644 --- a/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php +++ b/packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php @@ -18,6 +18,7 @@ public function test(): void __DIR__ . '/Fixture/with_implode.php.inc', __DIR__ . '/Fixture/without_assign.php.inc', __DIR__ . '/Fixture/array_concat.php.inc', + __DIR__ . '/Fixture/simple_row_with_spaces.php.inc', ]); }