diff --git a/src/Command/Import/ImportCommand.php b/src/Command/Import/ImportCommand.php index 8d4781961..44c3ba6d4 100644 --- a/src/Command/Import/ImportCommand.php +++ b/src/Command/Import/ImportCommand.php @@ -125,7 +125,6 @@ class ImportCommand extends Command // Authenticate user for paywalled websites $token = new UsernamePasswordToken( $entityUser, - null, 'main', $entityUser->getRoles()); diff --git a/src/Controller/Api/EntryRestController.php b/src/Controller/Api/EntryRestController.php index eeb4a75c1..ff1abed15 100644 --- a/src/Controller/Api/EntryRestController.php +++ b/src/Controller/Api/EntryRestController.php @@ -314,7 +314,7 @@ class EntryRestController extends WallabagRestController $order = strtolower($request->query->get('order', 'desc')); $page = (int) $request->query->get('page', 1); $perPage = (int) $request->query->get('perPage', 30); - $tags = \is_array($request->query->get('tags')) ? '' : (string) $request->query->get('tags', ''); + $tags = \is_array($request->query->all()['tags'] ?? '') ? '' : (string) $request->query->get('tags', ''); $since = $request->query->get('since', 0); $detail = strtolower($request->query->get('detail', 'full')); $domainName = (null === $request->query->get('domain_name')) ? '' : (string) $request->query->get('domain_name'); @@ -477,7 +477,7 @@ class EntryRestController extends WallabagRestController { $this->validateAuthentication(); - $urls = json_decode($request->query->get('urls', [])); + $urls = json_decode($request->query->get('urls', '[]')); if (empty($urls)) { return $this->sendResponse([]); @@ -537,7 +537,7 @@ class EntryRestController extends WallabagRestController { $this->validateAuthentication(); - $urls = json_decode($request->query->get('urls', [])); + $urls = json_decode($request->query->get('urls', '[]')); $limit = $this->getParameter('wallabag.api_limit_mass_actions'); @@ -1287,7 +1287,7 @@ class EntryRestController extends WallabagRestController { $this->validateAuthentication(); - $list = json_decode($request->query->get('list', [])); + $list = json_decode($request->query->get('list', '[]')); if (empty($list)) { return $this->sendResponse([]); @@ -1354,7 +1354,7 @@ class EntryRestController extends WallabagRestController { $this->validateAuthentication(); - $list = json_decode($request->query->get('list', [])); + $list = json_decode($request->query->get('list', '[]')); if (empty($list)) { return $this->sendResponse([]); @@ -1413,7 +1413,7 @@ class EntryRestController extends WallabagRestController { return [ 'title' => $request->request->get('title'), - 'tags' => $request->request->get('tags', []), + 'tags' => $request->request->get('tags', ''), 'isArchived' => $request->request->get('archive'), 'isStarred' => $request->request->get('starred'), 'isPublic' => $request->request->get('public'), @@ -1421,7 +1421,7 @@ class EntryRestController extends WallabagRestController 'language' => $request->request->get('language'), 'picture' => $request->request->get('preview_picture'), 'publishedAt' => $request->request->get('published_at'), - 'authors' => $request->request->get('authors', ''), + 'authors' => $request->request->all()['authors'] ?? '', 'origin_url' => $request->request->get('origin_url', ''), ]; } diff --git a/src/Controller/Api/TaggingRuleRestController.php b/src/Controller/Api/TaggingRuleRestController.php index 19f879132..ddf816b96 100644 --- a/src/Controller/Api/TaggingRuleRestController.php +++ b/src/Controller/Api/TaggingRuleRestController.php @@ -37,7 +37,7 @@ class TaggingRuleRestController extends WallabagRestController SerializationContext::create()->setGroups(['export_tagging_rule']) ); - return Response::create( + return new Response( $data, 200, [ diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php index 80ab75095..d2fa3215f 100644 --- a/src/Controller/ConfigController.php +++ b/src/Controller/ConfigController.php @@ -700,7 +700,7 @@ class ConfigController extends AbstractController SerializationContext::create()->setGroups(['export_tagging_rule']) ); - return Response::create( + return new Response( $data, 200, [ diff --git a/src/Controller/EntryController.php b/src/Controller/EntryController.php index bd5fb4bad..08356fbe8 100644 --- a/src/Controller/EntryController.php +++ b/src/Controller/EntryController.php @@ -625,6 +625,7 @@ class EntryController extends AbstractController { $searchTerm = (isset($request->get('search_entry')['term']) ? trim($request->get('search_entry')['term']) : ''); $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : ''); + $currentEntryId = $request->attributes->getInt('id'); $formOptions = []; @@ -651,7 +652,7 @@ class EntryController extends AbstractController $formOptions['filter_unread'] = true; break; case 'same-domain': - $qb = $this->entryRepository->getBuilderForSameDomainByUser($this->getUser()->getId(), $request->get('id')); + $qb = $this->entryRepository->getBuilderForSameDomainByUser($this->getUser()->getId(), $currentEntryId); break; case 'all': $qb = $this->entryRepository->getBuilderForAllByUser($this->getUser()->getId()); @@ -664,7 +665,7 @@ class EntryController extends AbstractController if ($request->query->has($form->getName())) { // manually bind values from the request - $form->submit($request->query->get($form->getName())); + $form->submit($request->query->all($form->getName())); // build the query from the given form object $this->filterBuilderUpdater->addFilterConditions($form, $qb); diff --git a/src/Event/Listener/AuthenticationFailureListener.php b/src/Event/Listener/AuthenticationFailureListener.php index d64ad6d4e..060325400 100644 --- a/src/Event/Listener/AuthenticationFailureListener.php +++ b/src/Event/Listener/AuthenticationFailureListener.php @@ -30,7 +30,7 @@ class AuthenticationFailureListener implements EventSubscriberInterface */ public function onAuthenticationFailure() { - $request = $this->requestStack->getMasterRequest(); + $request = $this->requestStack->getMainRequest(); $this->logger->error('Authentication failure for user "' . $request->request->get('_username') . '", from IP "' . $request->getClientIp() . '", with UA: "' . $request->server->get('HTTP_USER_AGENT') . '".'); } diff --git a/src/Event/Listener/CreateConfigListener.php b/src/Event/Listener/CreateConfigListener.php index be9fd0a95..9cc000e63 100644 --- a/src/Event/Listener/CreateConfigListener.php +++ b/src/Event/Listener/CreateConfigListener.php @@ -53,8 +53,8 @@ class CreateConfigListener implements EventSubscriberInterface { $language = $this->language; - if ($this->requestStack->getMasterRequest()) { - $session = $this->requestStack->getMasterRequest()->getSession(); + if ($this->requestStack->getMainRequest()) { + $session = $this->requestStack->getMainRequest()->getSession(); $language = $session->get('_locale', $this->language); } diff --git a/src/Helper/EntriesExport.php b/src/Helper/EntriesExport.php index e05f3af84..6a8c45952 100644 --- a/src/Helper/EntriesExport.php +++ b/src/Helper/EntriesExport.php @@ -234,7 +234,7 @@ class EntriesExport $hash = sha1(\sprintf('%s:%s', $this->wallabagUrl, implode(',', $entryIds))); $book->setIdentifier(\sprintf('urn:wallabag:%s', $hash), EPub::IDENTIFIER_URI); - return Response::create( + return new Response( $book->getBook(), 200, [ @@ -309,7 +309,7 @@ class EntriesExport // set image scale factor $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); - return Response::create( + return new Response( $pdf->Output('', 'S'), 200, [ @@ -354,7 +354,7 @@ class EntriesExport $output = stream_get_contents($handle); fclose($handle); - return Response::create( + return new Response( $output, 200, [ @@ -370,7 +370,7 @@ class EntriesExport */ private function produceJson(): Response { - return Response::create( + return new Response( $this->prepareSerializingContent('json'), 200, [ @@ -386,7 +386,7 @@ class EntriesExport */ private function produceXml(): Response { - return Response::create( + return new Response( $this->prepareSerializingContent('xml'), 200, [ @@ -410,7 +410,7 @@ class EntriesExport $content .= $html->getText(); } - return Response::create( + return new Response( $content, 200, [ @@ -433,7 +433,7 @@ class EntriesExport $content .= $converter->convert('

' . $entry->getTitle() . '

' . $entry->getContent()); } - return Response::create( + return new Response( $content, 200, [ diff --git a/tests/Event/Listener/CreateConfigListenerTest.php b/tests/Event/Listener/CreateConfigListenerTest.php index 19d40661d..23410738f 100644 --- a/tests/Event/Listener/CreateConfigListenerTest.php +++ b/tests/Event/Listener/CreateConfigListenerTest.php @@ -48,7 +48,7 @@ class CreateConfigListenerTest extends TestCase $this->dispatcher->addSubscriber($this->listener); $this->request = Request::create('/'); - $this->response = Response::create(); + $this->response = new Response(); } public function testWithValidUser() diff --git a/tests/Event/Listener/UserLocaleListenerTest.php b/tests/Event/Listener/UserLocaleListenerTest.php index 4710ec416..6ff8432d1 100644 --- a/tests/Event/Listener/UserLocaleListenerTest.php +++ b/tests/Event/Listener/UserLocaleListenerTest.php @@ -27,7 +27,7 @@ class UserLocaleListenerTest extends TestCase $user->setConfig($config); - $userToken = new UsernamePasswordToken($user, '', 'test'); + $userToken = new UsernamePasswordToken($user, 'test'); $request = Request::create('/'); $event = new InteractiveLoginEvent($request, $userToken); @@ -48,7 +48,7 @@ class UserLocaleListenerTest extends TestCase $user->setConfig($config); - $userToken = new UsernamePasswordToken($user, '', 'test'); + $userToken = new UsernamePasswordToken($user, 'test'); $request = Request::create('/'); $event = new InteractiveLoginEvent($request, $userToken); @@ -71,7 +71,7 @@ class UserLocaleListenerTest extends TestCase $user->setConfig($config); - $userToken = new UsernamePasswordToken($user, '', 'test'); + $userToken = new UsernamePasswordToken($user, 'test'); $request = Request::create('/'); $event = new InteractiveLoginEvent($request, $userToken); diff --git a/tests/Helper/RedirectTest.php b/tests/Helper/RedirectTest.php index 1c461eee0..06e47cf06 100644 --- a/tests/Helper/RedirectTest.php +++ b/tests/Helper/RedirectTest.php @@ -53,7 +53,7 @@ class RedirectTest extends TestCase $this->user->setConfig($config); - $this->token = new UsernamePasswordToken($this->user, 'password', 'key'); + $this->token = new UsernamePasswordToken($this->user, 'key'); $tokenStorage = new TokenStorage(); $tokenStorage->setToken($this->token); diff --git a/tests/SiteConfig/GrabySiteConfigBuilderTest.php b/tests/SiteConfig/GrabySiteConfigBuilderTest.php index a10960164..c93ecde9d 100644 --- a/tests/SiteConfig/GrabySiteConfigBuilderTest.php +++ b/tests/SiteConfig/GrabySiteConfigBuilderTest.php @@ -55,7 +55,7 @@ class GrabySiteConfigBuilderTest extends WallabagTestCase ->method('getId') ->willReturn(1); - $token = new UsernamePasswordToken($user, 'pass', 'provider'); + $token = new UsernamePasswordToken($user, 'provider'); $tokenStorage = new TokenStorage(); $tokenStorage->setToken($token); @@ -114,7 +114,7 @@ class GrabySiteConfigBuilderTest extends WallabagTestCase ->method('getId') ->willReturn(1); - $token = new UsernamePasswordToken($user, 'pass', 'provider'); + $token = new UsernamePasswordToken($user, 'provider'); $tokenStorage = new TokenStorage(); $tokenStorage->setToken($token); @@ -173,7 +173,7 @@ class GrabySiteConfigBuilderTest extends WallabagTestCase ->method('getId') ->willReturn(1); - $token = new UsernamePasswordToken($user, 'pass', 'provider'); + $token = new UsernamePasswordToken($user, 'provider'); $tokenStorage = new TokenStorage(); $tokenStorage->setToken($token); @@ -291,7 +291,7 @@ class GrabySiteConfigBuilderTest extends WallabagTestCase ->method('getId') ->willReturn(1); - $token = new UsernamePasswordToken($user, 'pass', 'provider'); + $token = new UsernamePasswordToken($user, 'provider'); $tokenStorage = new TokenStorage(); $tokenStorage->setToken($token);