File tree Expand file tree Collapse file tree 1 file changed +8
-11
lines changed Expand file tree Collapse file tree 1 file changed +8
-11
lines changed Original file line number Diff line number Diff line change @@ -380,27 +380,24 @@ public function merge(self $that): void
380
380
continue;
381
381
}
382
382
383
- if ((count($lines) > 0)
384
- && (count($this->data[$file]) > 0)
385
- && (count($lines) != count($this->data[$file]))
386
- ) {
387
- if (count($lines) > count($ours = $this->data[$file])) {
383
+ if ((\count($lines) > 0) && (\count($this->data[$file]) > 0) && (\count($lines) != \count($this->data[$file]))) {
384
+ if (\count($lines) > \count($ours = $this->data[$file])) {
388
385
// More lines in the one being added in
389
- $lines = array_filter(
386
+ $lines = \ array_filter(
390
387
$lines,
391
388
function ($value, $key) use ($ours) {
392
- return array_key_exists($key, $ours);
389
+ return \ array_key_exists($key, $ours);
393
390
},
394
- ARRAY_FILTER_USE_BOTH
391
+ \ ARRAY_FILTER_USE_BOTH
395
392
);
396
393
} else {
397
394
// More lines in the one we currently have
398
- $this->data[$file] = array_filter(
395
+ $this->data[$file] = \ array_filter(
399
396
$this->data[$file],
400
397
function ($value, $key) use ($lines) {
401
- return array_key_exists($key, $lines);
398
+ return \ array_key_exists($key, $lines);
402
399
},
403
- ARRAY_FILTER_USE_BOTH
400
+ \ ARRAY_FILTER_USE_BOTH
404
401
);
405
402
}
406
403
}
You can’t perform that action at this time.
0 commit comments