Commit 46fde8d
committed
Merge branch '7.4' into 8.0
* 7.4:
[Validator] Sync validators.pt.xlf
Minor: Review and finalize Latvian translations for validators
streamline ini settings in phpunit.xml.dist files
stop using with*() without expects()
stop using with*() without expects()
TypeContextFactory::collectTemplates now also works with @phpstan-template and @psalm-template1 file changed
Lines changed: 2 additions & 4 deletions
Lines changed: 2 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
126 | | - | |
| 125 | + | |
127 | 126 | | |
128 | 127 | | |
129 | 128 | | |
| |||
167 | 166 | | |
168 | 167 | | |
169 | 168 | | |
170 | | - | |
171 | | - | |
| 169 | + | |
172 | 170 | | |
173 | 171 | | |
174 | 172 | | |
| |||
0 commit comments