Skip to content

Commit a415d82

Browse files
committed
fix: corrected routing issues
1 parent 287c544 commit a415d82

11 files changed

Lines changed: 495 additions & 157 deletions

File tree

phpmyfaq/src/phpMyFAQ/Controller/Api/AbstractApiController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ protected function getPaginationRequest(
7979

8080
/**
8181
* Parses sorting parameters from the request
82-
*
8382
* Validates sort field against whitelist to prevent SQL injection.
8483
*
85-
* @param array $allowedFields Whitelist of allowed sort fields
84+
* @param Request $request
85+
* @param array $allowedFields Whitelist of allowed sort fields
8686
* @param string|null $defaultField Default sort field if none specified
87-
* @param string $defaultOrder Default sort order (asc or desc)
87+
* @param string $defaultOrder Default sort order (asc or desc)
8888
* @return SortRequest
8989
*/
9090
protected function getSortRequest(

phpmyfaq/src/phpMyFAQ/Controller/Api/FaqController.php

Lines changed: 186 additions & 125 deletions
Large diffs are not rendered by default.

phpmyfaq/src/phpMyFAQ/Controller/Api/NewsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ enum: ['id', 'datum', 'header', 'author_name'],
114114
],
115115
]),
116116
)]
117-
#[Route('/api/v4.0/news', name: 'api.news.list', methods: ['GET'])]
117+
#[Route(path: 'v4.0/news', name: 'api.news.list', methods: ['GET'])]
118118
public function list(Request $request): JsonResponse
119119
{
120120
// Get pagination and sorting parameters

phpmyfaq/src/phpMyFAQ/Controller/Api/TagController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function __construct(
111111
],
112112
],
113113
]))]
114-
#[Route('/api/v4.0/tags', name: 'api.tags.list', methods: ['GET'])]
114+
#[Route(path: 'v4.0/tags', name: 'api.tags.list', methods: ['GET'])]
115115
public function list(?Request $request = null): JsonResponse
116116
{
117117
$request ??= Request::createFromGlobals();

phpmyfaq/src/phpMyFAQ/Faq.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,8 +1641,13 @@ public function getStickyFaqsData(): array
16411641
fcr.category_id AS category_id,
16421642
fv.visits AS visits
16431643
FROM
1644-
%sfaqvisits fv,
16451644
%sfaqdata fd
1645+
LEFT JOIN
1646+
%sfaqvisits fv
1647+
ON
1648+
fd.id = fv.id
1649+
AND
1650+
fd.lang = fv.lang
16461651
LEFT JOIN
16471652
%sfaqcategoryrelations fcr
16481653
ON
@@ -1663,10 +1668,6 @@ public function getStickyFaqsData(): array
16631668
fd.active = 'yes'
16641669
AND
16651670
fd.sticky = 1
1666-
AND
1667-
fd.id = fv.id
1668-
AND
1669-
fd.lang = fv.lang
16701671
%s
16711672
GROUP BY
16721673
fd.id, fd.lang, fd.thema, fcr.category_id, fv.visits

phpmyfaq/src/services.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@
749749
service('phpmyfaq.tags'),
750750
service('phpmyfaq.faq.statistics'),
751751
service('phpmyfaq.faq.metadata'),
752+
service('phpmyfaq.language'),
752753
]);
753754
$services->set(ApiGlossaryController::class, ApiGlossaryController::class)->args([
754755
service('phpmyfaq.glossary'),

0 commit comments

Comments
 (0)