diff --git a/composer.lock b/composer.lock index e9421823b6e..df6e24549bf 100644 --- a/composer.lock +++ b/composer.lock @@ -79,16 +79,16 @@ }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.22.0", + "version": "v3.27.0", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e" + "reference": "d860473d16b906c7945206177edc7d112357a706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/8701394f0c7cd450ac4fa577d24589122c1d5d5e", - "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/d860473d16b906c7945206177edc7d112357a706", + "reference": "d860473d16b906c7945206177edc7d112357a706", "shasum": "" }, "require": { @@ -98,7 +98,7 @@ "php": "^7.4 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^9.6.4 || ^10.5.29" + "phpunit/phpunit": "^9.6.22 || 10.5.45 || ^11.5.7" }, "type": "library", "autoload": { @@ -119,9 +119,15 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.22.0" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.27.0" }, - "time": "2024-08-16T20:44:35+00:00" + "funding": [ + { + "url": "https://github.com/kubawerlos", + "type": "github" + } + ], + "time": "2025-06-10T20:53:07+00:00" }, { "name": "myclabs/deep-copy", @@ -185,21 +191,21 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "9c719c4747fa26efc12f2e8b21c14a9a75c6ba6d" + "reference": "8e06808c1423e9208d63d1bd205b9a38bd400011" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/9c719c4747fa26efc12f2e8b21c14a9a75c6ba6d", - "reference": "9c719c4747fa26efc12f2e8b21c14a9a75c6ba6d", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/8e06808c1423e9208d63d1bd205b9a38bd400011", + "reference": "8e06808c1423e9208d63d1bd205b9a38bd400011", "shasum": "" }, "require": { "kubawerlos/php-cs-fixer-custom-fixers": "^3.22", - "php": "^7.3|^8.0", + "php": "^8.0", "php-cs-fixer/shim": "^3.17" }, "type": "library", @@ -219,11 +225,14 @@ } ], "description": "Nextcloud coding standards for the php cs fixer", + "keywords": [ + "dev" + ], "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v1.3.2" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.4.0" }, - "time": "2024-10-14T16:49:05+00:00" + "time": "2025-06-19T12:27:27+00:00" }, { "name": "nextcloud/ocp", @@ -452,16 +461,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.64.0", + "version": "v3.75.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "81ccfd24baf3a10810dab1152c403981a790b837" + "reference": "eea219a577085bd13ff0cb644a422c20798316c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/81ccfd24baf3a10810dab1152c403981a790b837", - "reference": "81ccfd24baf3a10810dab1152c403981a790b837", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/eea219a577085bd13ff0cb644a422c20798316c7", + "reference": "eea219a577085bd13ff0cb644a422c20798316c7", "shasum": "" }, "require": { @@ -498,9 +507,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.64.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.75.0" }, - "time": "2024-08-30T23:10:11+00:00" + "time": "2025-03-31T18:45:02+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2991,8 +3000,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "nextcloud/ocp": 20, - "roave/security-advisories": 20 + "roave/security-advisories": 20, + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false, @@ -3005,5 +3014,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/cypress/e2e/Assistant.spec.js b/cypress/e2e/Assistant.spec.js index ad53710b2b0..83d7e9193e9 100644 --- a/cypress/e2e/Assistant.spec.js +++ b/cypress/e2e/Assistant.spec.js @@ -69,11 +69,11 @@ describe('Assistant', () => { cy.wait(2000) cy.get('.assistant-modal--content button') - .contains('Run task in the background and get notified') + .contains('Get notified') .click() - cy.get('.assistant-modal--content') - .should('contain', 'Your task has been scheduled') + cy.get('.assistant-modal--content button .bell-ring-outline-icon') + .should('be.visible') cy.get('.assistant-modal--content .close-button') .click() diff --git a/lib/Command/ResetDocument.php b/lib/Command/ResetDocument.php index f7e293dd213..014223cec66 100644 --- a/lib/Command/ResetDocument.php +++ b/lib/Command/ResetDocument.php @@ -1,4 +1,5 @@ request->getParam('shareToken')) { try { $share = $this->shareManager->getShareByToken($shareToken); diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index 7d4cf87e63a..6e3dd1d373b 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -1,4 +1,5 @@ getDirectoryListing(), function ($node) use ($contentAttachmentFileIds, $contentAttachmentNames) { - return !in_array($node->getName(), $contentAttachmentNames) && - !in_array($node->getId(), $contentAttachmentFileIds); + return !in_array($node->getName(), $contentAttachmentNames) + && !in_array($node->getId(), $contentAttachmentFileIds); } ); foreach ($toDelete as $node) { diff --git a/lib/Service/NotificationService.php b/lib/Service/NotificationService.php index 2a0d68a7894..3b21f7b0d4e 100644 --- a/lib/Service/NotificationService.php +++ b/lib/Service/NotificationService.php @@ -1,4 +1,5 @@