Skip to content

[stable25] fix: expect interface, not a specific implementation #39154

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
blizzz merged 8 commits into from
Jul 6, 2023
Merged

[stable25] fix: expect interface, not a specific implementation #39154

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5640339
fix: expect interface, not a specific implementation
blizzz Jun 2, 2023
e5e9df2
fix: add typehine for IRootFolder
blizzz Jun 2, 2023
d5b69c1
chore: ugly type juggling
blizzz Jun 8, 2023
481cbaf
refactor: declare getMount() and getMountsIn() at IRootFolder
blizzz Jun 15, 2023
c2fdee7
ci: pro forma check of existence of internal method
blizzz Jun 16, 2023
5ca35c9
docs: adjust @since version to backport
blizzz Jun 26, 2023
2930f89
ci: adjust return annotation to older psalm version
blizzz Jun 26, 2023
1eb9f18
fix: adjust to PHP level and codebase
blizzz Jul 4, 2023
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
Next Next commit
fix: expect interface, not a specific implementation 
- fixes a regression when deleting folders while music app was enabled,
  for a LazyRoot was passed to this method.

Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Jul 4, 2023
commit 5640339d1d6d87a80b3640b7c1465b63d53352e5
5 changes: 2 additions & 3 deletions lib/private/Files/Cache/QuerySearchHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@
namespace OC\Files\Cache;

use OC\Files\Cache\Wrapper\CacheJail;
use OC\Files\Node\Root;
use OC\Files\Search\QueryOptimizer\QueryOptimizer;
use OC\Files\Search\SearchBinaryOperator;
use OC\SystemConfig;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Cache\ICache;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Folder;
use OCP\Files\IMimeTypeLoader;
use OCP\Files\IRootFolder;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\Search\ISearchBinaryOperator;
use OCP\Files\Search\ISearchQuery;
Expand Down Expand Up @@ -199,7 +198,7 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
/**
* @return array{array<string, ICache>, array<string, IMountPoint>}
*/
public function getCachesAndMountPointsForSearch(Root $root, string $path, bool $limitToHome = false): array {
public function getCachesAndMountPointsForSearch(IRootFolder $root, string $path, bool $limitToHome = false): array {
$rootLength = strlen($path);
$mount = $root->getMount($path);
$storage = $mount->getStorage();
Expand Down