Skip to content

Commit d442a4e

Browse files
committed
fix: Add parameters to annotation with parameters in 27 tests
Signed-off-by: Côme Chilliet <[email protected]>
1 parent 63da326 commit d442a4e

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

config/nextcloud-27/nextcloud-27-deprecations.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
$rectorConfig->ruleWithConfiguration(
1313
AnnotationToAttributeRector::class,
1414
[
15-
new AnnotationToAttribute('AnonRateLimit', 'OCP\AppFramework\Http\Attribute\AnonRateLimit'),
16-
new AnnotationToAttribute('ARateLimit', 'OCP\AppFramework\Http\Attribute\ARateLimit'),
15+
new AnnotationToAttribute('AnonRateThrottle', 'OCP\AppFramework\Http\Attribute\AnonRateLimit',),
1716
new AnnotationToAttribute(
1817
'AuthorizedAdminSetting',
1918
'OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting',
2019
),
21-
new AnnotationToAttribute('BruteForceProtection', 'OCP\AppFramework\Http\Attribute\BruteForceProtection'),
20+
new AnnotationToAttribute('BruteForceProtection', 'OCP\AppFramework\Http\Attribute\BruteForceProtection',),
2221
new AnnotationToAttribute('CORS', 'OCP\AppFramework\Http\Attribute\CORS'),
2322
new AnnotationToAttribute('NoAdminRequired', 'OCP\AppFramework\Http\Attribute\NoAdminRequired'),
2423
new AnnotationToAttribute('NoCSRFRequired', 'OCP\AppFramework\Http\Attribute\NoCSRFRequired'),
@@ -29,7 +28,7 @@
2928
new AnnotationToAttribute('PublicPage', 'OCP\AppFramework\Http\Attribute\PublicPage'),
3029
new AnnotationToAttribute('StrictCookiesRequired', 'OCP\AppFramework\Http\Attribute\StrictCookiesRequired'),
3130
new AnnotationToAttribute('SubAdminRequired', 'OCP\AppFramework\Http\Attribute\SubAdminRequired'),
32-
new AnnotationToAttribute('UserRateLimit', 'OCP\AppFramework\Http\Attribute\UserRateLimit'),
31+
new AnnotationToAttribute('UserRateThrottle', 'OCP\AppFramework\Http\Attribute\UserRateLimit'),
3332
],
3433
);
3534
};

tests/Set/Nextcloud27/Fixture/controller_use_session_annotation.php.inc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ namespace Nextcloud\Rector\Test\Set\Nextcloud27\Fixture;
55
class SomeController
66
{
77
/**
8-
* @AnonRateLimit
9-
* @ARateLimit
10-
* @AuthorizedAdminSetting
11-
* @BruteForceProtection
8+
* @AnonRateThrottle(limit=10, period=100)
9+
* @UserRateThrottle(limit=20, period=200)
10+
* @AuthorizedAdminSetting(settings=OCA\NotesTutorial\Settings\NotesAdmin;OCA\NotesTutorial\Settings\NotesSubAdmin)
11+
* @BruteForceProtection(action=login)
1212
* @CORS
1313
* @NoAdminRequired
1414
* @NoCSRFRequired
1515
* @PasswordConfirmationRequired
1616
* @PublicPage
1717
* @StrictCookiesRequired
1818
* @SubAdminRequired
19-
* @UserRateLimit
2019
*/
2120
public function foo()
2221
{}
@@ -30,18 +29,18 @@ namespace Nextcloud\Rector\Test\Set\Nextcloud27\Fixture;
3029

3130
class SomeController
3231
{
33-
#[\OCP\AppFramework\Http\Attribute\AnonRateLimit]
34-
#[\OCP\AppFramework\Http\Attribute\ARateLimit]
35-
#[\OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting]
36-
#[\OCP\AppFramework\Http\Attribute\BruteForceProtection]
32+
#[\OCP\AppFramework\Http\Attribute\AnonRateLimit(limit: 10, period: 100)]
33+
#[\OCP\AppFramework\Http\Attribute\UserRateLimit(limit: 20, period: 200)]
34+
#[\OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting(settings: 'OCA\NotesTutorial\Settings\NotesAdmin')]
35+
#[\OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting(settings: 'OCA\NotesTutorial\Settings\NotesSubAdmin')]
36+
#[\OCP\AppFramework\Http\Attribute\BruteForceProtection(action: 'login')]
3737
#[\OCP\AppFramework\Http\Attribute\CORS]
3838
#[\OCP\AppFramework\Http\Attribute\NoAdminRequired]
3939
#[\OCP\AppFramework\Http\Attribute\NoCSRFRequired]
4040
#[\OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired]
4141
#[\OCP\AppFramework\Http\Attribute\PublicPage]
4242
#[\OCP\AppFramework\Http\Attribute\StrictCookiesRequired]
4343
#[\OCP\AppFramework\Http\Attribute\SubAdminRequired]
44-
#[\OCP\AppFramework\Http\Attribute\UserRateLimit]
4544
public function foo()
4645
{}
4746
}

0 commit comments

Comments
 (0)