From 98d9c3dc2b46ac796418794aae53b20925d45a8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Fri, 8 Mar 2024 01:34:38 +0100 Subject: [PATCH 1/1] Shorten air bundle route alias --- Repository/DanceRepository.php | 4 ++-- Repository/UserRepository.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Repository/DanceRepository.php b/Repository/DanceRepository.php index 98a6ee9..251a1ba 100644 --- a/Repository/DanceRepository.php +++ b/Repository/DanceRepository.php @@ -221,7 +221,7 @@ SQL; 'id' => $id, 'type' => $type = $this->translator->trans($name['types'][$k]), 'slug' => $stype = $this->slugger->slug($type), - 'link' => $this->router->generate('rapsys_air_dance_view', ['id' => $id, 'name' => $slug, 'type' => $stype]) + 'link' => $this->router->generate('rapsysair_dance_view', ['id' => $id, 'name' => $slug, 'type' => $stype]) ]; } @@ -229,7 +229,7 @@ SQL; $return[$sname = $this->slugger->short($name['name'])] = [ 'name' => $tname, 'slug' => $slug, - 'link' => $this->router->generate('rapsys_air_dance_name', ['name' => $sname, 'dance' => $slug]), + 'link' => $this->router->generate('rapsysair_dance_name', ['name' => $sname, 'dance' => $slug]), 'types' => $types, 'modified' => $name['modified'] ]; diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php index 3918551..4e7dae8 100644 --- a/Repository/UserRepository.php +++ b/Repository/UserRepository.php @@ -275,7 +275,7 @@ SQL; $result['alternates'] = []; //Set route - $route = 'rapsys_air_user_view'; + $route = 'rapsysair_user_view'; //Set route params $routeParams = ['id' => $id, 'user' => $this->slugger->slug($result['pseudonym'])]; @@ -283,7 +283,7 @@ SQL; //Milonga Raphaël exception if ($routeParams['id'] == 1 && $routeParams['user'] == 'milonga-raphael') { //Set route - $route = 'rapsys_air_user_milongaraphael'; + $route = 'rapsysair_user_milongaraphael'; //Set route params $routeParams = []; } @@ -473,8 +473,8 @@ SQL; 'dances' => [], 'slug' => $slug = $this->slugger->slug($data['pseudonym']), //Milonga Raphaël exception - 'link' => $data['id'] == 1 && $slug == 'milonga-raphael' ? $this->router->generate('rapsys_air_user_milongaraphael', []) : $this->router->generate('rapsys_air_user_view', ['id' => $data['id'], 'user' => $slug]), - 'edit' => $this->router->generate('rapsys_user_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)]) + 'link' => $data['id'] == 1 && $slug == 'milonga-raphael' ? $this->router->generate('rapsysair_user_milongaraphael', []) : $this->router->generate('rapsysair_user_view', ['id' => $data['id'], 'user' => $slug]), + 'edit' => $this->router->generate('rapsysuser_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)]) ]; //With dances @@ -490,13 +490,13 @@ SQL; //Init dance when missing if (!isset($ret[$group][$data['id']]['dances'][$name = $this->translator->trans($names[$k])])) { $ret[$group][$data['id']]['dances'][$name] = [ - 'link' => $this->router->generate('rapsys_air_dance_name', ['name' => $this->slugger->short($names[$k]), 'dance' => $this->slugger->slug($name)]), + 'link' => $this->router->generate('rapsysair_dance_name', ['name' => $this->slugger->short($names[$k]), 'dance' => $this->slugger->slug($name)]), 'types' => [] ]; } //Set type - $ret[$group][$data['id']]['dances'][$name]['types'][$type = $this->translator->trans($types[$k])] = $this->router->generate('rapsys_air_dance_view', ['id' => $id, 'name' => $this->slugger->slug($name), 'type' => $this->slugger->slug($type)]); + $ret[$group][$data['id']]['dances'][$name]['types'][$type = $this->translator->trans($types[$k])] = $this->router->generate('rapsysair_dance_view', ['id' => $id, 'name' => $this->slugger->slug($name), 'type' => $this->slugger->slug($type)]); } } } -- 2.41.1