Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ protected function printArrayItem(array $item, ?string $key = null): string
return $json;
}

/**
* @param mixed[] $item
*/
protected function printArrayItemWithSeparator(array $item, ?string $key = null, string $separator): string
{
$content = $this->printArrayItem($item, $key);

return Strings::replace($content, '#:#', $separator);
}

/**
* @param string[] $contentItems
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ final class SymfonyRouteTagValueNode extends AbstractTagValueNode implements Sho
*/
private $requirements = [];

/**
* @var string
*/
private $requirementsKeyValueSeparator = '=';

/**
* @param string[] $methods
* @param string[] $options
Expand All @@ -73,6 +78,7 @@ public function __construct(
$this->defaults = $defaults;
$this->requirements = $requirements;

// covers https://github.com/rectorphp/rector/issues/2994#issuecomment-598712339
if ($originalContent !== null) {
$this->isPathExplicit = (bool) Strings::contains($originalContent, 'path=');

Expand All @@ -83,6 +89,9 @@ public function __construct(
// add path as first item
$this->orderedVisibleItems = array_merge(['path'], (array) $this->orderedVisibleItems);
}

$matches = Strings::match($originalContent, '#requirements={(.*?)(?<separator>(=|:))(.*)}#');
$this->requirementsKeyValueSeparator = $matches['separator'] ?? '=';
}
}

Expand All @@ -109,7 +118,11 @@ public function __toString(): string
}

if ($this->requirements !== []) {
$contentItems['requirements'] = $this->printArrayItem($this->requirements, 'requirements');
$contentItems['requirements'] = $this->printArrayItemWithSeparator(
$this->requirements,
'requirements',
$this->requirementsKeyValueSeparator
);
}

return $this->printContentItems($contentItems);
Expand Down