Add changes from rector rule CombinedAssignRector

src/Collection/CollectionTrait.php

@@ -536,7 +536,7 @@ trait CollectionTrait
                 $offset++;
             }
 
-            $offset = $offset % $length;
+            $offset %= $length;
             $head = array_slice($result, $offset);
             $tail = array_slice($result, 0, $offset);
 

src/Database/Expression/AggregateExpression.php

@@ -235,7 +235,7 @@ class AggregateExpression extends FunctionExpression implements WindowInterface
     {
         $count = parent::count();
         if ($this->window !== null) {
-            $count = $count + 1;
+            $count += 1;
         }
 
         return $count;

src/Database/QueryCompiler.php

@@ -208,7 +208,7 @@ class QueryCompiler
         $parts = $this->_stringifyExpressions($parts, $binder);
         foreach ($parts as $k => $p) {
             if (!is_numeric($k)) {
-                $p = $p . ' AS ';
+                $p .= ' AS ';
                 if ($quoteIdentifiers) {
                     $p .= $driver->quoteIdentifier($k);
                 } else {

src/View/Helper/FormHelper.php

@@ -1919,7 +1919,7 @@ class FormHelper extends Helper
         $onClick = 'document.' . $formName . '.submit();';
         if ($confirmMessage) {
             $onClick = $this->_confirm($onClick, '');
-            $onClick = $onClick . 'event.returnValue = false; return false;';
+            $onClick .= 'event.returnValue = false; return false;';
             $onClick = $this->templater()->format('confirmJs', [
                 'confirmMessage' => h($confirmMessage),
                 'formName' => $formName,

tests/TestCase/ORM/Query/SelectQueryTest.php

@@ -2395,7 +2395,7 @@ class SelectQueryTest extends TestCase
                         })
                         ->formatResults(function ($authors) {
                             return $authors->map(function ($author) {
-                                $author->idCopy = $author->idCopy + 2;
+                                $author->idCopy += 2;
 
                                 return $author;
                             });
@@ -2431,7 +2431,7 @@ class SelectQueryTest extends TestCase
                 })
                 ->formatResults(function ($results) {
                     return $results->map(function ($result) {
-                        $result->idCopy = $result->idCopy + 2;
+                        $result->idCopy += 2;
 
                         return $result;
                     });