Skip to content
This repository was archived by the owner on May 26, 2022. It is now read-only.

Commit 3a330de

Browse files
authored
Move ReaderCommonOptions class to Common folder (#343)
1 parent a19231f commit 3a330de

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

src/Spout/Reader/AbstractReader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ abstract class AbstractReader implements ReaderInterface
1919
/** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */
2020
protected $globalFunctionsHelper;
2121

22-
/** @var \Box\Spout\Reader\ReaderOptionsCommon Reader's customized options */
22+
/** @var \Box\Spout\Reader\Common\ReaderOptions Reader's customized options */
2323
protected $options;
2424

2525
/**
2626
* Returns the reader's current options
2727
*
28-
* @return \Box\Spout\Reader\ReaderOptionsCommon
28+
* @return \Box\Spout\Reader\Common\ReaderOptions
2929
*/
3030
abstract protected function getOptions();
3131

src/Spout/Reader/CSV/ReaderOptions.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
namespace Box\Spout\Reader\CSV;
44

55
use Box\Spout\Common\Helper\EncodingHelper;
6-
use Box\Spout\Reader\ReaderOptionsCommon;
76

87
/**
98
* Class ReaderOptions
109
* This class is used to customize the reader's behavior
1110
*
1211
* @package Box\Spout\Reader\CSV
1312
*/
14-
class ReaderOptions extends ReaderOptionsCommon
13+
class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
1514
{
1615
/** @var string Defines the character used to delimit fields (one character only) */
1716
protected $fieldDelimiter = ',';
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace Box\Spout\Reader;
3+
namespace Box\Spout\Reader\Common;
44

55
/**
6-
* Class ReaderOptionsCommon
6+
* Class ReaderOptions
77
* Readers' common options
88
*
9-
* @package Box\Spout\Reader
9+
* @package Box\Spout\Reader\Common
1010
*/
11-
class ReaderOptionsCommon
11+
class ReaderOptions
1212
{
1313
/** @var bool Whether date/time values should be returned as PHP objects or be formatted as strings */
1414
protected $shouldFormatDates = false;
@@ -28,7 +28,7 @@ public function shouldFormatDates()
2828
* Sets whether date/time values should be returned as PHP objects or be formatted as strings.
2929
*
3030
* @param bool $shouldFormatDates
31-
* @return ReaderOptionsCommon
31+
* @return ReaderOptions
3232
*/
3333
public function setShouldFormatDates($shouldFormatDates)
3434
{
@@ -48,7 +48,7 @@ public function shouldPreserveEmptyRows()
4848
* Sets whether empty rows should be returned or skipped.
4949
*
5050
* @param bool $shouldPreserveEmptyRows
51-
* @return ReaderOptionsCommon
51+
* @return ReaderOptions
5252
*/
5353
public function setShouldPreserveEmptyRows($shouldPreserveEmptyRows)
5454
{

src/Spout/Reader/ODS/ReaderOptions.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
namespace Box\Spout\Reader\ODS;
44

5-
use Box\Spout\Reader\ReaderOptionsCommon;
6-
75
/**
86
* Class ReaderOptions
97
* This class is used to customize the reader's behavior
108
*
119
* @package Box\Spout\Reader\ODS
1210
*/
13-
class ReaderOptions extends ReaderOptionsCommon
11+
class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
1412
{
1513
// No extra options
1614
}

src/Spout/Reader/XLSX/ReaderOptions.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
namespace Box\Spout\Reader\XLSX;
44

5-
use Box\Spout\Reader\ReaderOptionsCommon;
6-
75
/**
86
* Class ReaderOptions
97
* This class is used to customize the reader's behavior
108
*
119
* @package Box\Spout\Reader\XLSX
1210
*/
13-
class ReaderOptions extends ReaderOptionsCommon
11+
class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
1412
{
1513
/** @var string|null Temporary folder where the temporary files will be created */
1614
protected $tempFolder = null;

0 commit comments

Comments
 (0)