Merge branch 'ACP2E-3725'

# Conflicts:
#	patches-info.json
#	src/UpdateInfoJson.php

Author: viktym

patches-info.json

@@ -132,6 +132,7 @@ private function getSourceData(array $config, string $origin): array
     {
         $result = [];
         foreach ($config as $patchId => $patchGeneralConfig) {
+            $replacedPatchReleases = [];
             $data = ['id' => $patchId];
             $data += $this->getPatchConstraintsData($patchGeneralConfig['packages']);
 
@@ -145,11 +146,18 @@ private function getSourceData(array $config, string $origin): array
 
             $replacedWith = [];
             foreach ($data['replacedWith'] ?? [] as $replacedPatchId => $replacedPatchConstraints) {
+                $replacedPatchReleases = array_unique(array_merge(
+                    $replacedPatchReleases ?? [],
+                    $this->getCompatibleReleases($replacedPatchConstraints)
+                ));
                 $replacedWith[] = $replacedPatchId . ' for ' .
                     implode(', ', $this->getCompatibleReleases($replacedPatchConstraints));
             }
             if (!empty($replacedWith)) {
-                $data['replacedWith'] = implode('; ', $replacedWith);
+                $currentPatchReleases = array_diff($data['releases'], $replacedPatchReleases);
+                $data['replacedWith'] = $currentPatchReleases ?
+                    $patchId . ' for ' . implode(', ', $currentPatchReleases) . '. Use ' : '';
+                $data['replacedWith'] .= implode('; ', $replacedWith);
             }
 
             $data['description'] = $patchGeneralConfig['title'];