Completed
Pull Request — develop (#1492)
by Zack
28:58 queued 09:00
created
src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.6.inc 1 patch
Doc Comments   +1 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,13 +22,4 @@
 block discarded – undo
22 22
  * merge conflict boundaries will still be detected correctly.
23 23
  */
24 24
 
25
-$string =
26
-		<<<"EOD"
27
-		Merge conflicts in PHP 7.3 indented heredocs
28
-<<<<<<< HEAD
29
-		can be problematic.
30
-=======
31
-		should also be detected.
32
->>>>>>> ref/heads/other-branchname
33
-		And now they are.
34
-		EOD;
25
+$string
35 26
\ No newline at end of file
Please login to merge, or discard this patch.
src/Standards/MySource/Sniffs/Channels/IncludeOwnSystemSniff.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     /**
20 20
      * Returns an array of tokens this test wants to listen for.
21 21
      *
22
-     * @return array
22
+     * @return integer[]
23 23
      */
24 24
     public function register()
25 25
     {
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      * @param int                         $stackPtr  The position in the tokens array of the
83 83
      *                                               potentially included class.
84 84
      *
85
-     * @return string
85
+     * @return boolean
86 86
      */
87 87
     protected function getIncludedClassFromToken(
88 88
         $phpcsFile,
Please login to merge, or discard this patch.
src/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.inc 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@
 block discarded – undo
35 35
 
36 36
 abstract class AbstractEditingScreenModeWidgetActions extends AbstractEditingModeWidgetActions {
37 37
 
38
+    /**
39
+     * @param string $systemName
40
+     */
38 41
     public static function getScreens($systemName)
39 42
     {
40 43
 
Please login to merge, or discard this patch.
src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@  discard block
 block discarded – undo
9 9
      *
10 10
      * @param int $stackPtr   The position in @ @unknown the stack of the token
11 11
      *                        that opened the scope
12
-     * @param int $detph    How many scope levels down we are.
12
+     * @param int $depth    How many scope levels down we are.
13 13
      * @param int    $index    The index
14 14
      * @return
15
-     * @throws
15
+     integer @throws
16 16
      */
17 17
     private function _functionCall($stackPtr, $depth=1, $index)
18 18
     {
@@ -121,7 +121,6 @@  discard block
 block discarded – undo
121 121
      *
122 122
      * @return
123 123
      * @param   int   $threeSpaces
124
-     * @param int     $superfluous
125 124
      * @param missing
126 125
      * @param
127 126
      */
Please login to merge, or discard this patch.
php_codesniffer/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     /**
21 21
      * Returns an array of tokens this test wants to listen for.
22 22
      *
23
-     * @return array
23
+     * @return integer[]
24 24
      */
25 25
     public function register()
26 26
     {
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
      * @param int                         $stackPtr  The position of the current token in
37 37
      *                                               the token stack.
38 38
      *
39
-     * @return void
39
+     * @return integer
40 40
      */
41 41
     public function process(File $phpcsFile, $stackPtr)
42 42
     {
Please login to merge, or discard this patch.
src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
      * @param int                         $stackPtr  The position of the current token in the
50 50
      *                                               stack passed in $tokens.
51 51
      *
52
-     * @return void
52
+     * @return null|integer
53 53
      */
54 54
     public function process(File $phpcsFile, $stackPtr)
55 55
     {
Please login to merge, or discard this patch.
src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc 1 patch
Doc Comments   -3 removed lines patch added patch discarded remove patch
@@ -61,9 +61,6 @@
 block discarded – undo
61 61
  *   - three
62 62
  *
63 63
  * @param array  &$tokens   The array of tokens to process.
64
- * @param object $tokenizer The tokenizer being used to
65
- *                          process this file.
66
- * @param string $eolChar   The EOL character to use for splitting strings.
67 64
  *
68 65
  * @return void
69 66
  */
Please login to merge, or discard this patch.
src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
      *
21 21
      * @param string $testFile The name of the file being tested.
22 22
      *
23
-     * @return array
23
+     * @return string[]
24 24
      */
25 25
     public function getCliValues($testFile)
26 26
     {
Please login to merge, or discard this patch.
squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc 1 patch
Doc Comments   -6 removed lines patch added patch discarded remove patch
@@ -19,9 +19,3 @@
 block discarded – undo
19 19
         $arr = array(
20 20
             'a' => 'a'
21 21
 <<<<<<< HEAD
22
-            'b' => 'b'
23
-=======
24
-            'c' => 'c'
25
->>>>>>> master
26
-        );
27
-    }
Please login to merge, or discard this patch.