php merge

php 合并

介绍

在处理文本修订时，有时会面临这样的问题：同一原始文本有多个修订。我们不想选择一个并放弃另一个，而是希望合并两个修订。

Git 已经做得很好了。在 php 应用程序中，我们需要一个具有相同功能的简单工具。 xdiff PECL 扩展具有 xdiff_string_merge3 函数。但xdiff_string_merge3行为方式与 git 不同，并且 xdiff 可能在您的系统上不可用。

PhpMerge 是一个解决这个问题的小型库。有两个类： PhpMergePhpMerge和PhpMergeGitMerge实现了PhpMergePhpMergeInterface ，它只有一个merge方法。

PhpMerge使用SebastianBergmannDiffDiffer获取不同版本之间的差异并从中计算合并的文本。 GitMerge使用SymplifyGitWrapperGitWrapper ，将文本写入临时文件并使用命令行 git 合并文本。

用法

简单的例子：

 use PhpMerge  PhpMerge ;

// Create a merger instance.
$ merger = new PhpMerge ();

// Get the texts to merge.
$ original = <<<'EOD'
unchanged
replaced
unchanged
normal
unchanged
unchanged
removed

EOD;

$ version1 = <<<'EOD'
added
unchanged
replacement
unchanged
normal
unchanged
unchanged

EOD;

$ version2 = <<<'EOD'
unchanged
replaced
unchanged
normal??
unchanged
unchanged

EOD;

$ expected = <<<'EOD'
added
unchanged
replacement
unchanged
normal??
unchanged
unchanged

EOD;

$ result = $ merger -> merge ( $ original , $ version1 , $ version2 );
// $result === $expected;

合并冲突时：

 // Continuing from before with:
use Phpmerge  MergeException ;
use PhpMerge  MergeConflict ;


$ conflicting = <<<'EOD'
unchanged
replaced
unchanged
normal!!
unchanged
unchanged

EOD;

try {
    $ merger -> merge ( $ original , $ version2 , $ conflicting );
} catch ( MergeException $ exception ) {
    /** @var MergeConflict[] $conflicts */
    $ conflicts = $ exception -> getConflicts ();

    $ original_lines = $ conflicts [ 0 ]-> getBase ();
    // $original_lines === ["normaln"];
    
    $ version2_lines = $ conflicts [ 0 ]-> getRemote ();
    // $version2_lines === ["normal??n"];
    
    $ conflicting_lines = $ conflicts [ 0 ]-> getLocal ();
    // $conflicting_lines === ["normal!!n"];
    
    $ line_numer_of_conflict = $ conflicts [ 0 ]-> getBaseLine ();
    // $line_numer_of_conflict === 3; // Count starts with 0.
    
    // It is also possible to get the merged version using the first version
    // to resolve conflicts.
    $ merged = $ exception -> getMerged ();
    // $merged === $version2;
    // In this case, but in general there could be non-conflicting changes.
    
    $ line_in_merged = $ conflicts [ 0 ]-> getMergedLine ();
    // $line_in_merged === 3; // Count starts with 0.
}

使用命令行git执行合并：

 use PhpMerge  GitMerge ;

$ merger = new GitMerge ();

// Use as the previous example. 

安装

PhpMerge 可以与 Composer 一起安装，只需将库添加为 Composer.json 文件的依赖项即可。

{
    "require" : {
        "bircher/php-merge" : " ~4.0 "
    }
}

要将命令行 git 与GitMerge结合使用：

{
    "require" : {
        "bircher/php-merge" : " ~4.0 " ,
        "symplify/git-wrapper" : " ^9.1|^10.0 "
    }
}

请参阅 Composer 的文档以获取安装和使用说明。

差值~3.0

在 ~4.0 版本中，我们从cpliakas/git-wrapper切换到symplify/git-wrapper ，因为前者已被弃用。此更新意味着仅使用PhpMergePhpMerge时没有任何变化。