Skip to content

Commit eb5c190

Browse files
committed
Fix entity mappings
1 parent dc561cf commit eb5c190

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/Controller/PackageController.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ public function deletePackageAction(Request $req, string $name): Response
885885
return new Response('Invalid form input', 400);
886886
}
887887

888-
#[Route(path: '/packages/{name}/maintainers/', name: 'add_maintainer', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+'])]
888+
#[Route(path: '/packages/{name:package}/maintainers/', name: 'add_maintainer', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+'])]
889889
public function createMaintainerAction(Request $req, #[MapEntity] Package $package, LoggerInterface $logger): RedirectResponse
890890
{
891891
$this->denyAccessUnlessGranted(PackageActions::AddMaintainer->value, $package);
@@ -922,7 +922,7 @@ public function createMaintainerAction(Request $req, #[MapEntity] Package $packa
922922
return $this->redirectToRoute('view_package', ['name' => $package->getName()]);
923923
}
924924

925-
#[Route(path: '/packages/{name}/maintainers/delete', name: 'remove_maintainer', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+'])]
925+
#[Route(path: '/packages/{name:package}/maintainers/delete', name: 'remove_maintainer', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+'])]
926926
public function removeMaintainerAction(Request $req, #[MapEntity] Package $package, LoggerInterface $logger): Response
927927
{
928928
$this->denyAccessUnlessGranted(PackageActions::RemoveMaintainer->value, $package);
@@ -965,7 +965,7 @@ public function removeMaintainerAction(Request $req, #[MapEntity] Package $packa
965965
]);
966966
}
967967

968-
#[Route(path: '/packages/{name}/edit', name: 'edit_package', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'])]
968+
#[Route(path: '/packages/{name:package}/edit', name: 'edit_package', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'])]
969969
public function editAction(Request $req, #[MapEntity] Package $package, #[CurrentUser] ?User $user = null): Response
970970
{
971971
$this->denyAccessUnlessGranted(PackageActions::Edit->value, $package);
@@ -998,7 +998,7 @@ public function editAction(Request $req, #[MapEntity] Package $package, #[Curren
998998
]);
999999
}
10001000

1001-
#[Route(path: '/packages/{name}/abandon', name: 'abandon_package', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'])]
1001+
#[Route(path: '/packages/{name:package}/abandon', name: 'abandon_package', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'])]
10021002
public function abandonAction(Request $request, #[MapEntity] Package $package, #[CurrentUser] ?User $user = null): Response
10031003
{
10041004
$this->denyAccessUnlessGranted(PackageActions::Abandon->value, $package);
@@ -1026,7 +1026,7 @@ public function abandonAction(Request $request, #[MapEntity] Package $package, #
10261026
]);
10271027
}
10281028

1029-
#[Route(path: '/packages/{name}/unabandon', name: 'unabandon_package', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'], methods: ['POST'])]
1029+
#[Route(path: '/packages/{name:package}/unabandon', name: 'unabandon_package', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'], methods: ['POST'])]
10301030
public function unabandonAction(#[MapEntity] Package $package, #[CurrentUser] ?User $user = null): RedirectResponse
10311031
{
10321032
$this->denyAccessUnlessGranted(PackageActions::Abandon->value, $package);
@@ -1101,7 +1101,7 @@ public function statsAction(Request $req, string $name): Response
11011101
return $this->render('package/stats.html.twig', $data);
11021102
}
11031103

1104-
#[Route(path: '/packages/{name}/php-stats.{_format}', name: 'view_package_php_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', '_format' => '(json)'], defaults: ['_format' => 'html'])]
1104+
#[Route(path: '/packages/{name:package}/php-stats.{_format}', name: 'view_package_php_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', '_format' => '(json)'], defaults: ['_format' => 'html'])]
11051105
public function phpStatsAction(Request $req, #[MapEntity] Package $package): Response
11061106
{
11071107
if (!Killswitch::isEnabled(Killswitch::DOWNLOADS_ENABLED)) {
@@ -1409,19 +1409,19 @@ public function suggestersAction(Request $req, string $name): Response
14091409
return $this->render('package/suggesters.html.twig', $data);
14101410
}
14111411

1412-
#[Route(path: '/packages/{name}/stats/all.json', name: 'package_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'])]
1412+
#[Route(path: '/packages/{name:package}/stats/all.json', name: 'package_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'])]
14131413
public function overallStatsAction(Request $req, #[MapEntity] Package $package): JsonResponse
14141414
{
14151415
return $this->computeStats($req, $package);
14161416
}
14171417

1418-
#[Route(path: '/packages/{name}/stats/major/{majorVersion}.json', name: 'major_version_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', 'majorVersion' => '(all|[0-9]+?)'])]
1418+
#[Route(path: '/packages/{name:package}/stats/major/{majorVersion}.json', name: 'major_version_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', 'majorVersion' => '(all|[0-9]+?)'])]
14191419
public function majorVersionStatsAction(Request $req, #[MapEntity] Package $package, string $majorVersion): JsonResponse
14201420
{
14211421
return $this->computeStats($req, $package, null, $majorVersion);
14221422
}
14231423

1424-
#[Route(path: '/packages/{name}/stats/{version}.json', name: 'version_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', 'version' => '.+?'])]
1424+
#[Route(path: '/packages/{name:package}/stats/{version}.json', name: 'version_stats', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', 'version' => '.+?'])]
14251425
public function versionStatsAction(Request $req, #[MapEntity] Package $package, string $version): JsonResponse
14261426
{
14271427
$normalizer = new VersionParser;

0 commit comments

Comments
 (0)