cycle / annotated

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.inc

Upper-Lower-Casing -1 removed lines

@@ -249,4 +249,3 @@
  * @link		http://pear.php.net/package/PHP_CodeSniffer
  */
 
-/** No docblock close tag. Must be last test without new line.
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc

Upper-Lower-Casing -6 removed lines

@@ -9,9 +9,3 @@
         $arr = array(
             'a' => 'a',
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.5.inc

Upper-Lower-Casing -1 removed lines

@@ -1,2 +1,1 @@
 <?php
-/** Why me?
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.5.inc

Upper-Lower-Casing -1 removed lines

@@ -1,2 +1,1 @@
 <?php
-/** Why me?

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.6.inc

Upper-Lower-Casing -1 removed lines

@@ -1,2 +1,1 @@
 <?php
-/** Why me?

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.4.inc

Upper-Lower-Casing -1 removed lines

@@ -1,2 +1,1 @@
 <?php
-/** Why me?
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.6.inc

Upper-Lower-Casing +1 added lines, -10 removed lines

@@ -22,13 +22,4 @@
  * merge conflict boundaries will still be detected correctly.
  */
 
-$string =
-		<<<"EOD"
-		Merge conflicts in PHP 7.3 indented heredocs
-<<<<<<< HEAD
-		can be problematic.
-=======
-		should also be detected.
->>>>>>> ref/heads/other-branchname
-		And now they are.
-		EOD;
+$string
\ No newline at end of file

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

Upper-Lower-Casing +1 added lines, -19 removed lines

@@ -22,22 +22,4 @@
 <<<<<<< 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>
+$a
\ No newline at end of file

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc

Upper-Lower-Casing -5 removed lines

@@ -24,8 +24,3 @@
 
 // Comment
 <<<<<<< HEAD
-// Second comment line. NOTE: The above opener breaks the tokenizer.
-=======
-// New second comment line
->>>>>>> master
-// Third comment line