Skip to content

Commit 77fd11f

Browse files
authored
Merge pull request #1194 from nextcloud/chore/bump-php-8.3
2 parents c0b4852 + 5ec7be8 commit 77fd11f

File tree

6 files changed

+32
-10
lines changed

6 files changed

+32
-10
lines changed

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
2121
<repository type="git">https://github.com/nextcloud/notes.git</repository>
2222
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes-thumbnail.jpg">https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes.png</screenshot>
2323
<dependencies>
24-
<php min-version="7.4" max-version="8.2"/>
24+
<php min-version="7.4" max-version="8.3"/>
2525
<nextcloud min-version="25" max-version="29"/>
2626
</dependencies>
2727
<repair-steps>

lib/AppInfo/Application.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use OCP\EventDispatcher\GenericEvent;
1313
use OCP\EventDispatcher\IEventDispatcher;
1414
use OCP\Share\Events\BeforeShareCreatedEvent;
15+
/** @phan-suppress-next-line PhanUnreferencedUseNormal */
1516
use OCP\Share\IShare;
1617

1718
class Application extends App implements IBootstrap {
@@ -43,6 +44,7 @@ public function register(IRegistrationContext $context): void {
4344
}
4445

4546
/** @var IShare $share */
47+
/** @phan-suppress-next-line PhanDeprecatedFunction */
4648
$share = $event->getSubject();
4749

4850
$modernListener = \OCP\Server::get(BeforeShareCreatedListener::class);

lib/AppInfo/BeforeShareCreatedListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
class BeforeShareCreatedListener implements IEventListener {
1717
private SettingsService $settings;
1818
private NoteUtil $noteUtil;
19+
private LoggerInterface $logger;
1920

2021
public function __construct(SettingsService $settings, NoteUtil $noteUtil, LoggerInterface $logger) {
2122
$this->settings = $settings;

lib/AppInfo/DashboardWidget.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,18 @@ public function load(): void {
7474

7575
public function getWidgetButtons(string $userId): array {
7676
$buttons = [
77-
new WidgetButton(WidgetButton::TYPE_NEW, $this->url->linkToRouteAbsolute('notes.page.create'), $this->l10n->t('Create new note'))
77+
new WidgetButton(
78+
WidgetButton::TYPE_NEW,
79+
$this->url->linkToRouteAbsolute('notes.page.create'),
80+
$this->l10n->t('Create new note')
81+
)
7882
];
7983
if ($this->notesService->countNotes($userId) > 7) {
80-
$buttons[] = new WidgetButton(WidgetButton::TYPE_MORE, $this->url->linkToRouteAbsolute('notes.page.index'), $this->l10n->t('More notes'));
84+
$buttons[] = new WidgetButton(
85+
WidgetButton::TYPE_MORE,
86+
$this->url->linkToRouteAbsolute('notes.page.index'),
87+
$this->l10n->t('More notes')
88+
);
8189
}
8290
return $buttons;
8391
}

lib/Controller/NotesController.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,14 @@ public function getAttachment(int $noteid, string $path): Http\Response {
322322
$path
323323
);
324324
$response = new StreamResponse($targetimage->fopen('rb'));
325-
$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurldecode($targetimage->getName()) . '"');
326-
$response->addHeader('Content-Type', $this->mimeTypeDetector->getSecureMimeType($targetimage->getMimeType()));
325+
$response->addHeader(
326+
'Content-Disposition',
327+
'attachment; filename="' . rawurldecode($targetimage->getName()) . '"'
328+
);
329+
$response->addHeader(
330+
'Content-Type',
331+
$this->mimeTypeDetector->getSecureMimeType($targetimage->getMimeType())
332+
);
327333
$response->addHeader('Cache-Control', 'public, max-age=604800');
328334
return $response;
329335
} catch (\Exception $e) {

tests/phan-config.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<?php
22

3+
$testDirs = [
4+
'lib/',
5+
'vendor/',
6+
];
7+
8+
if (getenv('NC_API_TAG') === 'dev-stable25') {
9+
$testDirs[] = 'tests/stubs/';
10+
}
11+
312
return [
4-
'directory_list' => [
5-
'lib/',
6-
'vendor/',
7-
'tests/stubs/',
8-
],
13+
'directory_list' => $testDirs,
914
"exclude_analysis_directory_list" => [
1015
'vendor/',
1116
],

0 commit comments

Comments
 (0)