Skip to content

Commit 703604c

Browse files
author
MarkBaker
committed
Remove Reader/Writer deprecations
1 parent e41c428 commit 703604c

File tree

3 files changed

+1
-118
lines changed

3 files changed

+1
-118
lines changed

src/PhpSpreadsheet/Reader/Html.php

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ class Html extends BaseReader
2626
*/
2727
const TEST_SAMPLE_SIZE = 2048;
2828

29-
/**
30-
* Input encoding.
31-
*
32-
* @var string
33-
*/
34-
protected $inputEncoding = 'ANSI';
35-
3629
/**
3730
* Sheet index to read.
3831
*
@@ -210,38 +203,6 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
210203
return $this->loadIntoExisting($filename, $spreadsheet);
211204
}
212205

213-
/**
214-
* Set input encoding.
215-
*
216-
* @param string $inputEncoding Input encoding, eg: 'ANSI'
217-
*
218-
* @return $this
219-
*
220-
* @codeCoverageIgnore
221-
*
222-
* @deprecated no use is made of this property
223-
*/
224-
public function setInputEncoding($inputEncoding)
225-
{
226-
$this->inputEncoding = $inputEncoding;
227-
228-
return $this;
229-
}
230-
231-
/**
232-
* Get input encoding.
233-
*
234-
* @return string
235-
*
236-
* @codeCoverageIgnore
237-
*
238-
* @deprecated no use is made of this property
239-
*/
240-
public function getInputEncoding()
241-
{
242-
return $this->inputEncoding;
243-
}
244-
245206
// Data Array used for testing only, should write to Spreadsheet object on completion of tests
246207

247208
/** @var array */
@@ -255,7 +216,7 @@ public function getInputEncoding()
255216

256217
protected function setTableStartColumn(string $column): string
257218
{
258-
if ($this->tableLevel == 0) {
219+
if ($this->tableLevel === 0) {
259220
$column = 'A';
260221
}
261222
++$this->tableLevel;

src/PhpSpreadsheet/Reader/Slk.php

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212

1313
class Slk extends BaseReader
1414
{
15-
/**
16-
* Input encoding.
17-
*
18-
* @var string
19-
*/
20-
private $inputEncoding = 'ANSI';
21-
2215
/**
2316
* Sheet index to read.
2417
*
@@ -97,38 +90,6 @@ private function canReadOrBust(string $filename): void
9790
$this->openFile($filename);
9891
}
9992

100-
/**
101-
* Set input encoding.
102-
*
103-
* @deprecated no use is made of this property
104-
*
105-
* @param string $inputEncoding Input encoding, eg: 'ANSI'
106-
*
107-
* @return $this
108-
*
109-
* @codeCoverageIgnore
110-
*/
111-
public function setInputEncoding($inputEncoding)
112-
{
113-
$this->inputEncoding = $inputEncoding;
114-
115-
return $this;
116-
}
117-
118-
/**
119-
* Get input encoding.
120-
*
121-
* @deprecated no use is made of this property
122-
*
123-
* @return string
124-
*
125-
* @codeCoverageIgnore
126-
*/
127-
public function getInputEncoding()
128-
{
129-
return $this->inputEncoding;
130-
}
131-
13293
/**
13394
* Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
13495
*

src/PhpSpreadsheet/Writer/Html.php

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ class Html extends BaseWriter
6363
*/
6464
private $useInlineCss = false;
6565

66-
/**
67-
* Use embedded CSS?
68-
*
69-
* @var bool
70-
*/
71-
private $useEmbeddedCSS = true;
72-
7366
/**
7467
* Array of CSS styles.
7568
*
@@ -1596,38 +1589,6 @@ public function setUseInlineCss($useInlineCss)
15961589
return $this;
15971590
}
15981591

1599-
/**
1600-
* Get use embedded CSS?
1601-
*
1602-
* @return bool
1603-
*
1604-
* @codeCoverageIgnore
1605-
*
1606-
* @deprecated no longer used
1607-
*/
1608-
public function getUseEmbeddedCSS()
1609-
{
1610-
return $this->useEmbeddedCSS;
1611-
}
1612-
1613-
/**
1614-
* Set use embedded CSS?
1615-
*
1616-
* @param bool $useEmbeddedCSS
1617-
*
1618-
* @return $this
1619-
*
1620-
* @codeCoverageIgnore
1621-
*
1622-
* @deprecated no longer used
1623-
*/
1624-
public function setUseEmbeddedCSS($useEmbeddedCSS)
1625-
{
1626-
$this->useEmbeddedCSS = $useEmbeddedCSS;
1627-
1628-
return $this;
1629-
}
1630-
16311592
/**
16321593
* Add color to formatted string as inline style.
16331594
*

0 commit comments

Comments
 (0)