Skip to content

Fix annotation in requirements of @Route #3079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 2 commits into from
Mar 27, 2020
Merged

Fix annotation in requirements of @Route #3079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c00b8d4
fix bracket mallform in annotations
TomasVotruba Mar 27, 2020
8338004
test =
TomasVotruba Mar 27, 2020
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
4 changes: 3 additions & 1 deletion packages/better-php-doc-parser/src/PhpDocNode/AbstractTagValueNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ protected function printArrayItem(array $item, ?string $key = null): string
{
$json = Json::encode($item);
$json = Strings::replace($json, '#,#', ', ');
$json = Strings::replace($json, '#\[(.*?)\]#', '{$1}');

// change brackets from json to annotations
$json = Strings::replace($json, '#^\[(.*?)\]$#', '{$1}');

// cleanup json encoded extra slashes
$json = Strings::replace($json, '#\\\\\\\\#', '\\');
Expand Down
3 changes: 0 additions & 3 deletions packages/better-php-doc-parser/src/PhpDocNode/Symfony/SymfonyRouteTagValueNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ public function __toString(): string
return $this->printContentItems($contentItems);
}

/**
* @param mixed[] $methods
*/
public function changeMethods(array $methods): void
{
$this->orderedVisibleItems[] = 'methods';
Expand Down
4 changes: 2 additions & 2 deletions .../FrameworkExtraBundle/TemplateAnnotationRector/FixtureVersion5/with_route_options.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use Symfony\Component\Routing\Annotation\Route;
class WithRouteOptions extends AbstractController
{
/**
* @Route("/{category}", name="report_overview", defaults={"category":null}, requirements={"category":"\d+"})
* @Route("/{category}", name="report_overview", defaults={"category":null}, requirements={"category"="[a-z]\d+"})
* @Template("PAPPReportBundle:Report:report_list.html.twig")
*/
public function index($category = null)
Expand All @@ -33,7 +33,7 @@ use Symfony\Component\Routing\Annotation\Route;
class WithRouteOptions extends AbstractController
{
/**
* @Route("/{category}", name="report_overview", defaults={"category":null}, requirements={"category":"\d+"})
* @Route("/{category}", name="report_overview", defaults={"category":null}, requirements={"category"="[a-z]\d+"})
*/
public function index($category = null): \Symfony\Component\HttpFoundation\Response
{
Expand Down