@@ -10,37 +10,37 @@ class ContainerHasParameterConstraintTest extends TestCase
1010{
1111 /**
1212 * @test
13+ *
1314 * @dataProvider containerBuilderProvider
1415 */
1516 public function match (
16- ContainerInterface $ container ,
17+ array $ containerParameters ,
1718 $ parameterName ,
1819 $ parameterValue ,
1920 $ checkParameterValue ,
2021 $ expectedToMatch
2122 ): void {
23+ $ container = $ this ->createMockContainerWithParameters ($ containerParameters );
2224 $ constraint = new ContainerHasParameterConstraint ($ parameterName , $ parameterValue , $ checkParameterValue );
2325
2426 $ this ->assertSame ($ expectedToMatch , $ constraint ->evaluate ($ container , '' , true ));
2527 }
2628
27- public function containerBuilderProvider ()
29+ public static function containerBuilderProvider ()
2830 {
29- $ emptyContainer = $ this ->createMockContainerWithParameters ([]);
30-
3131 $ parameterName = 'parameter_name ' ;
3232 $ parameterValue = 'some value ' ;
3333 $ wrongParameterValue = 'some other value ' ;
3434
3535 return [
3636 // the container does not have the parameter
37- [$ emptyContainer , $ parameterName , $ parameterValue , true , false ],
37+ [[] , $ parameterName , $ parameterValue , true , false ],
3838 // the container has the parameter but the values don't match
39- [$ this -> createMockContainerWithParameters ( [$ parameterName => $ parameterValue ]) , $ parameterName , $ wrongParameterValue , true , false ],
39+ [[$ parameterName => $ parameterValue ], $ parameterName , $ wrongParameterValue , true , false ],
4040 // the container has the parameter and the value matches
41- [$ this -> createMockContainerWithParameters ( [$ parameterName => $ parameterValue ]) , $ parameterName , $ parameterValue , true , true ],
41+ [[$ parameterName => $ parameterValue ], $ parameterName , $ parameterValue , true , true ],
4242 // the container has the parameter and the value is optional
43- [$ this -> createMockContainerWithParameters ( [$ parameterName => $ parameterValue ]) , $ parameterName , null , false , true ],
43+ [[$ parameterName => $ parameterValue ], $ parameterName , null , false , true ],
4444 ];
4545 }
4646
@@ -49,14 +49,14 @@ private function createMockContainerWithParameters(array $parameters)
4949 $ container = $ this ->createMock (ContainerInterface::class);
5050
5151 $ container
52- ->expects ($ this -> any ())
52+ ->expects (self :: any ())
5353 ->method ('hasParameter ' )
5454 ->willReturnCallback (function ($ parameterName ) use ($ parameters ) {
5555 return array_key_exists ($ parameterName , $ parameters );
5656 });
5757
5858 $ container
59- ->expects ($ this -> any ())
59+ ->expects (self :: any ())
6060 ->method ('getParameter ' )
6161 ->willReturnCallback (function ($ parameterName ) use ($ parameters ) {
6262 return $ parameters [$ parameterName ];
0 commit comments