@@ -13,11 +13,11 @@ class MultipleValidationWitAndTest extends \PHPUnit_Framework_TestCase
13
13
{
14
14
public function testUsesAndLogicalOperation ()
15
15
{
16
- $ lexer = $ this ->getMock ("Egulias \\EmailValidator \\EmailLexer " );
17
- $ validationTrue = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
16
+ $ lexer = $ this ->getMockBuilder ("Egulias \\EmailValidator \\EmailLexer " )-> getMock ( );
17
+ $ validationTrue = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
18
18
$ validationTrue ->expects ($ this ->any ())->method ("isValid " )->willReturn (true );
19
19
$ validationTrue ->expects ($ this ->any ())->method ("getWarnings " )->willReturn ([]);
20
- $ validationFalse = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
20
+ $ validationFalse = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
21
21
$ validationFalse ->expects ($ this ->any ())->method ("isValid " )->willReturn (false );
22
22
$ validationFalse ->expects ($ this ->any ())->method ("getWarnings " )->willReturn ([]);
23
23
$ multipleValidation = new MultipleValidationWithAnd ([$ validationTrue , $ validationFalse ]);
@@ -34,9 +34,9 @@ public function testEmptyListIsNotAllowed()
34
34
35
35
public function testValidationIsValid ()
36
36
{
37
- $ lexer = $ this ->getMock ("Egulias \\EmailValidator \\EmailLexer " );
37
+ $ lexer = $ this ->getMockBuilder ("Egulias \\EmailValidator \\EmailLexer " )-> getMock ( );
38
38
39
- $ validation = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
39
+ $ validation = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
40
40
$ validation ->expects ($ this ->any ())->method ("isValid " )->willReturn (true );
41
41
$ validation ->expects ($ this ->once ())->method ("getWarnings " )->willReturn ([]);
42
42
@@ -55,12 +55,13 @@ public function testAccumulatesWarnings()
55
55
];
56
56
$ expectedResult = array_merge ($ warnings1 , $ warnings2 );
57
57
58
- $ lexer = $ this ->getMock ("Egulias \\EmailValidator \\EmailLexer " );
59
- $ validation1 = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
58
+ $ lexer = $ this ->getMockBuilder ("Egulias \\EmailValidator \\EmailLexer " )-> getMock ( );
59
+ $ validation1 = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
60
60
$ validation1 ->expects ($ this ->any ())->method ("isValid " )->willReturn (true );
61
61
$ validation1 ->expects ($ this ->once ())->method ("getWarnings " )->willReturn ($ warnings1 );
62
62
63
- $ validation2 = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
63
+ $ validation2 = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )->getMock ();
64
+
64
65
$ validation2 ->expects ($ this ->any ())->method ("isValid " )->willReturn (false );
65
66
$ validation2 ->expects ($ this ->once ())->method ("getWarnings " )->willReturn ($ warnings2 );
66
67
@@ -76,14 +77,14 @@ public function testGathersAllTheErrors()
76
77
77
78
$ expectedResult = new MultipleErrors ([$ error1 , $ error2 ]);
78
79
79
- $ lexer = $ this ->getMock ("Egulias \\EmailValidator \\EmailLexer " );
80
+ $ lexer = $ this ->getMockBuilder ("Egulias \\EmailValidator \\EmailLexer " )-> getMock ( );
80
81
81
- $ validation1 = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
82
+ $ validation1 = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
82
83
$ validation1 ->expects ($ this ->any ())->method ("isValid " )->willReturn (true );
83
84
$ validation1 ->expects ($ this ->once ())->method ("getWarnings " )->willReturn ([]);
84
85
$ validation1 ->expects ($ this ->once ())->method ("getError " )->willReturn ($ error1 );
85
86
86
- $ validation2 = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
87
+ $ validation2 = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
87
88
$ validation2 ->expects ($ this ->any ())->method ("isValid " )->willReturn (false );
88
89
$ validation2 ->expects ($ this ->once ())->method ("getWarnings " )->willReturn ([]);
89
90
$ validation2 ->expects ($ this ->once ())->method ("getError " )->willReturn ($ error2 );
@@ -99,14 +100,14 @@ public function testBreakOutOfLoopWhenError()
99
100
100
101
$ expectedResult = new MultipleErrors ([$ error ]);
101
102
102
- $ lexer = $ this ->getMock ("Egulias \\EmailValidator \\EmailLexer " );
103
+ $ lexer = $ this ->getMockBuilder ("Egulias \\EmailValidator \\EmailLexer " )-> getMock ( );
103
104
104
- $ validation1 = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
105
+ $ validation1 = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
105
106
$ validation1 ->expects ($ this ->any ())->method ("isValid " )->willReturn (false );
106
107
$ validation1 ->expects ($ this ->once ())->method ("getWarnings " )->willReturn ([]);
107
108
$ validation1 ->expects ($ this ->once ())->method ("getError " )->willReturn ($ error );
108
109
109
- $ validation2 = $ this ->getMock ("Egulias \\EmailValidator \\Validation \\EmailValidation " );
110
+ $ validation2 = $ this ->getMockBuilder ("Egulias \\EmailValidator \\Validation \\EmailValidation " )-> getMock ( );
110
111
$ validation2 ->expects ($ this ->never ())->method ("isValid " );
111
112
$ validation2 ->expects ($ this ->never ())->method ("getWarnings " );
112
113
$ validation2 ->expects ($ this ->never ())->method ("getError " );
0 commit comments