Skip to content

Commit 68670ab

Browse files
oliverkleeoliverklee
authored
[CLEANUP] Simplify tests that use getArrayRepresenation() (#1476)
We don't need to check for `arrayKeyExists` as PHPUnit will warn anyway if the code tries to access an array element that does not exist.
1 parent 7983af6 commit 68670ab

8 files changed

Lines changed: 14 additions & 37 deletions

File tree

‎tests/Unit/Comment/CommentTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ public function getArrayRepresentationIncludesClassName(): void
8787

8888
$result = $subject->getArrayRepresentation();
8989

90-
self::assertArrayHasKey('class', $result);
9190
self::assertSame('Comment', $result['class']);
9291
}
9392

@@ -101,7 +100,6 @@ public function getArrayRepresentationIncludesContents(): void
101100

102101
$result = $subject->getArrayRepresentation();
103102

104-
self::assertArrayHasKey('contents', $result);
105103
self::assertSame($contents, $result['contents']);
106104
}
107105
}

‎tests/Unit/Property/CharsetTest.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function getArrayRepresentationIncludesClassName(): void
3939
{
4040
$result = $this->subject->getArrayRepresentation();
4141

42-
self::assertArrayHasKey('class', $result);
4342
self::assertSame('Charset', $result['class']);
4443
}
4544

@@ -53,7 +52,12 @@ public function getArrayRepresentationIncludesCharset(): void
5352

5453
$result = $subject->getArrayRepresentation();
5554

56-
self::assertArrayHasKey('charset', $result);
57-
self::assertSame(['class' => 'CSSString', 'contents' => $charset], $result['charset']);
55+
self::assertSame(
56+
[
57+
'class' => 'CSSString',
58+
'contents' => $charset,
59+
],
60+
$result['charset']
61+
);
5862
}
5963
}

‎tests/Unit/Value/CSSFunctionTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public function getArrayRepresentationIncludesClassName(): void
2323

2424
$result = $subject->getArrayRepresentation();
2525

26-
self::assertArrayHasKey('class', $result);
2726
self::assertSame('CSSFunction', $result['class']);
2827
}
2928

@@ -36,7 +35,6 @@ public function getArrayRepresentationIncludesFunctionName(): void
3635

3736
$result = $subject->getArrayRepresentation();
3837

39-
self::assertArrayHasKey('name', $result);
4038
self::assertSame('filter', $result['name']);
4139
}
4240
}

‎tests/Unit/Value/CSSStringTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public function getArrayRepresentationIncludesClassName(): void
9191

9292
$result = $subject->getArrayRepresentation();
9393

94-
self::assertArrayHasKey('class', $result);
9594
self::assertSame('CSSString', $result['class']);
9695
}
9796

@@ -105,7 +104,6 @@ public function getArrayRepresentationIncludesContents(): void
105104

106105
$result = $subject->getArrayRepresentation();
107106

108-
self::assertArrayHasKey('contents', $result);
109107
self::assertSame($contents, $result['contents']);
110108
}
111109

‎tests/Unit/Value/RuleValueListTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public function getArrayRepresentationIncludesClassName(): void
2323

2424
$result = $subject->getArrayRepresentation();
2525

26-
self::assertArrayHasKey('class', $result);
2726
self::assertSame('RuleValueList', $result['class']);
2827
}
2928
}

‎tests/Unit/Value/SizeTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ public function getArrayRepresentationIncludesClassName(): void
108108

109109
$result = $subject->getArrayRepresentation();
110110

111-
self::assertArrayHasKey('class', $result);
112111
self::assertSame('Size', $result['class']);
113112
}
114113

@@ -121,7 +120,6 @@ public function getArrayRepresentationIncludesNumber(): void
121120

122121
$result = $subject->getArrayRepresentation();
123122

124-
self::assertArrayHasKey('number', $result);
125123
self::assertSame(1.0, $result['number']);
126124
}
127125

@@ -134,7 +132,6 @@ public function getArrayRepresentationIncludesUnit(): void
134132

135133
$result = $subject->getArrayRepresentation();
136134

137-
self::assertArrayHasKey('unit', $result);
138135
self::assertSame('px', $result['unit']);
139136
}
140137
}

‎tests/Unit/Value/URLTest.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public function getArrayRepresentationIncludesClassName(): void
9090

9191
$result = $subject->getArrayRepresentation();
9292

93-
self::assertArrayHasKey('class', $result);
9493
self::assertSame('URL', $result['class']);
9594
}
9695

@@ -104,7 +103,12 @@ public function getArrayRepresentationIncludesUri(): void
104103

105104
$result = $subject->getArrayRepresentation();
106105

107-
self::assertArrayHasKey('uri', $result);
108-
self::assertSame(['class' => 'CSSString', 'contents' => $uri], $result['uri']);
106+
self::assertSame(
107+
[
108+
'class' => 'CSSString',
109+
'contents' => $uri,
110+
],
111+
$result['uri']
112+
);
109113
}
110114
}

‎tests/Unit/Value/ValueListTest.php‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public function getArrayRepresentationIncludesClassName(): void
2222

2323
$result = $subject->getArrayRepresentation();
2424

25-
self::assertArrayHasKey('class', $result);
2625
self::assertSame('ConcreteValueList', $result['class']);
2726
}
2827

@@ -35,10 +34,6 @@ public function getArrayRepresentationIncludesStringComponent(): void
3534

3635
$result = $subject->getArrayRepresentation();
3736

38-
self::assertArrayHasKey('components', $result);
39-
self::assertIsArray($result['components']);
40-
self::assertArrayHasKey(0, $result['components']);
41-
self::assertArrayHasKey('value', $result['components'][0]);
4237
self::assertSame('Helvetica', $result['components'][0]['value']);
4338
}
4439

@@ -51,10 +46,6 @@ public function getArrayRepresentationIncludesValueComponent(): void
5146

5247
$result = $subject->getArrayRepresentation();
5348

54-
self::assertArrayHasKey('components', $result);
55-
self::assertIsArray($result['components']);
56-
self::assertArrayHasKey(0, $result['components']);
57-
self::assertArrayHasKey('class', $result['components'][0]);
5849
self::assertSame('Size', $result['components'][0]['class']);
5950
}
6051

@@ -67,19 +58,8 @@ public function getArrayRepresentationIncludesMultipleMixedComponents(): void
6758

6859
$result = $subject->getArrayRepresentation();
6960

70-
self::assertArrayHasKey('components', $result);
71-
self::assertIsArray($result['components']);
72-
73-
self::assertArrayHasKey(0, $result['components']);
74-
self::assertArrayHasKey('class', $result['components'][0]);
7561
self::assertSame('Size', $result['components'][0]['class']);
76-
77-
self::assertArrayHasKey(1, $result['components']);
78-
self::assertArrayHasKey('value', $result['components'][1]);
7962
self::assertSame('+', $result['components'][1]['value']);
80-
81-
self::assertArrayHasKey(2, $result['components']);
82-
self::assertArrayHasKey('class', $result['components'][2]);
8363
self::assertSame('Size', $result['components'][2]['class']);
8464
}
8565

@@ -92,7 +72,6 @@ public function getArrayRepresentationIncludesSeparator(): void
9272

9373
$result = $subject->getArrayRepresentation();
9474

95-
self::assertArrayHasKey('separator', $result);
9675
self::assertSame(',', $result['separator']);
9776
}
9877
}

0 commit comments

Comments
 (0)