Fix CS and SA (#141)

HypeMC · web-flow · commit 1f11f1dc4fb7 · 2026-06-03T19:37:27.000+02:00
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -73,8 +73,8 @@ parameters:
 			path: src/Cache/RouteMetadata/YamlMetadataProvider.php
 
 		-
-			message: '#^Comparison operation "\>\=" between 0 and 1 is always false\.$#'
-			identifier: greaterOrEqual.alwaysFalse
+			message: '#^Comparison operation "\>\=" between 1 and 1 is always true\.$#'
+			identifier: greaterOrEqual.alwaysTrue
 			count: 1
 			path: src/Command/DebugCommand.php
 
diff --git a/tests/Cache/PropertyResolver/Fixtures/DummyEntity.php b/tests/Cache/PropertyResolver/Fixtures/DummyEntity.php
@@ -9,7 +9,7 @@
 class DummyEntity
 {
     #[TargetedProperties('bar', 'baz')]
-    public function getFoo()
+    public function getFoo(): void
     {
     }
 }
diff --git a/tests/Cache/RouteMetadata/Fixtures/BarController.php b/tests/Cache/RouteMetadata/Fixtures/BarController.php
@@ -9,12 +9,12 @@
 class BarController
 {
     #[PurgeOn('foo', route: 'foo_bar1')]
-    public function fooAction()
+    public function fooAction(): void
     {
     }
 
     #[PurgeOn('foo', route: ['foo_baz1', 'foo_baz3'])]
-    public function bazAction()
+    public function bazAction(): void
     {
     }
 }
diff --git a/tests/Cache/RouteMetadata/Fixtures/BazController.php b/tests/Cache/RouteMetadata/Fixtures/BazController.php
@@ -9,12 +9,12 @@
 #[PurgeOn('foo')]
 class BazController
 {
-    public function __invoke()
+    public function __invoke(): void
     {
     }
 
     #[PurgeOn('bar')]
-    public function barAction()
+    public function barAction(): void
     {
     }
 }
diff --git a/tests/Cache/RouteMetadata/Fixtures/FooController.php b/tests/Cache/RouteMetadata/Fixtures/FooController.php
@@ -9,13 +9,13 @@
 class FooController
 {
     #[PurgeOn('bar')]
-    public function barAction()
+    public function barAction(): void
     {
     }
 
     #[PurgeOn('baz1')]
     #[PurgeOn('baz2')]
-    public function bazAction()
+    public function bazAction(): void
     {
     }
 }
diff --git a/tests/Cache/Subscription/Fixtures/DummyController.php b/tests/Cache/Subscription/Fixtures/DummyController.php
@@ -6,7 +6,7 @@
 
 class DummyController
 {
-    public function barAction()
+    public function barAction(): void
     {
     }
 }
diff --git a/tests/DependencyInjection/Fixtures/DummyController.php b/tests/DependencyInjection/Fixtures/DummyController.php
@@ -9,16 +9,16 @@
 class DummyController
 {
     #[PurgeOn('test')]
-    public function methodWithPurgeOn()
+    public function methodWithPurgeOn(): void
     {
     }
 
-    public function methodWithoutPurgeOn()
+    public function methodWithoutPurgeOn(): void
     {
     }
 
     #[PurgeOn('test')]
-    public function anotherMethodWithPurgeOn()
+    public function anotherMethodWithPurgeOn(): void
     {
     }
 }
diff --git a/tests/DependencyInjection/Fixtures/DummyControllerWithPurgeOn.php b/tests/DependencyInjection/Fixtures/DummyControllerWithPurgeOn.php
@@ -9,12 +9,12 @@
 #[PurgeOn('test')]
 class DummyControllerWithPurgeOn
 {
-    public function __invoke()
+    public function __invoke(): void
     {
     }
 
     #[PurgeOn('test')]
-    public function methodWithPurgeOn()
+    public function methodWithPurgeOn(): void
     {
     }
 }
diff --git a/tests/DependencyInjection/Fixtures/DummyExpressionLanguageFunction.php b/tests/DependencyInjection/Fixtures/DummyExpressionLanguageFunction.php
@@ -9,12 +9,12 @@
 #[AsExpressionLanguageFunction('function_class')]
 class DummyExpressionLanguageFunction
 {
-    public function __invoke()
+    public function __invoke(): void
     {
     }
 
     #[AsExpressionLanguageFunction('function_foo')]
-    public function foo()
+    public function foo(): void
     {
     }
 }
diff --git a/tests/DependencyInjection/Fixtures/DummyRouteParamService.php b/tests/DependencyInjection/Fixtures/DummyRouteParamService.php
@@ -9,12 +9,12 @@
 #[AsRouteParamService('alias_class')]
 class DummyRouteParamService
 {
-    public function __invoke()
+    public function __invoke(): void
     {
     }
 
     #[AsRouteParamService('alias_foo')]
-    public function foo()
+    public function foo(): void
     {
     }
 }
diff --git a/tests/Functional/DebugCommand/Controller/AuthorController.php b/tests/Functional/DebugCommand/Controller/AuthorController.php
@@ -22,7 +22,7 @@ class AuthorController
             'author_id' => 'id',
         ],
     )]
-    public function show(Author $author)
+    public function show(Author $author): void
     {
     }
 }
diff --git a/tests/Functional/DebugCommand/Controller/PostController.php b/tests/Functional/DebugCommand/Controller/PostController.php
@@ -39,7 +39,7 @@ class PostController
         ],
         actions: [Action::Update, Action::Delete],
     )]
-    public function show(Post $post)
+    public function show(Post $post): void
     {
     }
 
@@ -55,7 +55,7 @@ public function show(Post $post)
             'page' => new DynamicValues('purgatory.get_page'),
         ],
     )]
-    public function list()
+    public function list(): void
     {
     }
 
@@ -75,7 +75,7 @@ public function list()
             'tag_id' => 'id',
         ],
     )]
-    public function filterByAuthorAndTag(Author $author)
+    public function filterByAuthorAndTag(Author $author): void
     {
     }
 }
diff --git a/tests/Functional/EntityChangeListener/Controller/DummyController.php b/tests/Functional/EntityChangeListener/Controller/DummyController.php
@@ -18,14 +18,14 @@ class DummyController
     #[PurgeOn(DummyParent::class, target: 'dummy', routeParams: ['name' => 'dummy.name'])]
     #[AnnotationRoute('/{name}', name: 'test_index')]
     #[Route('/{name}', 'test_index')]
-    public function index()
+    public function index(): void
     {
     }
 
     #[PurgeOn(Dummy::class, target: 'name')]
     #[AnnotationRoute('/foo', name: 'test_foo', host: 'example.test')]
     #[Route('/foo', 'test_foo', host: 'example.test')]
-    public function foo()
+    public function foo(): void
     {
     }
 }
diff --git a/tests/Functional/TestApplication/Controller/AnimalController.php b/tests/Functional/TestApplication/Controller/AnimalController.php
@@ -31,7 +31,7 @@ class AnimalController
             'animal_id' => 'id',
         ],
     )]
-    public function detailAction(Animal $animal)
+    public function detailAction(Animal $animal): void
     {
     }
 
@@ -43,7 +43,7 @@ public function detailAction(Animal $animal)
             'animal_id' => 'id',
         ],
     )]
-    public function measurementsAction(Animal $animal)
+    public function measurementsAction(Animal $animal): void
     {
     }
 
@@ -55,7 +55,7 @@ public function measurementsAction(Animal $animal)
             'animal_id' => 'id',
         ],
     )]
-    public function measurementsAltAction(Animal $animal)
+    public function measurementsAltAction(Animal $animal): void
     {
     }
 
@@ -74,7 +74,7 @@ public function measurementsAltAction(Animal $animal)
         target: 'measurements.width',
         route: 'animal_route_2',
     )]
-    public function someRandomRouteAction(Animal $animal)
+    public function someRandomRouteAction(Animal $animal): void
     {
     }
 
@@ -86,7 +86,7 @@ public function someRandomRouteAction(Animal $animal)
             'country' => new EnumValues(Country::class),
         ],
     )]
-    public function petOfTheDayAction(Country $country)
+    public function petOfTheDayAction(Country $country): void
     {
     }
 
@@ -101,7 +101,7 @@ public function petOfTheDayAction(Country $country)
             ),
         ],
     )]
-    public function petOfTheMonthAction(string $country)
+    public function petOfTheMonthAction(string $country): void
     {
     }
 
@@ -113,7 +113,7 @@ public function petOfTheMonthAction(string $country)
             'tag' => 'tags',
         ],
     )]
-    public function tagAction(string $tag)
+    public function tagAction(string $tag): void
     {
     }
 
@@ -137,7 +137,7 @@ public function tagAction(string $tag)
             ),
         ],
     )]
-    public function animalsForRatingAction(int $rating)
+    public function animalsForRatingAction(int $rating): void
     {
     }
 
@@ -148,7 +148,7 @@ public function animalsForRatingAction(int $rating)
             'id' => 'pets[*].id',
         ],
     )]
-    public function petOwnerDetails(Animal $animal)
+    public function petOwnerDetails(Animal $animal): void
     {
     }
 
@@ -159,7 +159,7 @@ public function petOwnerDetails(Animal $animal)
             'id' => 'petsIds',
         ],
     )]
-    public function petOwnerDetailsAlternative(Animal $animal)
+    public function petOwnerDetailsAlternative(Animal $animal): void
     {
     }
 
@@ -168,7 +168,7 @@ public function petOwnerDetailsAlternative(Animal $animal)
     #[PurgeOn(Animal::class,
         target: new ForProperties(['isGoodBoy']),
     )]
-    public function goodBoyRankingAction()
+    public function goodBoyRankingAction(): void
     {
     }
 
@@ -181,7 +181,7 @@ public function goodBoyRankingAction()
         ],
         if: 'obj.name === "Sharp Dressed Dog"', // temporary because sf5 does not support optional property accesses
     )]
-    public function animalsForVeterinarianAction(Person $veterinarian)
+    public function animalsForVeterinarianAction(Person $veterinarian): void
     {
     }
 
@@ -195,7 +195,7 @@ public function animalsForVeterinarianAction(Person $veterinarian)
         ],
         if: 'obj.name === "Sharp Dressed Dog"', // temporary because sf5 does not support optional property accesses
     )]
-    public function animalsForOwnerAndVeterinarianAction(Person $veterinarian)
+    public function animalsForOwnerAndVeterinarianAction(Person $veterinarian): void
     {
     }
 }
diff --git a/tests/Functional/TestApplication/Controller/CompetitionController.php b/tests/Functional/TestApplication/Controller/CompetitionController.php
@@ -18,7 +18,7 @@ class CompetitionController
     #[Route('/ordered-by-number-of-pets', 'competitions_ordered_by_number_of_pets')]
     #[AnnotationRoute('/ordered-by-number-of-pets', name: 'competitions_ordered_by_number_of_pets')]
     #[PurgeOn(Competition::class, target: 'numberOfPets')]
-    public function orderedCompetitionsAction()
+    public function orderedCompetitionsAction(): void
     {
     }
 
@@ -30,7 +30,7 @@ public function orderedCompetitionsAction()
             'winner_id' => 'winner.id',
         ],
     )]
-    public function competitionsByWinnerAction()
+    public function competitionsByWinnerAction(): void
     {
     }
 }
diff --git a/tests/Functional/TestApplication/Controller/PersonController.php b/tests/Functional/TestApplication/Controller/PersonController.php
diff --git a/tests/Functional/TestApplication/Controller/VehicleController.php b/tests/Functional/TestApplication/Controller/VehicleController.php

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ parameters:`
`73`	`73`	`path: src/Cache/RouteMetadata/YamlMetadataProvider.php`
`74`	`74`
`75`	`75`	`-`
`76`		`- message: '#^Comparison operation "\>\=" between 0 and 1 is always false\.$#'`
`77`		`- identifier: greaterOrEqual.alwaysFalse`
	`76`	`+ message: '#^Comparison operation "\>\=" between 1 and 1 is always true\.$#'`
	`77`	`+ identifier: greaterOrEqual.alwaysTrue`
`78`	`78`	`count: 1`
`79`	`79`	`path: src/Command/DebugCommand.php`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class DummyEntity`
`10`	`10`	`{`
`11`	`11`	`#[TargetedProperties('bar', 'baz')]`
`12`		`- public function getFoo()`
	`12`	`+ public function getFoo(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`class BarController`
`10`	`10`	`{`
`11`	`11`	`#[PurgeOn('foo', route: 'foo_bar1')]`
`12`		`- public function fooAction()`
	`12`	`+ public function fooAction(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`#[PurgeOn('foo', route: ['foo_baz1', 'foo_baz3'])]`
`17`		`- public function bazAction()`
	`17`	`+ public function bazAction(): void`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`#[PurgeOn('foo')]`
`10`	`10`	`class BazController`
`11`	`11`	`{`
`12`		`- public function __invoke()`
	`12`	`+ public function __invoke(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`#[PurgeOn('bar')]`
`17`		`- public function barAction()`
	`17`	`+ public function barAction(): void`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@`
`9`	`9`	`class FooController`
`10`	`10`	`{`
`11`	`11`	`#[PurgeOn('bar')]`
`12`		`- public function barAction()`
	`12`	`+ public function barAction(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`#[PurgeOn('baz1')]`
`17`	`17`	`#[PurgeOn('baz2')]`
`18`		`- public function bazAction()`
	`18`	`+ public function bazAction(): void`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class DummyController`
`8`	`8`	`{`
`9`		`- public function barAction()`
	`9`	`+ public function barAction(): void`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,16 @@`
`9`	`9`	`class DummyController`
`10`	`10`	`{`
`11`	`11`	`#[PurgeOn('test')]`
`12`		`- public function methodWithPurgeOn()`
	`12`	`+ public function methodWithPurgeOn(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function methodWithoutPurgeOn()`
	`16`	`+ public function methodWithoutPurgeOn(): void`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`#[PurgeOn('test')]`
`21`		`- public function anotherMethodWithPurgeOn()`
	`21`	`+ public function anotherMethodWithPurgeOn(): void`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`#[AsExpressionLanguageFunction('function_class')]`
`10`	`10`	`class DummyExpressionLanguageFunction`
`11`	`11`	`{`
`12`		`- public function __invoke()`
	`12`	`+ public function __invoke(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`#[AsExpressionLanguageFunction('function_foo')]`
`17`		`- public function foo()`
	`17`	`+ public function foo(): void`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`#[AsRouteParamService('alias_class')]`
`10`	`10`	`class DummyRouteParamService`
`11`	`11`	`{`
`12`		`- public function __invoke()`
	`12`	`+ public function __invoke(): void`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`#[AsRouteParamService('alias_foo')]`
`17`		`- public function foo()`
	`17`	`+ public function foo(): void`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`	`}`