Skip to content

Commit c5088ff

Browse files
authored
Merge pull request #63783 from nextcloud/dependabot/composer/vendor-bin/rector/stable35/rector/rector-2.6.3
[stable35] build(deps-dev): bump rector/rector from 2.6.1 to 2.6.3 in /vendor-bin/rector
2 parents bbb49b5 + 37f5788 commit c5088ff

23 files changed

Lines changed: 79 additions & 54 deletions

File tree

build/rector-shared.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
6868
'rename_property' => true,
6969
])
7070
->withSets([
71-
NextcloudSets::NEXTCLOUD_27,
72-
PHPUnitSetList::PHPUNIT_100,
71+
NextcloudSets::NEXTCLOUD_32,
72+
PHPUnitSetList::COMPOSER_BASED,
7373
]);
7474

75-
$config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
75+
$config->registerService(NextcloudNamespaceSkipVoter::class);
7676

7777
/* Ignore all files ignored by git */
7878
$ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg($nextcloudDir));

core/css/fixes.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/*!
22
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
4-
*/::-moz-focus-inner{border:0}/*# sourceMappingURL=fixes.css.map */
4+
*/::-moz-focus-inner{border:0}.nc-select__dropdown.vs__dropdown-menu{--vs-dropdown-z-index: 9999}/*# sourceMappingURL=fixes.css.map */

core/css/fixes.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/fixes.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,15 @@
99
border: 0;
1010
}
1111

12+
/* ---- LIBRARY FIXES ---- */
13+
14+
/**
15+
* TODO: Hotfix for https://github.com/nextcloud-libraries/nextcloud-vue/issues/8783
16+
*
17+
* NcSelect appends its dropdown to the body, but `--vs-dropdown-z-index` is only
18+
* set on the select itself, so the dropdown falls back to the vue-select default
19+
* of 1000 and ends up behind modals (z-index 9998 and above).
20+
*/
21+
.nc-select__dropdown.vs__dropdown-menu {
22+
--vs-dropdown-z-index: 9999;
23+
}

core/css/server.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/server.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/private/AppFramework/ORM/EntityManager.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ public function __construct(
3535
* @return EntityInfo<T>
3636
*/
3737
public function getEntityInfo(string $entityClass): EntityInfo {
38-
if (!isset($this->entitiesInfo[$entityClass])) {
39-
$this->entitiesInfo[$entityClass] = new EntityInfo($entityClass);
40-
}
38+
$this->entitiesInfo[$entityClass] ??= new EntityInfo($entityClass);
4139

4240
/** @var EntityInfo<T> $entityInfo */
4341
$entityInfo = $this->entitiesInfo[$entityClass];

lib/unstable/Sharing/Recipient/ShareRecipient.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ public function format(ISharingRegistry $registry, IFactory $l10nFactory, IURLGe
7979
}
8080

8181
$icon = $recipientType->getRecipientIcon($this->value);
82-
if ($icon === null) {
83-
$icon = new ShareIconURL(
84-
$urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $displayName, 'size' => 64]),
85-
$urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $displayName, 'size' => 64, 'darkTheme' => true]),
86-
);
87-
}
82+
$icon ??= new ShareIconURL(
83+
$urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $displayName, 'size' => 64]),
84+
$urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $displayName, 'size' => 64, 'darkTheme' => true]),
85+
);
8886

8987
return [
9088
'class' => $this->class,

tests/playwright/e2e/files/files-delete.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test.describe('Files: Delete', () => {
1414
const row = filesListPage.getRowForFile('file.txt')
1515
await expect(row).toBeVisible()
1616
// Preview must finish loading before delete — a loading preview can lock the file
17-
await expect(row.locator('.files-list__row-icon-preview--loaded')).toBeVisible()
17+
await filesListPage.waitForPreviewLoaded('file.txt')
1818

1919
const deleteResponse = page.waitForResponse(
2020
(r) => r.url().includes('/remote.php/dav/files/') && r.request().method() === 'DELETE',

tests/playwright/e2e/files_sharing/public-share/copy-move-rename-files.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ const SHARE_NAME = 'shared'
1414
* by a guest.
1515
*/
1616
test.describe('files_sharing: Public share - copy, move and rename files', () => {
17-
test.beforeEach(async ({ user, ownerRequest, publicShare }) => {
17+
test.beforeEach(async ({ user, ownerRequest, publicShare, filesListPage }) => {
1818
await seedSharedFolder(ownerRequest, user, SHARE_NAME)
1919
const share = await createLinkShare(ownerRequest, `/${SHARE_NAME}`, {
2020
permissions: BUNDLED_PERMISSIONS.UPLOAD_AND_UPDATE,
2121
})
2222
await publicShare.open(share.url)
23+
// Every test moves, copies or renames foo.txt, so its preview has to be
24+
// loaded first — a preview being generated locks the file on the server.
25+
await filesListPage.waitForPreviewLoaded('foo.txt')
2326
})
2427

2528
test('can copy a file to another folder', async ({ page, filesListPage, copyMoveDialog }) => {

0 commit comments

Comments
 (0)