PHP Classes

File: vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.3.inc

Recommend this page to a friend!
  Classes of milenmk   Simple PHP Password Manager   vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.3.inc   Download  
File: vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.3.inc
Role: Auxiliary data
Content type: text/plain
Description: Auxiliary data
Class: Simple PHP Password Manager
Application to store and retrieve user password
Author: By
Last change:
Date: 1 year ago
Size: 1,102 bytes
 

Contents

Class file image Download
<!-- Test detecting merge conflicts in inline HTML. --> <div class="abc"> <<<<<<< HEAD <p id="test-this">Testing a merge conflict.</p> ======= <p id="test-that">Another text string.</p> >>>>>>> ref/heads/feature-branch </div> <!-- Test detecting merge conflicts in inline HTML. --> <div class="abc"> <<<<<<< HEAD <p id="test-this"><?php echo 'Testing a merge conflict.'; ?></p> ======= <p id="test-that"><?php echo 'Another text string.'; ?></p> >>>>>>> ref/heads/feature-branch </div> <?php // Break the tokenizer. <<<<<<< HEAD $a = 1; ======= $a = 2; >>>>>>> master /* * The above tests are based on "normal" tokens. * The below test checks that once the tokenizer breaks down because of * unexpected merge conflict boundaries - i.e. after the first merge conflict * opener in non-comment, non-heredoc/nowdoc, non-inline HTML code -, subsequent * merge conflict boundaries will still be detected correctly. */ ?> <div class="abc"> <<<<<<< HEAD <p id="test-this">Testing a merge conflict.</p> ======= <p id="test-that">Another text string.</p> >>>>>>> ref/heads/feature-branch </div>