Completed
Pull Request — develop (#1492)
by Zack
33:18 queued 12:17
created
php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -15,46 +15,46 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * Returns the lines where errors should occur.
20
-     *
21
-     * The key of the array should represent the line number and the value
22
-     * should represent the number of errors that should occur on that line.
23
-     *
24
-     * @return array<int, int>
25
-     */
26
-    public function getErrorList()
27
-    {
28
-        return [
29
-            14 => 1,
30
-            15 => 1,
31
-            17 => 1,
32
-            30 => 1,
33
-            31 => 1,
34
-            33 => 1,
35
-            41 => 1,
36
-            55 => 1,
37
-            56 => 1,
38
-            57 => 1,
39
-            58 => 1,
40
-        ];
41
-
42
-    }//end getErrorList()
43
-
44
-
45
-    /**
46
-     * Returns the lines where warnings should occur.
47
-     *
48
-     * The key of the array should represent the line number and the value
49
-     * should represent the number of warnings that should occur on that line.
50
-     *
51
-     * @return array<int, int>
52
-     */
53
-    public function getWarningList()
54
-    {
55
-        return [];
56
-
57
-    }//end getWarningList()
18
+	/**
19
+	 * Returns the lines where errors should occur.
20
+	 *
21
+	 * The key of the array should represent the line number and the value
22
+	 * should represent the number of errors that should occur on that line.
23
+	 *
24
+	 * @return array<int, int>
25
+	 */
26
+	public function getErrorList()
27
+	{
28
+		return [
29
+			14 => 1,
30
+			15 => 1,
31
+			17 => 1,
32
+			30 => 1,
33
+			31 => 1,
34
+			33 => 1,
35
+			41 => 1,
36
+			55 => 1,
37
+			56 => 1,
38
+			57 => 1,
39
+			58 => 1,
40
+		];
41
+
42
+	}//end getErrorList()
43
+
44
+
45
+	/**
46
+	 * Returns the lines where warnings should occur.
47
+	 *
48
+	 * The key of the array should represent the line number and the value
49
+	 * should represent the number of warnings that should occur on that line.
50
+	 *
51
+	 * @return array<int, int>
52
+	 */
53
+	public function getWarningList()
54
+	{
55
+		return [];
56
+
57
+	}//end getWarningList()
58 58
 
59 59
 
60 60
 }//end class
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.1.inc 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@
 block discarded – undo
5 5
 echo $var[1];
6 6
 $foo = array($var[1],$var[2]);
7 7
 $foo = array(
8
-        1,
9
-        2,
10
-        3
11
-       );
8
+		1,
9
+		2,
10
+		3
11
+	   );
12 12
 $var = array/*comment*/(1,2,3);
13 13
 $var = array;
14 14
 
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.inc 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 echo $var[1];
7 7
 $foo = [$var[1],$var[2]];
8 8
 $foo = [
9
-        1,
10
-        2,
11
-        3
12
-       ];
9
+		1,
10
+		2,
11
+		3
12
+	   ];
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -15,53 +15,53 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * Returns the lines where errors should occur.
20
-     *
21
-     * The key of the array should represent the line number and the value
22
-     * should represent the number of errors that should occur on that line.
23
-     *
24
-     * @param string $testFile The name of the file being tested.
25
-     *
26
-     * @return array<int, int>
27
-     */
28
-    public function getErrorList($testFile='')
29
-    {
30
-        switch ($testFile) {
31
-        case 'DisallowLongArraySyntaxUnitTest.1.inc':
32
-            return [
33
-                2  => 1,
34
-                4  => 1,
35
-                6  => 1,
36
-                7  => 1,
37
-                12 => 1,
38
-                13 => 1,
39
-            ];
40
-        case 'DisallowLongArraySyntaxUnitTest.2.inc':
41
-            return [
42
-                2 => 1,
43
-                9 => 1,
44
-            ];
45
-        default:
46
-            return [];
47
-        }//end switch
18
+	/**
19
+	 * Returns the lines where errors should occur.
20
+	 *
21
+	 * The key of the array should represent the line number and the value
22
+	 * should represent the number of errors that should occur on that line.
23
+	 *
24
+	 * @param string $testFile The name of the file being tested.
25
+	 *
26
+	 * @return array<int, int>
27
+	 */
28
+	public function getErrorList($testFile='')
29
+	{
30
+		switch ($testFile) {
31
+		case 'DisallowLongArraySyntaxUnitTest.1.inc':
32
+			return [
33
+				2  => 1,
34
+				4  => 1,
35
+				6  => 1,
36
+				7  => 1,
37
+				12 => 1,
38
+				13 => 1,
39
+			];
40
+		case 'DisallowLongArraySyntaxUnitTest.2.inc':
41
+			return [
42
+				2 => 1,
43
+				9 => 1,
44
+			];
45
+		default:
46
+			return [];
47
+		}//end switch
48 48
 
49
-    }//end getErrorList()
49
+	}//end getErrorList()
50 50
 
51 51
 
52
-    /**
53
-     * Returns the lines where warnings should occur.
54
-     *
55
-     * The key of the array should represent the line number and the value
56
-     * should represent the number of warnings that should occur on that line.
57
-     *
58
-     * @return array<int, int>
59
-     */
60
-    public function getWarningList()
61
-    {
62
-        return [];
52
+	/**
53
+	 * Returns the lines where warnings should occur.
54
+	 *
55
+	 * The key of the array should represent the line number and the value
56
+	 * should represent the number of warnings that should occur on that line.
57
+	 *
58
+	 * @return array<int, int>
59
+	 */
60
+	public function getWarningList()
61
+	{
62
+		return [];
63 63
 
64
-    }//end getWarningList()
64
+	}//end getWarningList()
65 65
 
66 66
 
67 67
 }//end class
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc 1 patch
Indentation   +3 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,13 +5,7 @@
 block discarded – undo
5 5
 // This is not a merge conflict - it is a valid test case to test handling of arrays without associated closer.
6 6
 // Please do not remove.
7 7
 function test()
8
-    {
9
-        $arr = array(
10
-            'a' => 'a',
8
+	{
9
+		$arr = array(
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.
src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -15,39 +15,39 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * Returns the lines where errors should occur.
20
-     *
21
-     * The key of the array should represent the line number and the value
22
-     * should represent the number of errors that should occur on that line.
23
-     *
24
-     * @return array<int, int>
25
-     */
26
-    public function getErrorList()
27
-    {
28
-        return [
29
-            3 => 1,
30
-            5 => 1,
31
-            7 => 1,
32
-            8 => 1,
33
-        ];
34
-
35
-    }//end getErrorList()
36
-
37
-
38
-    /**
39
-     * Returns the lines where warnings should occur.
40
-     *
41
-     * The key of the array should represent the line number and the value
42
-     * should represent the number of warnings that should occur on that line.
43
-     *
44
-     * @return array<int, int>
45
-     */
46
-    public function getWarningList()
47
-    {
48
-        return [];
49
-
50
-    }//end getWarningList()
18
+	/**
19
+	 * Returns the lines where errors should occur.
20
+	 *
21
+	 * The key of the array should represent the line number and the value
22
+	 * should represent the number of errors that should occur on that line.
23
+	 *
24
+	 * @return array<int, int>
25
+	 */
26
+	public function getErrorList()
27
+	{
28
+		return [
29
+			3 => 1,
30
+			5 => 1,
31
+			7 => 1,
32
+			8 => 1,
33
+		];
34
+
35
+	}//end getErrorList()
36
+
37
+
38
+	/**
39
+	 * Returns the lines where warnings should occur.
40
+	 *
41
+	 * The key of the array should represent the line number and the value
42
+	 * should represent the number of warnings that should occur on that line.
43
+	 *
44
+	 * @return array<int, int>
45
+	 */
46
+	public function getWarningList()
47
+	{
48
+		return [];
49
+
50
+	}//end getWarningList()
51 51
 
52 52
 
53 53
 }//end class
Please login to merge, or discard this patch.
src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -15,41 +15,41 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * Returns the lines where errors should occur.
20
-     *
21
-     * The key of the array should represent the line number and the value
22
-     * should represent the number of errors that should occur on that line.
23
-     *
24
-     * @return array<int, int>
25
-     */
26
-    public function getErrorList()
27
-    {
28
-        return [
29
-            9  => 1,
30
-            12 => 1,
31
-            15 => 1,
32
-            18 => 2,
33
-            23 => 1,
34
-            30 => 1,
35
-        ];
36
-
37
-    }//end getErrorList()
38
-
39
-
40
-    /**
41
-     * Returns the lines where warnings should occur.
42
-     *
43
-     * The key of the array should represent the line number and the value
44
-     * should represent the number of warnings that should occur on that line.
45
-     *
46
-     * @return array<int, int>
47
-     */
48
-    public function getWarningList()
49
-    {
50
-        return [];
51
-
52
-    }//end getWarningList()
18
+	/**
19
+	 * Returns the lines where errors should occur.
20
+	 *
21
+	 * The key of the array should represent the line number and the value
22
+	 * should represent the number of errors that should occur on that line.
23
+	 *
24
+	 * @return array<int, int>
25
+	 */
26
+	public function getErrorList()
27
+	{
28
+		return [
29
+			9  => 1,
30
+			12 => 1,
31
+			15 => 1,
32
+			18 => 2,
33
+			23 => 1,
34
+			30 => 1,
35
+		];
36
+
37
+	}//end getErrorList()
38
+
39
+
40
+	/**
41
+	 * Returns the lines where warnings should occur.
42
+	 *
43
+	 * The key of the array should represent the line number and the value
44
+	 * should represent the number of warnings that should occur on that line.
45
+	 *
46
+	 * @return array<int, int>
47
+	 */
48
+	public function getWarningList()
49
+	{
50
+		return [];
51
+
52
+	}//end getWarningList()
53 53
 
54 54
 
55 55
 }//end class
Please login to merge, or discard this patch.
Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -15,67 +15,67 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * Returns the lines where errors should occur.
20
-     *
21
-     * The key of the array should represent the line number and the value
22
-     * should represent the number of errors that should occur on that line.
23
-     *
24
-     * @return array<int, int>
25
-     */
26
-    public function getErrorList()
27
-    {
28
-        return [
29
-            4   => 1,
30
-            13  => 1,
31
-            19  => 1,
32
-            24  => 1,
33
-            30  => 1,
34
-            40  => 1,
35
-            44  => 1,
36
-            50  => 1,
37
-            55  => 1,
38
-            67  => 1,
39
-            78  => 1,
40
-            85  => 1,
41
-            91  => 1,
42
-            98  => 1,
43
-            110 => 1,
44
-            115 => 1,
45
-            122 => 1,
46
-            128 => 1,
47
-            155 => 1,
48
-            158 => 1,
49
-            164 => 1,
50
-            168 => 1,
51
-            172 => 1,
52
-            176 => 1,
53
-            196 => 1,
54
-            201 => 1,
55
-            205 => 2,
56
-            210 => 2,
57
-            215 => 1,
58
-            220 => 1,
59
-            231 => 1,
60
-            236 => 1,
61
-        ];
18
+	/**
19
+	 * Returns the lines where errors should occur.
20
+	 *
21
+	 * The key of the array should represent the line number and the value
22
+	 * should represent the number of errors that should occur on that line.
23
+	 *
24
+	 * @return array<int, int>
25
+	 */
26
+	public function getErrorList()
27
+	{
28
+		return [
29
+			4   => 1,
30
+			13  => 1,
31
+			19  => 1,
32
+			24  => 1,
33
+			30  => 1,
34
+			40  => 1,
35
+			44  => 1,
36
+			50  => 1,
37
+			55  => 1,
38
+			67  => 1,
39
+			78  => 1,
40
+			85  => 1,
41
+			91  => 1,
42
+			98  => 1,
43
+			110 => 1,
44
+			115 => 1,
45
+			122 => 1,
46
+			128 => 1,
47
+			155 => 1,
48
+			158 => 1,
49
+			164 => 1,
50
+			168 => 1,
51
+			172 => 1,
52
+			176 => 1,
53
+			196 => 1,
54
+			201 => 1,
55
+			205 => 2,
56
+			210 => 2,
57
+			215 => 1,
58
+			220 => 1,
59
+			231 => 1,
60
+			236 => 1,
61
+		];
62 62
 
63
-    }//end getErrorList()
63
+	}//end getErrorList()
64 64
 
65 65
 
66
-    /**
67
-     * Returns the lines where warnings should occur.
68
-     *
69
-     * The key of the array should represent the line number and the value
70
-     * should represent the number of warnings that should occur on that line.
71
-     *
72
-     * @return array<int, int>
73
-     */
74
-    public function getWarningList()
75
-    {
76
-        return [];
66
+	/**
67
+	 * Returns the lines where warnings should occur.
68
+	 *
69
+	 * The key of the array should represent the line number and the value
70
+	 * should represent the number of warnings that should occur on that line.
71
+	 *
72
+	 * @return array<int, int>
73
+	 */
74
+	public function getWarningList()
75
+	{
76
+		return [];
77 77
 
78
-    }//end getWarningList()
78
+	}//end getWarningList()
79 79
 
80 80
 
81 81
 }//end class
Please login to merge, or discard this patch.
Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -15,62 +15,62 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * Returns the lines where errors should occur.
20
-     *
21
-     * The key of the array should represent the line number and the value
22
-     * should represent the number of errors that should occur on that line.
23
-     *
24
-     * @return array<int, int>
25
-     */
26
-    public function getErrorList()
27
-    {
28
-        return [
29
-            5   => 1,
30
-            6   => 1,
31
-            7   => 2,
32
-            8   => 1,
33
-            11  => 2,
34
-            12  => 2,
35
-            13  => 3,
36
-            42  => 3,
37
-            43  => 3,
38
-            45  => 1,
39
-            46  => 2,
40
-            79  => 1,
41
-            82  => 1,
42
-            93  => 1,
43
-            105 => 1,
44
-            107 => 1,
45
-            108 => 2,
46
-            114 => 1,
47
-            115 => 1,
48
-            119 => 1,
49
-            125 => 2,
50
-            130 => 2,
51
-            131 => 1,
52
-            132 => 2,
53
-            133 => 2,
54
-            134 => 1,
55
-            150 => 2,
56
-        ];
18
+	/**
19
+	 * Returns the lines where errors should occur.
20
+	 *
21
+	 * The key of the array should represent the line number and the value
22
+	 * should represent the number of errors that should occur on that line.
23
+	 *
24
+	 * @return array<int, int>
25
+	 */
26
+	public function getErrorList()
27
+	{
28
+		return [
29
+			5   => 1,
30
+			6   => 1,
31
+			7   => 2,
32
+			8   => 1,
33
+			11  => 2,
34
+			12  => 2,
35
+			13  => 3,
36
+			42  => 3,
37
+			43  => 3,
38
+			45  => 1,
39
+			46  => 2,
40
+			79  => 1,
41
+			82  => 1,
42
+			93  => 1,
43
+			105 => 1,
44
+			107 => 1,
45
+			108 => 2,
46
+			114 => 1,
47
+			115 => 1,
48
+			119 => 1,
49
+			125 => 2,
50
+			130 => 2,
51
+			131 => 1,
52
+			132 => 2,
53
+			133 => 2,
54
+			134 => 1,
55
+			150 => 2,
56
+		];
57 57
 
58
-    }//end getErrorList()
58
+	}//end getErrorList()
59 59
 
60 60
 
61
-    /**
62
-     * Returns the lines where warnings should occur.
63
-     *
64
-     * The key of the array should represent the line number and the value
65
-     * should represent the number of warnings that should occur on that line.
66
-     *
67
-     * @return array<int, int>
68
-     */
69
-    public function getWarningList()
70
-    {
71
-        return [];
61
+	/**
62
+	 * Returns the lines where warnings should occur.
63
+	 *
64
+	 * The key of the array should represent the line number and the value
65
+	 * should represent the number of warnings that should occur on that line.
66
+	 *
67
+	 * @return array<int, int>
68
+	 */
69
+	public function getWarningList()
70
+	{
71
+		return [];
72 72
 
73
-    }//end getWarningList()
73
+	}//end getWarningList()
74 74
 
75 75
 
76 76
 }//end class
Please login to merge, or discard this patch.