gravityview / GravityView

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

Doc Comments +1 added lines, -2 removed lines

@@ -57,5 +57,4 @@
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

Indentation +4 added lines, -5 removed lines

@@ -20,9 +20,9 @@ 
  */
 
 function test()
-    {
-        $arr = array(
-            'a' => 'a'
+	{
+		$arr = array(
+			'a' => 'a'
 <<<<<<< HEAD
             'b' => 'b'
 =======
@@ -57,5 +57,4 @@ 
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

Switch Indentation +1 added lines, -2 removed lines

@@ -57,5 +57,4 @@
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

Spacing +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-var_dump(1 << -1);
-var_dump(1 >> -1);
+var_dump( 1 << -1 );
+var_dump( 1 >> -1 );
 var_dump(
 1
 <<
@@ -23,7 +23,7 @@ 
     {
         $arr = array(
             'a' => 'a'
-<<<<<<< HEAD
+<< << <<< HEAD
             'b' => 'b'
 =======
             'c' => 'c'
@@ -57,5 +57,4 @@ 
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
  * <<<<<<< HEAD
  */
 
-function test()
-    {
+function test() {
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
@@ -57,5 +56,4 @@ 
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

Upper-Lower-Casing +2 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 $string =
 <<<EOD
 This is a heredoc.
-EOD;
+eod;
 
 /**
  * This is not a merge conflict, but a comment showing what
@@ -57,5 +57,4 @@ 
 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
 <<<<<<< HEAD
-$a = 1;
-=======
+$a
\ No newline at end of file

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

Doc Comments -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

Indentation -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

Switch Indentation -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

Spacing +2 added lines, -7 removed lines

@@ -14,7 +14,7 @@ 
 <<<<<<< HEAD
  * @var string $bar
  */
-public function foo($bar){ }
+public function foo( $bar ) { }
 
 /*
 =======
@@ -23,9 +23,4 @@ 
 */
 
 // Comment
-<<<<<<< HEAD
-// Second comment line. NOTE: The above opener breaks the tokenizer.
-=======
-// New second comment line
->>>>>>> master
-// Third comment line
+<< << <<< HEAD

Braces -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

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

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

Indentation +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

Switch Indentation +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

Spacing +2 added lines, -20 removed lines

@@ -19,25 +19,7 @@
 <?php
 
 // Break the tokenizer.
-<<<<<<< HEAD
+<< << <<< 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

Braces +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

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.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

Indentation +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

Switch Indentation +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

Spacing +3 added lines, -7 removed lines

@@ -22,11 +22,11 @@ 
 =======
 should also be detected.
 EOT;
->>>>>>> ref/heads/other-branchname
+>> >> >> > ref / heads / other - branchname
 
 // Merge conflict starter outside with a closer inside of the heredoc.
 // This breaks the tokenizer.
-<<<<<<< HEAD
+<< << <<< HEAD
 $string =
 <<<EOT
 Merge conflicts in heredocs
@@ -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

Braces +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

Upper-Lower-Casing +3 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 should also be detected.
 >>>>>>> ref/heads/other-branchname
 And now they are.
-EOD;
+eod;
 
 // Heredoc with a merge conflict starter, the closer is outside the heredoc.
 $string =
@@ -21,7 +21,7 @@ 
 $a = 1;
 =======
 should also be detected.
-EOT;
+eot;
 >>>>>>> ref/heads/other-branchname
 
 // Merge conflict starter outside with a closer inside of the heredoc.
@@ -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

Indentation +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

Switch Indentation +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

Spacing +2 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
 EOD;
 
 // Break the tokenizer.
-<<<<<<< HEAD
+<< << <<< HEAD
 
 /*
  * The above tests are based on "normal" tokens.
@@ -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

Braces +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

Upper-Lower-Casing +2 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
 should also be detected.
 >>>>>>> ref/heads/other-branchname
 And now they are.
-EOD;
+eod;
 
 // Break the tokenizer.
 <<<<<<< HEAD
@@ -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

Indentation +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

Switch Indentation +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

Spacing +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

Braces +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

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/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,

Indentation +77 added lines, -77 removed lines

@@ -16,83 +16,83 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_DOUBLE_COLON];
-
-    }//end register()
-
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $fileName = $phpcsFile->getFilename();
-        $matches  = [];
-        if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {
-            // Not an actions file.
-            return;
-        }
-
-        $ownClass = $matches[2];
-        $tokens   = $phpcsFile->getTokens();
-
-        $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
-        $typeName = trim($tokens[$typeName]['content'], " '");
-        switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
-        case 'includesystem' :
-            $included = strtolower($typeName);
-            break;
-        case 'includeasset' :
-            $included = strtolower($typeName).'assettype';
-            break;
-        case 'includewidget' :
-            $included = strtolower($typeName).'widgettype';
-            break;
-        default:
-            return;
-        }
-
-        if ($included === strtolower($ownClass)) {
-            $error = "You do not need to include \"%s\" from within the system's own actions file";
-            $data  = [$ownClass];
-            $phpcsFile->addError($error, $stackPtr, 'NotRequired', $data);
-        }
-
-    }//end process()
-
-
-    /**
-     * Determines the included class name from given token.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param array                       $tokens    The array of file tokens.
-     * @param int                         $stackPtr  The position in the tokens array of the
-     *                                               potentially included class.
-     *
-     * @return string
-     */
-    protected function getIncludedClassFromToken(
-        $phpcsFile,
-        array $tokens,
-        $stackPtr
-    ) {
-
-        return false;
-
-    }//end getIncludedClassFromToken()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_DOUBLE_COLON];
+
+	}//end register()
+
+
+	/**
+	 * Processes this sniff, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in
+	 *                                               the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$fileName = $phpcsFile->getFilename();
+		$matches  = [];
+		if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {
+			// Not an actions file.
+			return;
+		}
+
+		$ownClass = $matches[2];
+		$tokens   = $phpcsFile->getTokens();
+
+		$typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
+		$typeName = trim($tokens[$typeName]['content'], " '");
+		switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
+		case 'includesystem' :
+			$included = strtolower($typeName);
+			break;
+		case 'includeasset' :
+			$included = strtolower($typeName).'assettype';
+			break;
+		case 'includewidget' :
+			$included = strtolower($typeName).'widgettype';
+			break;
+		default:
+			return;
+		}
+
+		if ($included === strtolower($ownClass)) {
+			$error = "You do not need to include \"%s\" from within the system's own actions file";
+			$data  = [$ownClass];
+			$phpcsFile->addError($error, $stackPtr, 'NotRequired', $data);
+		}
+
+	}//end process()
+
+
+	/**
+	 * Determines the included class name from given token.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+	 * @param array                       $tokens    The array of file tokens.
+	 * @param int                         $stackPtr  The position in the tokens array of the
+	 *                                               potentially included class.
+	 *
+	 * @return string
+	 */
+	protected function getIncludedClassFromToken(
+		$phpcsFile,
+		array $tokens,
+		$stackPtr
+	) {
+
+		return false;
+
+	}//end getIncludedClassFromToken()
 
 
 }//end class

Switch Indentation +11 added lines, -11 removed lines

@@ -52,17 +52,17 @@
         $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
         $typeName = trim($tokens[$typeName]['content'], " '");
         switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
-        case 'includesystem' :
-            $included = strtolower($typeName);
-            break;
-        case 'includeasset' :
-            $included = strtolower($typeName).'assettype';
-            break;
-        case 'includewidget' :
-            $included = strtolower($typeName).'widgettype';
-            break;
-        default:
-            return;
+        	case 'includesystem' :
+            	$included = strtolower($typeName);
+            	break;
+        	case 'includeasset' :
+            	$included = strtolower($typeName).'assettype';
+            	break;
+        	case 'includewidget' :
+            	$included = strtolower($typeName).'widgettype';
+            	break;
+        	default:
+            	return;
         }
 
         if ($included === strtolower($ownClass)) {

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
      */
     public function register()
     {
-        return [T_DOUBLE_COLON];
+        return [ T_DOUBLE_COLON ];
 
     }//end register()
 
@@ -37,38 +37,38 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $fileName = $phpcsFile->getFilename();
-        $matches  = [];
-        if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {
+        $matches  = [ ];
+        if ( preg_match( '|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches ) === 0 ) {
             // Not an actions file.
             return;
         }
 
-        $ownClass = $matches[2];
+        $ownClass = $matches[ 2 ];
         $tokens   = $phpcsFile->getTokens();
 
-        $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
-        $typeName = trim($tokens[$typeName]['content'], " '");
-        switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
+        $typeName = $phpcsFile->findNext( T_CONSTANT_ENCAPSED_STRING, ( $stackPtr + 2 ), null, false, true );
+        $typeName = trim( $tokens[ $typeName ][ 'content' ], " '" );
+        switch ( strtolower( $tokens[ ( $stackPtr + 1 ) ][ 'content' ] ) ) {
         case 'includesystem' :
-            $included = strtolower($typeName);
+            $included = strtolower( $typeName );
             break;
         case 'includeasset' :
-            $included = strtolower($typeName).'assettype';
+            $included = strtolower( $typeName ) . 'assettype';
             break;
         case 'includewidget' :
-            $included = strtolower($typeName).'widgettype';
+            $included = strtolower( $typeName ) . 'widgettype';
             break;
         default:
             return;
         }
 
-        if ($included === strtolower($ownClass)) {
+        if ( $included === strtolower( $ownClass ) ) {
             $error = "You do not need to include \"%s\" from within the system's own actions file";
-            $data  = [$ownClass];
-            $phpcsFile->addError($error, $stackPtr, 'NotRequired', $data);
+            $data  = [ $ownClass ];
+            $phpcsFile->addError( $error, $stackPtr, 'NotRequired', $data );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
-class IncludeOwnSystemSniff implements Sniff
-{
+class IncludeOwnSystemSniff implements Sniff {
 
 
     /**
@@ -21,8 +20,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return [T_DOUBLE_COLON];
 
     }//end register()
@@ -37,8 +35,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $fileName = $phpcsFile->getFilename();
         $matches  = [];
         if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {

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)
     {
 

Indentation +37 added lines, -37 removed lines

@@ -2,50 +2,50 @@
 class SomethingActions
 {
 
-    private static function _x()
-    {
-    }
-
-
-    public static function y()
-    {
-        self::z();
-        static::z();
-        SomethingActions::z();
-        static::_x();
-        self::a();
-        static::a();
-    }
-
-
-    public static function z()
-    {
-    }
-
-    protected static function a()
-    {
-        self::a(); // recursion, yay!
-        self::z();
-        static::y();
-        self::b();
-        echo self::$_myVar;
-        echo static::$yourVar;
-    }
+	private static function _x()
+	{
+	}
+
+
+	public static function y()
+	{
+		self::z();
+		static::z();
+		SomethingActions::z();
+		static::_x();
+		self::a();
+		static::a();
+	}
+
+
+	public static function z()
+	{
+	}
+
+	protected static function a()
+	{
+		self::a(); // recursion, yay!
+		self::z();
+		static::y();
+		self::b();
+		echo self::$_myVar;
+		echo static::$yourVar;
+	}
 }
 
 abstract class AbstractEditingScreenModeWidgetActions extends AbstractEditingModeWidgetActions {
 
-    public static function getScreens($systemName)
-    {
+	public static function getScreens($systemName)
+	{
 
-    }//end getScreens()
+	}//end getScreens()
 
-    public static function setHelpScreenTitle()
-    {
-        // This is allowed because we are in an abstract class.
-        $screens = self::getScreens('');
+	public static function setHelpScreenTitle()
+	{
+		// This is allowed because we are in an abstract class.
+		$screens = self::getScreens('');
 
-    }//end setHelpScreenTitle()
+	}//end setHelpScreenTitle()
 
 }//end class
 ?>

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 
 abstract class AbstractEditingScreenModeWidgetActions extends AbstractEditingModeWidgetActions {
 
-    public static function getScreens($systemName)
+    public static function getScreens( $systemName )
     {
 
     }//end getScreens()
@@ -43,7 +43,7 @@ 
     public static function setHelpScreenTitle()
     {
         // This is allowed because we are in an abstract class.
-        $screens = self::getScreens('');
+        $screens = self::getScreens( '' );
 
     }//end setHelpScreenTitle()
 

Braces +7 added lines, -14 removed lines

@@ -1,14 +1,11 @@ 
 <?php
-class SomethingActions
-{
+class SomethingActions {
 
-    private static function _x()
-    {
+    private static function _x() {
     }
 
 
-    public static function y()
-    {
+    public static function y() {
         self::z();
         static::z();
         SomethingActions::z();
@@ -18,12 +15,10 @@ 
     }
 
 
-    public static function z()
-    {
+    public static function z() {
     }
 
-    protected static function a()
-    {
+    protected static function a() {
         self::a(); // recursion, yay!
         self::z();
         static::y();
@@ -35,13 +30,11 @@ 
 
 abstract class AbstractEditingScreenModeWidgetActions extends AbstractEditingModeWidgetActions {
 
-    public static function getScreens($systemName)
-    {
+    public static function getScreens($systemName) {
 
     }//end getScreens()
 
-    public static function setHelpScreenTitle()
-    {
+    public static function setHelpScreenTitle() {
         // This is allowed because we are in an abstract class.
         $screens = self::getScreens('');
 

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
      */

Indentation +161 added lines, -161 removed lines

@@ -2,148 +2,148 @@ 
 class PHP_CodeSniffer_File
 {
 
-    /**
-     * A simple function comment.
-     *
-     * long desc here
-     *
-     * @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    $index    The index
-     * @return
-     * @throws
-     */
-    private function _functionCall($stackPtr, $depth=1, $index)
-    {
-        return $stackPtr;
-
-    }//end _functionCall()
-
-    //
-    // Sample function comment
-    //
-    //
-    //
-    public function invalidCommentStyle()
-    {
-
-    }//end invalidCommentStyle()
-
-
-    /**
-     *
-     *
-     * A simple function comment
-     *
-     *
-     * Long description with extra blank line before and after
-     *
-     *
-     * @return void
-     */
-    public function extraDescriptionNewlines()
-    {
-
-    }//end extraDescriptionNewlines()
-
-
-    /**
-     * A simple function comment
-     * @return void
-     */
-    public function missingNewlinesBeforeTags()
-    {
-
-    }//end missingNewlinesBeforeTags()
-
-
-    /**
-     * Access tag should not be treated as a long description
-     *
-     * @access public
-     * @return void
-     */
-    public function accessTag()
-    {
-
-    }//end accessTag()
-
-    /**
-     * Constructor
-     *
-     * No return tag
-     */
-    function PHP_CodeSniffer_File()
-    {
-        return;
-    }
-
-
-    /**
-     * Destructor
-     *
-     * No return tag too
-     */
-    function _PHP_CodeSniffer_File()
-    {
-        return;
-    }
-
-
-    /**
-     * Destructor PHP5
-     */
-    function __destruct()
-    {
-        return;
-    }
-
-
-    function missingComment()
-    {
-        return;
-    }
-
-
-    /**
-     * no return tag
-     *
-     */
-    public function noReturn($one)
-    {
-
-    }//end noReturn()
-
-
-    /**
-     * Param not immediate
-     *
-     * @return
-     * @param   int   $threeSpaces
-     * @param int     $superfluous
-     * @param missing
-     * @param
-     */
-    public function missingDescription($threeSpaces)
-    {
-
-    }//end missingDescription()
-
-
-    /**
-     * Param not immediate
-     *
-     * @param int      $one   comment
-     * @param int      $two   comment
-     * @param string   $three comment
-     *
-     * @return void
-     */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
-    {
-
-    }//end oneSpaceAfterLongestVar()
+	/**
+	 * A simple function comment.
+	 *
+	 * long desc here
+	 *
+	 * @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    $index    The index
+	 * @return
+	 * @throws
+	 */
+	private function _functionCall($stackPtr, $depth=1, $index)
+	{
+		return $stackPtr;
+
+	}//end _functionCall()
+
+	//
+	// Sample function comment
+	//
+	//
+	//
+	public function invalidCommentStyle()
+	{
+
+	}//end invalidCommentStyle()
+
+
+	/**
+	 *
+	 *
+	 * A simple function comment
+	 *
+	 *
+	 * Long description with extra blank line before and after
+	 *
+	 *
+	 * @return void
+	 */
+	public function extraDescriptionNewlines()
+	{
+
+	}//end extraDescriptionNewlines()
+
+
+	/**
+	 * A simple function comment
+	 * @return void
+	 */
+	public function missingNewlinesBeforeTags()
+	{
+
+	}//end missingNewlinesBeforeTags()
+
+
+	/**
+	 * Access tag should not be treated as a long description
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function accessTag()
+	{
+
+	}//end accessTag()
+
+	/**
+	 * Constructor
+	 *
+	 * No return tag
+	 */
+	function PHP_CodeSniffer_File()
+	{
+		return;
+	}
+
+
+	/**
+	 * Destructor
+	 *
+	 * No return tag too
+	 */
+	function _PHP_CodeSniffer_File()
+	{
+		return;
+	}
+
+
+	/**
+	 * Destructor PHP5
+	 */
+	function __destruct()
+	{
+		return;
+	}
+
+
+	function missingComment()
+	{
+		return;
+	}
+
+
+	/**
+	 * no return tag
+	 *
+	 */
+	public function noReturn($one)
+	{
+
+	}//end noReturn()
+
+
+	/**
+	 * Param not immediate
+	 *
+	 * @return
+	 * @param   int   $threeSpaces
+	 * @param int     $superfluous
+	 * @param missing
+	 * @param
+	 */
+	public function missingDescription($threeSpaces)
+	{
+
+	}//end missingDescription()
+
+
+	/**
+	 * Param not immediate
+	 *
+	 * @param int      $one   comment
+	 * @param int      $two   comment
+	 * @param string   $three comment
+	 *
+	 * @return void
+	 */
+	public function oneSpaceAfterLongestVar($one, $two, $three)
+	{
+
+	}//end oneSpaceAfterLongestVar()
 
 
 }//end class
@@ -159,19 +159,19 @@ 
  */
 function functionOutsideClass(&$str, &$foo)
 {
-    return;
+	return;
 }//end functionOutsideClass()
 
 function missingCommentOutsideClass()
 {
-    return;
+	return;
 }//end missingCommentOutsideClass()
 
 
 ?><?php
 function tagBeforeComment()
 {
-    return;
+	return;
 }//end tagBeforeComment()
 
 
@@ -244,12 +244,12 @@ 
 function myFunction() {}
 
 abstract class MyClass {
-    /**
-     * An abstract function.
-     *
-     * @return string[]
-     */
-    abstract protected function myFunction();
+	/**
+	 * An abstract function.
+	 *
+	 * @return string[]
+	 */
+	abstract protected function myFunction();
 }
 
 /**
@@ -271,18 +271,18 @@ 
  *
  */
 function _() {
-    return $foo;
+	return $foo;
 }
 
 class Baz {
-    /**
-     * The PHP5 constructor
-     *
-     * No return tag
-     */
-    public function __construct() {
-
-    }
+	/**
+	 * The PHP5 constructor
+	 *
+	 * No return tag
+	 */
+	public function __construct() {
+
+	}
 }
 
 /**
@@ -295,7 +295,7 @@ 
  * @return void
  */
 function completeStep($status, array $array = [Class1::class, 'test'], $note = '') {
-    echo 'foo';
+	echo 'foo';
 }
 
 /**

Spacing +15 added lines, -15 removed lines

@@ -14,7 +14,7 @@ 
      * @return
      * @throws
      */
-    private function _functionCall($stackPtr, $depth=1, $index)
+    private function _functionCall( $stackPtr, $depth = 1, $index )
     {
         return $stackPtr;
 
@@ -110,7 +110,7 @@ 
      * no return tag
      *
      */
-    public function noReturn($one)
+    public function noReturn( $one )
     {
 
     }//end noReturn()
@@ -125,7 +125,7 @@ 
      * @param missing
      * @param
      */
-    public function missingDescription($threeSpaces)
+    public function missingDescription( $threeSpaces )
     {
 
     }//end missingDescription()
@@ -140,7 +140,7 @@ 
      *
      * @return void
      */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
+    public function oneSpaceAfterLongestVar( $one, $two, $three )
     {
 
     }//end oneSpaceAfterLongestVar()
@@ -157,7 +157,7 @@ 
  *
  * @return void
  */
-function functionOutsideClass(&$str, &$foo)
+function functionOutsideClass( &$str, &$foo )
 {
     return;
 }//end functionOutsideClass()
@@ -195,7 +195,7 @@ 
  * @return void
  * @fine  Unknown tag
  */
-function missingTwoParamComment($one, $two, $three)
+function missingTwoParamComment( $one, $two, $three )
 {
 
 }//end missingTwoParamComment()
@@ -217,7 +217,7 @@ 
  * @access public
  * @return bool
  */
-function myFunction($arg1) {}
+function myFunction( $arg1 ) {}
 
 
 /**
@@ -231,7 +231,7 @@ 
 
 echo $blah;
 
-function myFunction($arg1) {}
+function myFunction( $arg1 ) {}
 
 /**
  * Test function.
@@ -261,7 +261,7 @@ 
  *
  * @return void
  */
-function foo(&$tokens, $tokenizer, $eolChar)
+function foo( &$tokens, $tokenizer, $eolChar )
 {
 
 }//end foo()
@@ -294,7 +294,7 @@ 
  *
  * @return void
  */
-function completeStep($status, array $array = [Class1::class, 'test'], $note = '') {
+function completeStep( $status, array $array = [ Class1::class, 'test' ], $note = '' ) {
     echo 'foo';
 }
 
@@ -306,7 +306,7 @@ 
  *
  * @return void
  */
-function myFunction(string $name1, string ...$name2) {
+function myFunction( string $name1, string ...$name2 ) {
 }
 
 
@@ -318,7 +318,7 @@ 
  *
  * @return void
  */
-function myFunction(string $name1, string ...$name2) {
+function myFunction( string $name1, string ...$name2 ) {
 }
 
 /**
@@ -333,7 +333,7 @@ 
  *   Return value
  *
  */
-function foo($bar) {
+function foo( $bar ) {
 }
 
 /**
@@ -348,7 +348,7 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
+function process( File $phpcsFile, $stackPtr )
 {
 
 }//end process()
@@ -366,7 +366,7 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
+function process( File $phpcsFile, $stackPtr )
 {
 
 }//end process()

Braces +22 added lines, -44 removed lines

@@ -1,6 +1,5 @@ 
 <?php
-class PHP_CodeSniffer_File
-{
+class PHP_CodeSniffer_File {
 
     /**
      * A simple function comment.
@@ -14,8 +13,7 @@ 
      * @return
      * @throws
      */
-    private function _functionCall($stackPtr, $depth=1, $index)
-    {
+    private function _functionCall($stackPtr, $depth=1, $index) {
         return $stackPtr;
 
     }//end _functionCall()
@@ -25,8 +23,7 @@ 
     //
     //
     //
-    public function invalidCommentStyle()
-    {
+    public function invalidCommentStyle() {
 
     }//end invalidCommentStyle()
 
@@ -42,8 +39,7 @@ 
      *
      * @return void
      */
-    public function extraDescriptionNewlines()
-    {
+    public function extraDescriptionNewlines() {
 
     }//end extraDescriptionNewlines()
 
@@ -52,8 +48,7 @@ 
      * A simple function comment
      * @return void
      */
-    public function missingNewlinesBeforeTags()
-    {
+    public function missingNewlinesBeforeTags() {
 
     }//end missingNewlinesBeforeTags()
 
@@ -64,8 +59,7 @@ 
      * @access public
      * @return void
      */
-    public function accessTag()
-    {
+    public function accessTag() {
 
     }//end accessTag()
 
@@ -74,8 +68,7 @@ 
      *
      * No return tag
      */
-    function PHP_CodeSniffer_File()
-    {
+    function PHP_CodeSniffer_File() {
         return;
     }
 
@@ -85,8 +78,7 @@ 
      *
      * No return tag too
      */
-    function _PHP_CodeSniffer_File()
-    {
+    function _PHP_CodeSniffer_File() {
         return;
     }
 
@@ -94,14 +86,12 @@ 
     /**
      * Destructor PHP5
      */
-    function __destruct()
-    {
+    function __destruct() {
         return;
     }
 
 
-    function missingComment()
-    {
+    function missingComment() {
         return;
     }
 
@@ -110,8 +100,7 @@ 
      * no return tag
      *
      */
-    public function noReturn($one)
-    {
+    public function noReturn($one) {
 
     }//end noReturn()
 
@@ -125,8 +114,7 @@ 
      * @param missing
      * @param
      */
-    public function missingDescription($threeSpaces)
-    {
+    public function missingDescription($threeSpaces) {
 
     }//end missingDescription()
 
@@ -140,8 +128,7 @@ 
      *
      * @return void
      */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
-    {
+    public function oneSpaceAfterLongestVar($one, $two, $three) {
 
     }//end oneSpaceAfterLongestVar()
 
@@ -157,20 +144,17 @@ 
  *
  * @return void
  */
-function functionOutsideClass(&$str, &$foo)
-{
+function functionOutsideClass(&$str, &$foo) {
     return;
 }//end functionOutsideClass()
 
-function missingCommentOutsideClass()
-{
+function missingCommentOutsideClass() {
     return;
 }//end missingCommentOutsideClass()
 
 
 ?><?php
-function tagBeforeComment()
-{
+function tagBeforeComment() {
     return;
 }//end tagBeforeComment()
 
@@ -181,8 +165,7 @@ 
  *
  *
  */
-function noReturnOutsideClass()
-{
+function noReturnOutsideClass() {
 
 }//end noReturnOutsideClass()
 
@@ -195,8 +178,7 @@ 
  * @return void
  * @fine  Unknown tag
  */
-function missingTwoParamComment($one, $two, $three)
-{
+function missingTwoParamComment($one, $two, $three) {
 
 }//end missingTwoParamComment()
 
@@ -204,8 +186,7 @@ 
 /**
  *
  */
-function emptyFunctionDocComment()
-{
+function emptyFunctionDocComment() {
 }//end emptyFunctionDocComment()
 
 
@@ -261,8 +242,7 @@ 
  *
  * @return void
  */
-function foo(&$tokens, $tokenizer, $eolChar)
-{
+function foo(&$tokens, $tokenizer, $eolChar) {
 
 }//end foo()
 
@@ -348,8 +328,7 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
-{
+function process(File $phpcsFile, $stackPtr) {
 
 }//end process()
 
@@ -366,7 +345,6 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
-{
+function process(File $phpcsFile, $stackPtr) {
 
 }//end process()