Skip to content

Commit 7f0bcb8

Browse files
oleibmanoleibman
committed
Eliminate Dead Code
1 parent ec773bb commit 7f0bcb8

File tree

7 files changed

+28
-30
lines changed

7 files changed

+28
-30
lines changed

‎tests/PhpSpreadsheetTests/Cell/HyperlinkTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function testSetUrl(): void
2525
$newUrlValue = 'http://github.com/PHPOffice/PhpSpreadsheet';
2626

2727
$testInstance = new Hyperlink($initialUrlValue);
28-
$result = $testInstance->setUrl($newUrlValue);
28+
$testInstance->setUrl($newUrlValue);
2929

3030
$result = $testInstance->getUrl();
3131
self::assertEquals($newUrlValue, $result);
@@ -47,7 +47,7 @@ public function testSetTooltip(): void
4747
$newTooltipValue = 'PhpSpreadsheet Repository on Github';
4848

4949
$testInstance = new Hyperlink('', $initialTooltipValue);
50-
$result = $testInstance->setTooltip($newTooltipValue);
50+
$testInstance->setTooltip($newTooltipValue);
5151

5252
$result = $testInstance->getTooltip();
5353
self::assertEquals($newTooltipValue, $result);

‎tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ public function testLoadWorksheets(): void
5454
{
5555
$spreadsheet = $this->loadDataFile();
5656
self::assertEquals(2, $spreadsheet->getSheetCount());
57-
$firstSheet = $spreadsheet->getSheet(0);
58-
$secondSheet = $spreadsheet->getSheet(1);
5957
self::assertEquals('Sheet1', $spreadsheet->getSheet(0)->getTitle());
6058
self::assertEquals('Second Sheet', $spreadsheet->getSheet(1)->getTitle());
6159
$spreadsheet->disconnectWorksheets();

‎tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ public function testSetRange(): void
7272

7373
foreach ($ranges as $actualRange => $fullRange) {
7474
// Setters return the instance to implement the fluent interface
75-
$result = $autoFilter->setRange($fullRange);
75+
$temp = $autoFilter->setRange($fullRange);
7676

7777
// Result should be the new autofilter range
78-
$result = $autoFilter->getRange();
78+
$result = $temp->getRange();
7979
self::assertEquals($actualRange, $result);
8080
}
8181
}
@@ -88,10 +88,10 @@ public function testClearRange(): void
8888
$autoFilter->setRange(self::INITIAL_RANGE);
8989

9090
// Setters return the instance to implement the fluent interface
91-
$result = $autoFilter->setRange('');
91+
$temp = $autoFilter->setRange('');
9292

9393
// Result should be a clear range
94-
$result = $autoFilter->getRange();
94+
$result = $temp->getRange();
9595
self::assertEquals($expectedResult, $result);
9696
}
9797

@@ -223,9 +223,9 @@ public function testSetColumnWithString(): void
223223
$autoFilter->setRange(self::INITIAL_RANGE);
224224

225225
// Setters return the instance to implement the fluent interface
226-
$result = $autoFilter->setColumn($expectedResult);
226+
$temp = $autoFilter->setColumn($expectedResult);
227227

228-
$result = $autoFilter->getColumns();
228+
$result = $temp->getColumns();
229229
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter\Column
230230
// objects for each column we set indexed by the column ID
231231
self::assertCount(1, $result);
@@ -253,9 +253,9 @@ public function testSetColumnWithColumnObject(): void
253253
$autoFilter->setRange(self::INITIAL_RANGE);
254254

255255
// Setters return the instance to implement the fluent interface
256-
$result = $autoFilter->setColumn($columnObject);
256+
$temp = $autoFilter->setColumn($columnObject);
257257

258-
$result = $autoFilter->getColumns();
258+
$result = $temp->getColumns();
259259
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter\Column
260260
// objects for each column we set indexed by the column ID
261261
self::assertCount(1, $result);
@@ -374,10 +374,10 @@ public function testClearRangeWithExistingColumns(): void
374374
}
375375

376376
// Setters return the instance to implement the fluent interface
377-
$result = $autoFilter->setRange('');
377+
$temp = $autoFilter->setRange('');
378378

379379
// Range should be cleared
380-
$result = $autoFilter->getRange();
380+
$result = $temp->getRange();
381381
self::assertEquals($expectedResult, $result);
382382

383383
// Column array should be cleared
@@ -404,10 +404,10 @@ public function testSetRangeWithExistingColumns(): void
404404
}
405405

406406
// Setters return the instance to implement the fluent interface
407-
$result = $autoFilter->setRange($expectedResult);
407+
$temp = $autoFilter->setRange($expectedResult);
408408

409409
// Range should be correctly set
410-
$result = $autoFilter->getRange();
410+
$result = $temp->getRange();
411411
self::assertEquals($expectedResult, $result);
412412

413413
// Only columns that existed in the original range and that

‎tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function testSetParent(): void
7575
$columnFilter = $sheet->getAutoFilter()->getColumn('H');
7676
// Setters return the instance to implement the fluent interface
7777
$result = $columnFilter->setParent(null);
78-
self::assertSame('filters', $columnFilter->getFilterType());
78+
self::assertSame('filters', $result->getFilterType());
7979
}
8080

8181
public function testVariousSets(): void
@@ -91,7 +91,7 @@ public function testVariousSets(): void
9191

9292
$result = $columnFilter->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
9393

94-
$result = $columnFilter->getFilterType();
94+
$result = $result->getFilterType();
9595
self::assertEquals(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER, $result);
9696

9797
$result = $columnFilter->setJoin(Column::AUTOFILTER_COLUMN_JOIN_AND);
@@ -153,7 +153,7 @@ public function testGetAttributes(): void
153153

154154
$result = $columnFilter->setAttributes($attributeSet);
155155

156-
$result = $columnFilter->getAttributes();
156+
$result = $result->getAttributes();
157157
self::assertSame($attributeSet, $result);
158158
}
159159

@@ -177,7 +177,7 @@ public function testSetAttribute(): void
177177
// Setters return the instance to implement the fluent interface
178178
$result = $columnFilter->setAttribute($attributeName, $attributeValue);
179179
}
180-
self::assertSame($attributeSet, $columnFilter->getAttributes());
180+
self::assertSame($attributeSet, $result->getAttributes());
181181
}
182182

183183
public function testGetAttribute(): void

‎tests/PhpSpreadsheetTests/Worksheet/Table/ColumnTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testVariousSets(): void
6363
$column = $table->getColumn('H');
6464

6565
$result = $column->setShowFilterButton(false);
66-
self::assertFalse($column->getShowFilterButton());
66+
self::assertFalse($result->getShowFilterButton());
6767

6868
$label = 'Total';
6969
$result = $column->setTotalsRowLabel($label);

‎tests/PhpSpreadsheetTests/Worksheet/Table/TableStyleTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function testVariousSets(): void
1717
$style = $table->getStyle();
1818

1919
$result = $style->setTheme(TableStyle::TABLE_STYLE_DARK1);
20-
self::assertEquals(TableStyle::TABLE_STYLE_DARK1, $style->getTheme());
20+
self::assertEquals(TableStyle::TABLE_STYLE_DARK1, $result->getTheme());
2121

2222
$result = $style->setShowFirstColumn(true);
2323
self::assertTrue($style->getShowFirstColumn());

‎tests/PhpSpreadsheetTests/Worksheet/Table/TableTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testValidTableNames(string $name, string $expected): void
3333
$table = new Table(self::INITIAL_RANGE);
3434

3535
$result = $table->setName($name);
36-
self::assertEquals($expected, $table->getName());
36+
self::assertEquals($expected, $result->getName());
3737
}
3838

3939
public static function validTableNamesProvider(): array
@@ -113,7 +113,7 @@ public function testVariousSets(): void
113113
$table = new Table(self::INITIAL_RANGE);
114114

115115
$result = $table->setShowHeaderRow(false);
116-
self::assertFalse($table->getShowHeaderRow());
116+
self::assertFalse($result->getShowHeaderRow());
117117

118118
$result = $table->setShowTotalsRow(true);
119119
self::assertTrue($table->getShowTotalsRow());
@@ -156,7 +156,7 @@ public function xtestSetRangeValidRange(string|array|AddressRange $fullRange, st
156156
$table = new Table(self::INITIAL_RANGE);
157157

158158
$result = $table->setRange($fullRange);
159-
self::assertEquals($actualRange, $table->getRange());
159+
self::assertEquals($actualRange, $result->getRange());
160160
}
161161

162162
public function testSetRangeValidRange(): void
@@ -188,7 +188,7 @@ public function testClearRange(): void
188188
$result = $table->setRange('');
189189

190190
// Result should be a clear range
191-
$result = $table->getRange();
191+
$result = $result->getRange();
192192
self::assertEquals($expectedResult, $result);
193193
}
194194

@@ -313,7 +313,7 @@ public function testSetColumnWithString(): void
313313
// Setters return the instance to implement the fluent interface
314314
$result = $table->setColumn($expectedResult);
315315

316-
$result = $table->getColumns();
316+
$result = $result->getColumns();
317317
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column
318318
// objects for each column we set indexed by the column ID
319319
self::assertCount(1, $result);
@@ -338,7 +338,7 @@ public function testSetColumnWithColumnObject(): void
338338
// Setters return the instance to implement the fluent interface
339339
$result = $table->setColumn($columnObject);
340340

341-
$result = $table->getColumns();
341+
$result = $result->getColumns();
342342
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column
343343
// objects for each column we set indexed by the column ID
344344
self::assertCount(1, $result);
@@ -446,7 +446,7 @@ public function testClearRangeWithExistingColumns(): void
446446
$result = $table->setRange('');
447447

448448
// Range should be cleared
449-
$result = $table->getRange();
449+
$result = $result->getRange();
450450
self::assertEquals($expectedResult, $result);
451451

452452
// Column array should be cleared
@@ -474,7 +474,7 @@ public function testSetRangeWithExistingColumns(): void
474474
$result = $table->setRange($expectedResult);
475475

476476
// Range should be correctly set
477-
$result = $table->getRange();
477+
$result = $result->getRange();
478478
self::assertEquals($expectedResult, $result);
479479

480480
// Only columns that existed in the original range and that

0 commit comments

Comments
 (0)