Commit 8720fcb
committed
Merge branch '7.4' into 8.0
* 7.4:
do not use PHPUnit mock objects without configured expectations
do not use PHPUnit mock objects without configured expectations
do not use PHPUnit mock objects without configured expectations
fix CS
do not use PHPUnit mock objects without configured expectations
[Scheduler] Fix array to string conversion in `#[AsCronTask]` arguments
do not use PHPUnit mock objects without configured expectations
do not use PHPUnit mock objects without configured expectations
do not use PHPUnit mock objects without configured expectations
do not use PHPUnit mock objects without configured expectations
fix merge
do not use PHPUnit mock objects without configured expectations1 file changed
Lines changed: 4 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| |||
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
40 | | - | |
| 39 | + | |
41 | 40 | | |
42 | 41 | | |
43 | 42 | | |
| |||
52 | 51 | | |
53 | 52 | | |
54 | 53 | | |
55 | | - | |
| 54 | + | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
71 | 70 | | |
72 | 71 | | |
73 | 72 | | |
74 | | - | |
| 73 | + | |
75 | 74 | | |
76 | 75 | | |
77 | 76 | | |
| |||
81 | 80 | | |
82 | 81 | | |
83 | 82 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | 83 | | |
90 | 84 | | |
91 | 85 | | |
| |||
99 | 93 | | |
100 | 94 | | |
101 | 95 | | |
102 | | - | |
| 96 | + | |
103 | 97 | | |
104 | 98 | | |
105 | 99 | | |
| |||
0 commit comments