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
380380 continue ;
381381 }
382382
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 ])) {
388385 // More lines in the one being added in
389- $ lines = array_filter (
386+ $ lines = \ array_filter (
390387 $ lines ,
391388 function ($ value , $ key ) use ($ ours ) {
392- return array_key_exists ($ key , $ ours );
389+ return \ array_key_exists ($ key , $ ours );
393390 },
394- ARRAY_FILTER_USE_BOTH
391+ \ ARRAY_FILTER_USE_BOTH
395392 );
396393 } else {
397394 // More lines in the one we currently have
398- $ this ->data [$ file ] = array_filter (
395+ $ this ->data [$ file ] = \ array_filter (
399396 $ this ->data [$ file ],
400397 function ($ value , $ key ) use ($ lines ) {
401- return array_key_exists ($ key , $ lines );
398+ return \ array_key_exists ($ key , $ lines );
402399 },
403- ARRAY_FILTER_USE_BOTH
400+ \ ARRAY_FILTER_USE_BOTH
404401 );
405402 }
406403 }
You can’t perform that action at this time.
0 commit comments