Merge pull request #4377 from yiisoft/patch-pear-textdiff-php-compat

Fix "reset() expects parameter 1 to be array" raised by Gii diff, issue #4226 alternative solution

CHANGELOG

@@ -4,6 +4,7 @@
 Version 1.1.25 under development
 --------------------------------
 
+- Bug #4226: Fix for Gii diff displaying "reset() expects parameter 1 to be array, integer given" (LeoZandvliet, marcovtwout)
 - Bug #4369: PHP 8.0 compatibility: Fix warning "Only the first byte will be assigned to the string offset" when generating code with Gii (marcovtwout)
 - Bug #4374: Fix for createUpdateCommand which did not accept just a table name when using MSSQL (c-schmitz)
 

framework/gii/components/Pear/Text/Diff/Engine/native.php

@@ -191,20 +191,15 @@ function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
  continue;
  }
  $matches = $ymatches[$line];
- reset($matches);
- foreach($matches as $match) {
- reset($match);
- $y = next($match);
+ while (($y = array_shift($matches)) !== null) {
  if (empty($this->in_seq[$y])) {
  $k = $this->_lcsPos($y);
  assert($k > 0);
  $ymids[$k] = $ymids[$k - 1];
  break;
  }
  }
- foreach($matches as $match) {
- reset($match);
- $y = next($match);
+ while (($y = array_shift($matches)) !== null) {
  if ($y > $this->seq[$k - 1]) {
  assert($y <= $this->seq[$k]);
  /* Optimization: this is a common case: next match is