oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Upgrade to Symfony 4.4

Browse source 
- disable autowiring for Event (because the Entry entity was injected)
- rename `getClient()` for test to `getTestClient()` to avoid error while overriding (from `BrowserKitAssertionsTrait`)
This commit is contained in:
Jeremy Benoist 2022-11-23 17:09:32 +01:00
parent 655ec5e07a
commit aa5c7f05b8
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
43 changed files with 966 additions and 1239 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -717,10 +717,10 @@ class EntryRestController extends WallabagRestController
]
);
} catch (\Exception $e) {
$this->get('logger')->error('Error while saving an entry', [
'exception' => $e,
'entry' => $entry,
]);
// $this->get('logger')->error('Error while saving an entry', [
// 'exception' => $e,
// 'entry' => $entry,
// ]);
}
if (null !== $data['isArchived']) {
@ -911,10 +911,10 @@ class EntryRestController extends WallabagRestController
true
);
} catch (\Exception $e) {
$this->get('logger')->error('Error while saving an entry', [
'exception' => $e,
'entry' => $entry,
]);
// $this->get('logger')->error('Error while saving an entry', [
// 'exception' => $e,
// 'entry' => $entry,
// ]);
}
}
@ -1014,10 +1014,10 @@ class EntryRestController extends WallabagRestController
try {
$this->get(ContentProxy::class)->updateEntry($entry, $entry->getUrl());
} catch (\Exception $e) {
$this->get('logger')->error('Error while saving an entry', [
'exception' => $e,
'entry' => $entry,
]);
// $this->get('logger')->error('Error while saving an entry', [
// 'exception' => $e,
// 'entry' => $entry,
// ]);
return new JsonResponse([], 304);
}

8
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -697,10 +697,10 @@ class EntryController extends Controller
try {
$this->get(ContentProxy::class)->updateEntry($entry, $entry->getUrl());
} catch (\Exception $e) {
$this->get('logger')->error('Error while saving an entry', [
'exception' => $e,
'entry' => $entry,
]);
// $this->logger->error('Error while saving an entry', [
// 'exception' => $e,
// 'entry' => $entry,
// ]);
$message = 'flashes.entry.notice.' . $prefixMessage . '_failed';
}