gravityview / GravityView

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

Doc Comments +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.4.inc

Doc Comments +1 added lines, -5 removed lines

@@ -64,8 +64,4 @@
 <<<<<<< HEAD
 can be problematic.
 EOD;
-$a = 1;
-=======
-should also be detected.
-EOT;
->>>>>>> ref/heads/other-branchname
+$a
\ No newline at end of file

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

Doc Comments +1 added lines, -10 removed lines

@@ -22,13 +22,4 @@
  * merge conflict boundaries will still be detected correctly.
  */
 
-$string =
-<<<'EOD'
-can be problematic.
-<<<<<<< HEAD
-were previously not detected.
-=======
-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.6.inc

Doc Comments +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/MySource/Sniffs/Channels/IncludeOwnSystemSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -82,7 +82,7 @@ 
      * @param int                         $stackPtr  The position in the tokens array of the
      *                                               potentially included class.
      *
-     * @return string
+     * @return boolean
      */
     protected function getIncludedClassFromToken(
         $phpcsFile,

vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.inc

Doc Comments +3 added lines

@@ -35,6 +35,9 @@
 
 abstract class AbstractEditingScreenModeWidgetActions extends AbstractEditingModeWidgetActions {
 
+    /**
+     * @param string $systemName
+     */
     public static function getScreens($systemName)
     {
 

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc

Doc Comments +2 added lines, -3 removed lines

@@ -9,10 +9,10 @@ 
      *
      * @param int $stackPtr   The position in @ @unknown the stack of the token
      *                        that opened the scope
-     * @param int $detph    How many scope levels down we are.
+     * @param int $depth    How many scope levels down we are.
      * @param int    $index    The index
      * @return
-     * @throws
+     integer @throws
      */
     private function _functionCall($stackPtr, $depth=1, $index)
     {
@@ -121,7 +121,6 @@ 
      *
      * @return
      * @param   int   $threeSpaces
-     * @param int     $superfluous
      * @param missing
      * @param
      */

vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -36,7 +36,7 @@ 
      * @param int                         $stackPtr  The position of the current token in
      *                                               the token stack.
      *
-     * @return void
+     * @return integer
      */
     public function process(File $phpcsFile, $stackPtr)
     {

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * @param int                         $stackPtr  The position of the current token in the
      *                                               stack passed in $tokens.
      *
-     * @return void
+     * @return null|integer
      */
     public function process(File $phpcsFile, $stackPtr)
     {