Completed
Pull Request — develop (#1492)
by
unknown
16:55 queued 12s
created
vendor/squizlabs/php_codesniffer/src/Fixer.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
     /**
343 343
      * Start recording actions for a changeset.
344 344
      *
345
-     * @return void
345
+     * @return false|null
346 346
      */
347 347
     public function beginChangeset()
348 348
     {
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
     /**
370 370
      * Stop recording actions for a changeset, and apply logged changes.
371 371
      *
372
-     * @return boolean
372
+     * @return false|null
373 373
      */
374 374
     public function endChangeset()
375 375
     {
Please login to merge, or discard this patch.
vendor/squizlabs/php_codesniffer/src/Reports/Cbf.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
      * its data should be counted in the grand totals.
30 30
      *
31 31
      * @param array                 $report      Prepared report data.
32
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
32
+     * @param File $phpcsFile   The file being reported on.
33 33
      * @param bool                  $showSources Show sources?
34 34
      * @param int                   $width       Maximum allowed line width.
35 35
      *
Please login to merge, or discard this patch.
vendor/squizlabs/php_codesniffer/src/Runner.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
      * @param string $file    The path of the file that raised the error.
594 594
      * @param int    $line    The line number the error was raised at.
595 595
      *
596
-     * @return void
596
+     * @return boolean
597 597
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
598 598
      */
599 599
     public function handleErrors($code, $message, $file, $line)
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
      *
709 709
      * @param array $childProcs An array of child processes to wait for.
710 710
      *
711
-     * @return void
711
+     * @return boolean
712 712
      */
713 713
     private function processChildProcs($childProcs)
714 714
     {
Please login to merge, or discard this patch.
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.