| 1 | <?php |
||
| 29 | abstract class PhpMergeBase implements PhpMergeInterface |
||
| 30 | { |
||
| 31 | |||
| 32 | /** |
||
| 33 | * Merge obvious cases when only one text changes.. |
||
| 34 | * |
||
| 35 | * @param string $base |
||
| 36 | * The original text. |
||
| 37 | * @param string $remote |
||
| 38 | * The first variant text. |
||
| 39 | * @param string $local |
||
| 40 | * The second variant text. |
||
| 41 | * |
||
| 42 | * @return string|null |
||
| 43 | * The merge result or null if the merge is not obvious. |
||
| 44 | */ |
||
| 45 | 21 | protected static function simpleMerge(string $base, string $remote, string $local) |
|
| 60 | |||
| 61 | /** |
||
| 62 | * Split it line-by-line. |
||
| 63 | * |
||
| 64 | * @param string $input |
||
| 65 | * |
||
| 66 | * @return array |
||
| 67 | */ |
||
| 68 | 12 | protected static function splitStringByLines(string $input): array |
|
| 72 | } |
||
| 73 |