Skip to content

[stable31] Update nextcloud/ocp dependency #3120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 2 commits into from
Aug 22, 2025
Merged

[stable31] Update nextcloud/ocp dependency #3120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f76dabb
chore(dev-deps): Bump nextcloud/ocp package
nextcloud-command Aug 10, 2025
4495fc7
chore: adjust psalm linting
susnux Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
]
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8",
"nextcloud/ocp": "dev-stable31"
"bamarni/composer-bin-plugin": "^1.8"
},
"require": {
"hexogen/kdtree": "^0.2.5"
Expand Down
255 changes: 2 additions & 253 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/Controller/PreviewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace OCA\Photos\Controller;

use OCA\Files_Sharing\SharedStorage;
use OCA\Photos\Album\AlbumMapper;
use OCA\Photos\AppInfo\Application;
use OCP\AppFramework\Controller;
Expand All @@ -20,6 +19,7 @@
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\Files\Storage\ISharedStorage;
use OCP\IGroupManager;
use OCP\IPreview;
use OCP\IRequest;
Expand Down Expand Up @@ -78,11 +78,11 @@ public function index(
$nodes,
function ($node) {
$storage = $node->getStorage();
if (!$storage->instanceOfStorage(SharedStorage::class)) {
if (!$storage->instanceOfStorage(ISharedStorage::class)) {
return true;
}

/** @var SharedStorage $storage */
/** @var ISharedStorage $storage */
$share = $storage->getShare();
$attributes = $share->getAttributes();

Expand Down
2 changes: 1 addition & 1 deletion lib/Listener/OriginalDateTimeMetadataProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<MetadataLiveEvent>
* @template-implements IEventListener<MetadataLiveEvent|MetadataBackgroundEvent>
*/
class OriginalDateTimeMetadataProvider implements IEventListener {
public function __construct(
Expand Down
2 changes: 1 addition & 1 deletion lib/Listener/SizeMetadataProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<MetadataLiveEvent>
* @template-implements IEventListener<MetadataLiveEvent|MetadataBackgroundEvent>
*/
class SizeMetadataProvider implements IEventListener {
public function __construct(
Expand Down
6 changes: 5 additions & 1 deletion psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<psalm errorLevel="4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config https://getpsalm.org/schema/config"
errorBaseline="tests/psalm-baseline.xml"
autoloader="vendor-bin/psalm/vendor/autoload.php"
errorBaseline="tests/psalm-baseline.xml"
findUnusedBaselineEntry="true"
findUnusedCode="false"
findUnusedIssueHandlerSuppression="true"
findUnusedPsalmSuppress="true"
phpVersion="8.1">
<stubs>
<file name="tests/stub.phpstub" preloadClasses="true" />
Expand Down
Loading
Loading