mirror of
https://github.com/wallabag/wallabag.git
synced 2025-06-27 16:36:00 +00:00
Fix direct deprecation notices
This commit is contained in:
parent
4ab26a1902
commit
412352ff03
4 changed files with 8 additions and 3 deletions
|
@ -625,7 +625,7 @@ class EntryController extends AbstractController
|
||||||
*/
|
*/
|
||||||
private function showEntries($type, Request $request, $page)
|
private function showEntries($type, Request $request, $page)
|
||||||
{
|
{
|
||||||
$searchTerm = (isset($request->query->get('search_entry')['term']) ? trim($request->query->get('search_entry')['term']) : '');
|
$searchTerm = (isset($request->query->all('search_entry')['term']) ? trim($request->query->all('search_entry')['term']) : '');
|
||||||
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
|
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
|
||||||
$currentEntryId = $request->attributes->getInt('id');
|
$currentEntryId = $request->attributes->getInt('id');
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ class ExportController extends AbstractController
|
||||||
|
|
||||||
$title = 'Tag ' . $tag->getLabel();
|
$title = 'Tag ' . $tag->getLabel();
|
||||||
} elseif ('search' === $category) {
|
} elseif ('search' === $category) {
|
||||||
$searchTerm = (isset($request->query->get('search_entry')['term']) ? $request->query->get('search_entry')['term'] : '');
|
$searchTerm = (isset($request->query->all('search_entry')['term']) ? $request->query->all('search_entry')['term'] : '');
|
||||||
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
|
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
|
||||||
|
|
||||||
$entries = $entryRepository->getBuilderForSearchByUser(
|
$entries = $entryRepository->getBuilderForSearchByUser(
|
||||||
|
|
|
@ -161,7 +161,7 @@ class UserController extends AbstractController
|
||||||
$form->handleRequest($request);
|
$form->handleRequest($request);
|
||||||
|
|
||||||
if ($form->isSubmitted() && $form->isValid()) {
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
$searchTerm = (isset($request->query->get('search_user')['term']) ? $request->query->get('search_user')['term'] : '');
|
$searchTerm = (isset($request->query->all('search_user')['term']) ? $request->query->all('search_user')['term'] : '');
|
||||||
|
|
||||||
$qb = $userRepository->getQueryBuilderForSearch($searchTerm);
|
$qb = $userRepository->getQueryBuilderForSearch($searchTerm);
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,6 +67,11 @@ class WallabagClient implements HttpClientInterface
|
||||||
return $this->httpClient->stream($responses, $timeout);
|
return $this->httpClient->stream($responses, $timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function withOptions(array $options): HttpClientInterface
|
||||||
|
{
|
||||||
|
return new self($this->restrictedAccess, $this->browser, $this->authenticator, $this->logger);
|
||||||
|
}
|
||||||
|
|
||||||
private function getCookieHeader(string $url): ?string
|
private function getCookieHeader(string $url): ?string
|
||||||
{
|
{
|
||||||
$cookies = [];
|
$cookies = [];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue