View GitHub Repository GravityView

Schedule Inspection
Subscribe
Completed
Pull Request — develop (#1492)
by Zack
16:34
created
Category
Toggle Patches
src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -39,7 +39,7 @@
 
 block discarded – undo
39 39 
     /**
40 40 
      * Registers the tokens that this sniff wants to listen for.
41 41 
      *
42 
-     * @return int[]
42 
+     * @return integer[]
43 43 
      */
44 44 
     public function register()
45 45 
     {
Please login to merge, or discard this patch.
src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37 
     /**
38 38 
      * Returns an array of tokens this test wants to listen for.
39 39 
      *
40 
-     * @return array
40 
+     * @return integer[]
41 41 
      */
42 42 
     public function register()
43 43 
     {
 
@@ -53,7 +53,7 @@  discard block
 
 block discarded – undo
53 53 
      * @param int                         $stackPtr  The position of the current token in
54 54 
      *                                               the stack passed in $tokens.
55 55 
      *
56 
-     * @return void
56 
+     * @return integer
57 57 
      */
58 58 
     public function process(File $phpcsFile, $stackPtr)
59 59 
     {
Please login to merge, or discard this patch.
src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -102,7 +102,7 @@  discard block
 
 block discarded – undo
102 102 
     /**
103 103 
      * Returns an array of tokens this test wants to listen for.
104 104 
      *
105 
-     * @return array
105 
+     * @return integer[]
106 106 
      */
107 107 
     public function register()
108 108 
     {
 
@@ -122,7 +122,7 @@  discard block
 
 block discarded – undo
122 122 
      * @param int                         $stackPtr  The position of the current token
123 123 
      *                                               in the stack passed in $tokens.
124 124 
      *
125 
-     * @return void
125 
+     * @return integer
126 126 
      */
127 127 
     public function process(File $phpcsFile, $stackPtr)
128 128 
     {
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc 1 patch
Doc Comments   -6 removed lines patch added patch discarded remove patch 
@@ -9,9 +9,3 @@
 
 block discarded – undo
9 9 
         $arr = array(
10 10 
             'a' => 'a',
11 11 
 <<<<<<< HEAD
12 
-            'b' => 'b'
13 
-=======
14 
-            'c' => 'c'
15 
->>>>>>> master
16 
-        );
17 
-    }
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/Generic/Tests/Debug/ClosureLinterUnitTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@
 
 block discarded – undo
19 19 
     /**
20 20 
      * Should this test be skipped for some reason.
21 21 
      *
22 
-     * @return void
22 
+     * @return boolean
23 23 
      */
24 24 
     protected function shouldSkipTest()
25 25 
     {
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.1.inc 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -57,5 +57,4 @@
 
 block discarded – undo
57 57
58 58 
 // Test that stray boundaries, i.e. an opener without closer and such, are detected.
59 59 
 <<<<<<< HEAD
60 
-$a = 1;
61 
-=======
60 
+$a
62 61 
\ No newline at end of file
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.2.inc 1 patch
Doc Comments   -5 removed lines patch added patch discarded remove patch 
@@ -24,8 +24,3 @@
 
 block discarded – undo
24 24
25 25 
 // Comment
26 26 
 <<<<<<< HEAD
27 
-// Second comment line. NOTE: The above opener breaks the tokenizer.
28 
-=======
29 
-// New second comment line
30 
->>>>>>> master
31 
-// Third comment line
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.3.inc 1 patch
Doc Comments   +1 added lines, -19 removed lines patch added patch discarded remove patch 
@@ -22,22 +22,4 @@
 
 block discarded – undo
22 22 
 <<<<<<< HEAD
23 23 
 $a = 1;
24 24 
 =======
25 
-$a = 2;
26 
->>>>>>> master
27 
-
28 
-/*
29 
- * The above tests are based on "normal" tokens.
30 
- * The below test checks that once the tokenizer breaks down because of
31 
- * unexpected merge conflict boundaries - i.e. after the first merge conflict
32 
- * opener in non-comment, non-heredoc/nowdoc, non-inline HTML code -, subsequent
33 
- * merge conflict boundaries will still be detected correctly.
34 
- */
35 
-?>
36 
-
37 
-<div class="abc">
38 
-<<<<<<< HEAD
39 
-	<p id="test-this">Testing a merge conflict.</p>
40 
-=======
41 
-	<p id="test-that">Another text string.</p>
42 
->>>>>>> ref/heads/feature-branch
43 
-</div>
25 
+$a
44 26 
\ No newline at end of file
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.4.inc 1 patch
Doc Comments   +1 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -64,8 +64,4 @@
 
 block discarded – undo
64 64 
 <<<<<<< HEAD
65 65 
 can be problematic.
66 66 
 EOD;
67 
-$a = 1;
68 
-=======
69 
-should also be detected.
70 
-EOT;
71 
->>>>>>> ref/heads/other-branchname
67 
+$a
72 68 
\ No newline at end of file
Please login to merge, or discard this patch.